Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Adds a Gym in Perma#13213

Merged
patpol4 merged 1 commit intoyogstation13:masterfrom
Hopekz:workout_perma
Mar 1, 2022
Merged

Adds a Gym in Perma#13213
patpol4 merged 1 commit intoyogstation13:masterfrom
Hopekz:workout_perma

Conversation

@Hopekz
Copy link
Contributor

@Hopekz Hopekz commented Feb 2, 2022

gDOzFinWEw
zepcIsCHyQ

🆑 Hopek
rscadd: Perma now has a gym
/:cl:

@Hopekz Hopekz requested a review from a team as a code owner February 2, 2022 17:46
@Yogbot-13 Yogbot-13 added Feature This adds new content to the game Mapping Will result in a change to a map. labels Feb 2, 2022
@maxion12345
Copy link
Contributor

maxion12345 commented Feb 2, 2022

doesn't the holodeck have a gym

@Hopekz
Copy link
Contributor Author

Hopekz commented Feb 2, 2022

doesn't the holodeck have a gym

Digital VR weights are weightless how do you expect someone to work out with virtual weights

@KillerOrcaCora
Copy link
Contributor

KillerOrcaCora commented Feb 4, 2022

It's about drive 😤
It's about power 🤯
We stay hungry 😩
We devour 👹
Put in the work 👨‍💼
Put in the hours 🕜
And take what's our!!! ✊🏻

@patpol4 patpol4 added Map - Approved This PR's mapping side has been approved by a mapping maintainer Merge conflict Files are conflicting with current live changes. labels Feb 7, 2022
@bruhlookatthisdood
Copy link
Contributor

bruhlookatthisdood commented Feb 9, 2022

doesn't the holodeck have a gym

Digital VR weights are weightless how do you expect someone to work out with virtual weights

Give them beatsaber

@JamieD1
Copy link
Contributor

JamieD1 commented Feb 12, 2022

cornflakes

@Hopekz
Copy link
Contributor Author

Hopekz commented Feb 12, 2022

cornflakes

It's waiting on the map name revert

@Hopekz
Copy link
Contributor Author

Hopekz commented Feb 22, 2022

Update:
Still waiting on #13268

@patpol4
Copy link
Contributor

patpol4 commented Mar 1, 2022

The rename revert was merged, rerunning checks to make sure this works

patpol4
patpol4 approved these changes Mar 1, 2022
View reviewed changes
Copy link
Contributor

@patpol4 patpol4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Somehow it didn't break. You can work out now

@patpol4 patpol4 merged commit 317e45b into yogstation13:master Mar 1, 2022
Yogbot-13 added a commit that referenced this pull request Mar 1, 2022
@Yogbot-13
Automatic changelog generation #13213 [ci skip]
ba8ffe4
@Hopekz Hopekz deleted the workout_perma branch March 1, 2022 15:43
@Hopekz
Copy link
Contributor Author

Hopekz commented Mar 1, 2022

Somehow it didn't break.

Well yeah that's why we patiently waited for the box name revert
(Unless you mean you merged other map PR's first then I got lucky)

Hopekz added a commit to Hopekz/Yogstation that referenced this pull request Mar 9, 2022
@Hopekz
Squashed commit of the following:
6c5cda2 
commit 14a9b1d
Author: Changelogs <action@github.com>
Date:   Wed Mar 9 14:13:14 2022 +0000

    Automatic changelog compile [ci skip]

commit 65a9802
Author: Yogbot-13 <admin@yogstation.net>
Date:   Wed Mar 9 02:34:43 2022 -0500

    Automatic changelog generation yogstation13#13387 [ci skip]

commit 030a666
Author: Theos <theubernyan@gmail.com>
Date:   Wed Mar 9 02:34:42 2022 -0500

    Allows resonators to chain mine when manually detonatwd because wtf was i thinking (yogstation13#13387)

    * Resonators can now chain mine faster

    * Update resonator.dm

commit b044a2d
Author: Changelogs <action@github.com>
Date:   Wed Mar 9 02:36:40 2022 +0000

    Automatic changelog compile [ci skip]

commit 1061fe9
Author: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Date:   Tue Mar 8 18:29:44 2022 -0500

    Removes ynot

commit 2a1cc09
Author: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Date:   Tue Mar 8 18:19:44 2022 -0500

    Adds kay

commit 658f7f6
Author: Changelogs <action@github.com>
Date:   Tue Mar 8 02:31:47 2022 +0000

    Automatic changelog compile [ci skip]

commit ada3275
Author: Changelogs <action@github.com>
Date:   Mon Mar 7 14:07:50 2022 +0000

    Automatic changelog compile [ci skip]

commit d49868d
Author: Yogbot-13 <admin@yogstation.net>
Date:   Mon Mar 7 06:48:24 2022 -0500

    Automatic changelog generation yogstation13#13359 [ci skip]

commit b7d37d7
Author: ChesterTheCheesy <71487903+ChesterTheCheesy@users.noreply.github.com>
Date:   Mon Mar 7 12:48:22 2022 +0100

    Gives reactive tesla and repulse armors cooldowns (yogstation13#13359)

    * Update reactive_armour.dm

    * Update code/modules/clothing/suits/reactive_armour.dm

    Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

    * Update code/modules/clothing/suits/reactive_armour.dm

    Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

    Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
    Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

commit 2f58930
Author: Yogbot-13 <admin@yogstation.net>
Date:   Mon Mar 7 06:44:45 2022 -0500

    Automatic changelog generation yogstation13#13383 [ci skip]

commit dd06140
Author: tattax <71668564+tattax@users.noreply.github.com>
Date:   Mon Mar 7 08:44:43 2022 -0300

    buffs plasmaman (yogstation13#13383)

commit 03a733d
Author: Yogbot-13 <admin@yogstation.net>
Date:   Mon Mar 7 06:44:12 2022 -0500

    Automatic changelog generation yogstation13#13382 [ci skip]

commit c74311a
Author: Theos <theubernyan@gmail.com>
Date:   Mon Mar 7 06:44:11 2022 -0500

    Revert "stuff (yogstation13#13264)" (yogstation13#13382)

    This reverts commit ee1d7a0.

commit d4d75ff
Author: Yogbot-13 <admin@yogstation.net>
Date:   Mon Mar 7 06:40:14 2022 -0500

    Automatic changelog generation yogstation13#13376 [ci skip]

commit 801c6ff
Author: nmajask <nmajask@gmail.com>
Date:   Mon Mar 7 06:40:12 2022 -0500

    Fixes a missing wire on meta (yogstation13#13376)

commit 40c6749
Author: Yogbot-13 <admin@yogstation.net>
Date:   Mon Mar 7 06:35:34 2022 -0500

    Automatic changelog generation yogstation13#13365 [ci skip]

commit c06ce39
Author: nmajask <nmajask@gmail.com>
Date:   Mon Mar 7 06:35:32 2022 -0500

    Fixes some modular computer stuff (yogstation13#13365)

    * Fixes some modular computer stuff

    - Laptops now have the correct icons when opened
    - You can no longer use programs when the computer lid is shut (RIP laptops being used ever)
    - Fixes roundstart runtimes caused by updating icons when the physical is null
    - Adds an interact sound to a few buttons I missed

    * Missed these

    Oops

commit e7ad3ba
Author: Yogbot-13 <admin@yogstation.net>
Date:   Mon Mar 7 06:32:44 2022 -0500

    Automatic changelog generation yogstation13#13360 [ci skip]

commit 3a9bd4b
Author: Byemoh <baiomurang@gmail.com>
Date:   Mon Mar 7 05:32:43 2022 -0600

    Update heart.dm (yogstation13#13360)

commit 3fd6eab
Author: Yogbot-13 <admin@yogstation.net>
Date:   Mon Mar 7 06:23:04 2022 -0500

    Automatic changelog generation yogstation13#13345 [ci skip]

commit 83e07be
Author: ynot01 <ynot000001@gmail.com>
Date:   Mon Mar 7 06:23:03 2022 -0500

    makes all traitor-available autosurgeons one-use (yogstation13#13345)

    * makes all traitor-available autosurgeons one-use

    * surely

    changes plasmavessel to have 3 uses because it comes with 3 organs

commit 12f8111
Author: Yogbot-13 <admin@yogstation.net>
Date:   Mon Mar 7 06:22:07 2022 -0500

    Automatic changelog generation yogstation13#13334 [ci skip]

commit 0178f38
Author: adamsong <adamsong@users.noreply.github.com>
Date:   Mon Mar 7 06:22:05 2022 -0500

    Some fixes for pools (yogstation13#13334)

    * Some fixes for pools

    * Fixes pools damaging heat resistant people and breaking thermodynamics

    * Copy and paste bad

commit 35da432
Author: Yogbot-13 <admin@yogstation.net>
Date:   Mon Mar 7 06:06:10 2022 -0500

    Automatic changelog generation yogstation13#13234 [ci skip]

commit 76e94e3
Author: Mqiib <43766432+Mqiib@users.noreply.github.com>
Date:   Mon Mar 7 06:06:08 2022 -0500

    I hate horrors I hate horrors I hate horrors (yogstation13#13234)

    * Not So Easy Now

    rage pr

    * LONGER

    * Something something line endings

    I don't actually know how to fix this

    * Undo chem nerf

    Don't get shotgunned??

    * Reduced nerf

commit 1938908
Author: Changelogs <action@github.com>
Date:   Mon Mar 7 02:35:23 2022 +0000

    Automatic changelog compile [ci skip]

commit a43e0a3
Author: Changelogs <action@github.com>
Date:   Sun Mar 6 02:30:25 2022 +0000

    Automatic changelog compile [ci skip]

commit 5f9fd9f
Author: Yogbot-13 <admin@yogstation.net>
Date:   Sat Mar 5 15:15:15 2022 -0500

    Automatic changelog generation yogstation13#13380 [ci skip]

commit 74796a3
Author: Mqiib <43766432+Mqiib@users.noreply.github.com>
Date:   Sat Mar 5 15:15:13 2022 -0500

    Easy fix (yogstation13#13380)

commit f6dcd00
Author: Yogbot-13 <admin@yogstation.net>
Date:   Sat Mar 5 11:39:58 2022 -0500

    Automatic changelog generation yogstation13#13347 [ci skip]

commit 07c91e8
Author: tattax <71668564+tattax@users.noreply.github.com>
Date:   Sat Mar 5 13:39:57 2022 -0300

    t (yogstation13#13347)

commit 0296206
Author: Yogbot-13 <admin@yogstation.net>
Date:   Sat Mar 5 11:39:51 2022 -0500

    Automatic changelog generation yogstation13#13342 [ci skip]

commit 9782f03
Author: cuackles <68789204+cuackles@users.noreply.github.com>
Date:   Sat Mar 5 13:39:49 2022 -0300

    Resprite t45b (yogstation13#13342)

    * resprite

    * Update suits.dmi

    * now even better

    * Update suits.dmi

    * Update hats.dmi

commit 508a23f
Author: Changelogs <action@github.com>
Date:   Sat Mar 5 02:32:26 2022 +0000

    Automatic changelog compile [ci skip]

commit 7349289
Author: Changelogs <action@github.com>
Date:   Fri Mar 4 02:39:40 2022 +0000

    Automatic changelog compile [ci skip]

commit 3046751
Author: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Date:   Thu Mar 3 19:45:29 2022 -0500

    Missed this one

commit 3741a92
Author: Changelogs <action@github.com>
Date:   Thu Mar 3 14:13:07 2022 +0000

    Automatic changelog compile [ci skip]

commit a163395
Author: Yogbot-13 <admin@yogstation.net>
Date:   Thu Mar 3 03:28:50 2022 -0500

    Automatic changelog generation yogstation13#13368 [ci skip]

commit b294bec
Author: adamsong <adamsong@users.noreply.github.com>
Date:   Thu Mar 3 03:28:49 2022 -0500

    Fixes create new traitor runtiming (yogstation13#13368)

commit 262035b
Author: Yogbot-13 <admin@yogstation.net>
Date:   Thu Mar 3 02:59:56 2022 -0500

    Automatic changelog generation yogstation13#13348 [ci skip]

commit b109166
Author: Byemoh <baiomurang@gmail.com>
Date:   Thu Mar 3 01:59:54 2022 -0600

    makes meta atmos space shielding less fucked up and makes this part of engi accessible (yogstation13#13348)

    * ugly

    * fixes

    * combine

commit de29a79
Author: Changelogs <action@github.com>
Date:   Thu Mar 3 02:39:09 2022 +0000

    Automatic changelog compile [ci skip]

commit 3227352
Author: Yogbot-13 <admin@yogstation.net>
Date:   Wed Mar 2 14:56:51 2022 -0500

    Automatic changelog generation yogstation13#13301 [ci skip]

commit 0356e08
Author: Maxim <maxion1234@gmail.com>
Date:   Wed Mar 2 14:56:49 2022 -0500

    Adds an RGB upgrade project (yogstation13#13301)

    * stash

    * functional but seizure inducing

    * aaa much better

    * fucky wucky

    * Update code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm

    Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

    * Update

    * K

    * Update code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm

    Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

commit c6c29f7
Author: Yogbot-13 <admin@yogstation.net>
Date:   Wed Mar 2 14:47:45 2022 -0500

    Automatic changelog generation yogstation13#13339 [ci skip]

commit deea1df
Author: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Date:   Wed Mar 2 14:47:44 2022 -0500

    Adds a system message topic for better integration with tooling (yogstation13#13339)

commit 16797a8
Author: Changelogs <action@github.com>
Date:   Wed Mar 2 02:35:37 2022 +0000

    Automatic changelog compile [ci skip]

commit 4e802b5
Author: Yogbot-13 <admin@yogstation.net>
Date:   Tue Mar 1 19:57:23 2022 -0500

    Automatic changelog generation yogstation13#13343 [ci skip]

commit 9564c18
Author: Hopekz <hopekxx@gmail.com>
Date:   Tue Mar 1 18:57:21 2022 -0600

    Fixes tails being able to wag your tail when stunned (yogstation13#13343)

commit 805fded
Author: Changelogs <action@github.com>
Date:   Tue Mar 1 14:12:37 2022 +0000

    Automatic changelog compile [ci skip]

commit 15184db
Author: Yogbot-13 <admin@yogstation.net>
Date:   Tue Mar 1 05:45:06 2022 -0500

    Automatic changelog generation yogstation13#13355 [ci skip]

commit 2ebecc0
Author: Byemoh <baiomurang@gmail.com>
Date:   Tue Mar 1 04:45:04 2022 -0600

    fuck (yogstation13#13355)

commit ee69164
Author: Yogbot-13 <admin@yogstation.net>
Date:   Tue Mar 1 05:36:20 2022 -0500

    Automatic changelog generation yogstation13#13317 [ci skip]

commit 2d43ea8
Author: nmajask <nmajask@gmail.com>
Date:   Tue Mar 1 05:36:19 2022 -0500

    Adds a ceremonial Rod of Asclepius and a display case in the CMO's office (yogstation13#13317)

    * Rod of Asclepius things

    Rod of Asclepius death now causes you to be pulled into your ghost and a new fake rod that spawns in the CMO's office and has a chance to be a real one.

    * Adds the display to the maps

    * Tweaks the description

    Words this better

    * Rearranges the CMOs office

    * Removed the chance of the rod being real

    This was a bad idea

commit ba8ffe4
Author: Yogbot-13 <admin@yogstation.net>
Date:   Tue Mar 1 05:32:06 2022 -0500

    Automatic changelog generation yogstation13#13213 [ci skip]

commit 317e45b
Author: Hopekz <hopekxx@gmail.com>
Date:   Tue Mar 1 04:32:04 2022 -0600

    Adds a Gym in Perma (yogstation13#13213)

commit ca7760c
Author: Changelogs <action@github.com>
Date:   Tue Mar 1 02:40:29 2022 +0000

    Automatic changelog compile [ci skip]

commit f19fd24
Author: Changelogs <action@github.com>
Date:   Mon Feb 28 14:08:04 2022 +0000

    Automatic changelog compile [ci skip]

commit 3c2913b
Author: Yogbot-13 <admin@yogstation.net>
Date:   Mon Feb 28 01:01:49 2022 -0500

    Automatic changelog generation yogstation13#13352 [ci skip]

commit 0853f94
Author: Chubbygummibear <46236974+Chubbygummibear@users.noreply.github.com>
Date:   Sun Feb 27 22:01:47 2022 -0800

    Removes the last L word reference in yog (yogstation13#13352)

    * bad word gone dab

    * balls gottem

commit 4a8c3dd
Author: Changelogs <action@github.com>
Date:   Mon Feb 28 02:29:24 2022 +0000

    Automatic changelog compile [ci skip]

commit 005ac14
Author: Yogbot-13 <admin@yogstation.net>
Date:   Sun Feb 27 20:11:24 2022 -0500

    Automatic changelog generation yogstation13#13346 [ci skip]

commit 800b69a
Author: ynot01 <ynot000001@gmail.com>
Date:   Sun Feb 27 20:11:23 2022 -0500

    You can no longer escape the BoH bomb (yogstation13#13346)

commit a7f0361
Author: Yogbot-13 <admin@yogstation.net>
Date:   Sun Feb 27 16:48:21 2022 -0500

    Automatic changelog generation yogstation13#13351 [ci skip]

commit 660dd41
Author: LazennG <58535870+LazennG@users.noreply.github.com>
Date:   Sun Feb 27 13:48:20 2022 -0800

    Update particle_control.dm (yogstation13#13351)

commit 977d33c
Author: Yogbot-13 <admin@yogstation.net>
Date:   Sun Feb 27 16:06:55 2022 -0500

    Automatic changelog generation yogstation13#13338 [ci skip]

commit 84e422a
Author: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Date:   Sun Feb 27 16:06:54 2022 -0500

     [BOUNTY] Fixes dab animation not working | Jamie can't edit my PR to make it not compile edition (yogstation13#13338)

    * Fixes dab animation not working

    * Update matrices.dm

    * Reverts jamie's commit to my pr

    Co-authored-by: alexkar598 <>
    Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>

commit 662a17b
Author: Changelogs <action@github.com>
Date:   Sun Feb 27 02:28:42 2022 +0000

    Automatic changelog compile [ci skip]
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@patpol4 patpol4 patpol4 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Feature This adds new content to the game Map - Approved This PR's mapping side has been approved by a mapping maintainer Mapping Will result in a change to a map. Merge conflict Files are conflicting with current live changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@Hopekz @maxion12345 @KillerOrcaCora @bruhlookatthisdood @JamieD1 @patpol4 @Yogbot-13