[MDB IGNORE] Eliminates Toxins #60619
Conversation
EOBGames
requested review from
ExcessiveUseOfCobblestone,
Krysonism,
LemonInTheDark,
Maurukas,
ShizCalev and
Twaticus
as code owners
tgstation-server
added
Code Improvement
| @@ -259,7 +259,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister()) | |||
| greyscale_config = /datum/greyscale_config/canister | |||
| greyscale_colors = "#9b5d7f" | |||
|
|
|||
| /obj/machinery/portable_atmospherics/canister/toxins | |||
| /obj/machinery/portable_atmospherics/canister/plasma | |||
There was a problem hiding this comment.
oh my god yessssssssssssssssssssssssssssssssssssssssssssssssssssssssss
|
i wonder if people will ever call it ordnance instead of toxins. people still call the cryptographic sequencer the emag |
There was a problem hiding this comment.
add a txt file for all conversions in here just like the rest
https://github.com/tgstation/tgstation/tree/master/tools/UpdatePaths
in fact you shouldve done that from the beginning wouldve saved you a ton of work
Doesn't particularly concern me what people actually end up calling it- it being something less pants-on-head than toxins in the code pleases me |
|
yeah i figured |
|
Separating toxins damage and atmos gas is fantastic |
|
Everyone will continue to call it the bomb lab or toxins lab, but the other changes will be great |
|
oh my god yes ❤️ |
github-actions
bot
added
the
Merge Conflict
|
I will have to perform 3 ritual sacrifices and a blood rite, but I suppose it is for the best |
|
I wonder why the maptainer chose this for the name |
|
Ah, it's fun quirks like it being called toxins that adds flavor to the game. No need to remove, in my opinion. |
I'll have you know I haven't used an ordnance survey map in 5 years! (They're quite high quality, though- very nice if you need to know the exact height of a random hill in the middle of the Yorkshire countryside) |
do you call doorjacks "Airlock Authentication Override Card™"s then? |
|
Just call it the plasma lab, lol. |
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
github-actions
bot
added
the
Stale
|
Lemme give this a read over, and if I'm good with it I'll bug you about conflicts, cause that's just not fair |
tgstation-server
removed
the
Merge Conflict
code/__DEFINES/obj_flags.dm
Outdated
| @@ -44,7 +44,7 @@ | |||
| #define STOPSPRESSUREDAMAGE (1<<1) //SUIT and HEAD items which stop pressure damage. To stop you taking all pressure damage you must have both a suit and head item with this flag. | |||
| #define BLOCK_GAS_SMOKE_EFFECT (1<<2) // blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! | |||
| #define MASKINTERNALS (1<<3) // mask allows internals | |||
| #define GAS_FILTERING (1<<4) //mask filters toxins and other harmful gases | |||
| #define GAS_FILTERING (1<<4) //mask filters plasma and other harmful gases | |||
There was a problem hiding this comment.
toxins is a fine use here, it's literally like, plasma trit etc. other harmful is n2o and so on
There was a problem hiding this comment.
aye, fair- I was kinda on full find and replace mode there
the goal was to make stuff less obfuscated, not more
alright, I've made one- it's also a fantastic file for showing why this PR is necessary, so that's nice |
|
The ritual is finished, payments have been made, and there's only a 20% chance of aran showing up at my door with a hammer. Let's fucking dance |
|
soulless |
|
Opinion noted and ignored |
* [MDB IGNORE] Eliminates Toxins (tgstation#60619) Repaths everything referring to "toxins" while actually meaning either the room in science or plasma gas. While this PR might be disrespectful to our forefathers, given this is (I believe) a holdover from as far back as the Exadv1 days, this has constantly irked me since I started working with the code. None of the player-facing stuff has referred to plasma as toxin since before 4407 hit, besides the Toxins Lab, and yet all of the type-paths are still pointing at toxins, making it a nightmare to search for in a map editor, and making the code needlessly easy to confuse with that of toxin damage. So this just fires it into the sun. Anything relating to Toxins, the science subdepartment, now makes reference to Ordnance instead. This felt fitting enough given the focus of the subdepartment is around the creation of and testing of explosives. Anything relating to plasma gas has, fittingly, been made to refer to plasma gas. Edit: Ah yes, I feel I should probably apologise off the bat for the size of this PR- the code touched is mostly atmos machinery and simplemobs, a few sprites here and there, and of course the station maps + a few offstation maps. Makes the code more legible and makes mapping less painful. (The payment has been made) * [MDB IGNORE] Eliminates Toxins Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
About The Pull Request
Repaths everything referring to "toxins" while actually meaning either the room in science or plasma gas. While this PR might be disrespectful to our forefathers, given this is (I believe) a holdover from as far back as the Exadv1 days, this has constantly irked me since I started working with the code. None of the player-facing stuff has referred to plasma as toxin since before 4407 hit, besides the Toxins Lab, and yet all of the type-paths are still pointing at toxins, making it a nightmare to search for in a map editor, and making the code needlessly easy to confuse with that of toxin damage. So this just fires it into the sun.
Anything relating to Toxins, the science subdepartment, now makes reference to Ordnance instead. This felt fitting enough given the focus of the subdepartment is around the creation of and testing of explosives.
Anything relating to plasma gas has, fittingly, been made to refer to plasma gas.
Edit: Ah yes, I feel I should probably apologise off the bat for the size of this PR- the code touched is mostly atmos machinery and simplemobs, a few sprites here and there, and of course the station maps + a few offstation maps.
Why It's Good For The Game
Makes the code more legible and makes mapping less painful.
Changelog
🆑
code: Management would like to announce that in accordance with new company policy, the Toxins Lab will henceforth be known as the Ordnance Lab. In addition, a number of company protocols have been rewritten with this in mind.
/:cl: