PGFCSB/OSHA update: Various workplace hazards now are hazards #3387

rye-rice · 2024-09-18T06:30:59Z

About The Pull Request

September 5th, 505 FSC. A Dwayne-class mining vessel- the ISV Crimson Rose- was landed on a sand planet, when it suddenly exploded. The cause was an untrained engineer accidentlly unwrenched a fuel pipe filling the area with invisible hydrogen gas. The gas found an ignition source, likely a broken light tube, and ignited. The fire spread into the midsection, where the engineer perished due to the fire. However, the fire rapidly heated the air tank of the vessel, and pressurized tank exploded, shredding 2 crew members and critically damaged the vessel.

Incidents like this investigated by the PGFCSB clearly show a poor safety culture on the frontier.

Why It's Good For The Game

You see that above story? This was from a real round, however the part i neglected to mention was the massive explosion was not actually a mechanic, but an admin fucking up blowing up an oxygen tank to try and add more oxygen for the fire, which accidently maxcaped the ship. However, I was so impressed with this story I decided to make it into a mechanic and is apart of this pr, which it's focus is workplace hazards. So let's see what we have here.

Many changes were made to make huamans more squishy and less supermen.
- But wait! Won't this conflict with Temperature Feedback #3358 ? The changes here are made to work in tanden with that PR, for better situational awareness and to make hazards more evident.
Ports TGMC's "flame_radius" proc and is used by flame radius for explosions
Extingushers like flamethrowers can go over objects now, so you can finally extinguish the fucking turf fires blocked by objects.
Smoking a cigarette near a fuel tank or pressurized tank will either blow up the tank or set you on fire in a flash fire.
Makes tank explosions better and less shitty, it should be more common to happen during fires, especially during gas fires
Adds carbon monoxide, produced by PACMANS, uranium ones produce barely any. Unlike IRL its not flammable as I cannot set the lower explosive limit for it.
Makes hydrogen invisible. Smiles
Pressurized tanks have much more air, totally not for them to explode more easily.
Gibbing doesnt destroy the body anymore. Anti-salt measure and gibbing destroying torsos is very unpopular, might as well do it here.

Changelog

🆑
add: Revise your safety guidelines, as fires can and will explode tanks if in contact with them! Be careful!
add: Carbon monoxide, produced by pacmans. Don't huff it, it's not fun.
add: changes how flame explosions work
add: Be careful where you smoke...
/:cl:

FalloutFalcon

This is pretty unatomic.. Nearly all of this is balance changes that seem pretty arbitrary. I'm really not sure I like the tank thresholds much and would like to see some examples of how that would play out in game, are there any tanks that start with this pressure. How easy is it to actually blow up a tank.
All the current sources of gibbing SHOULD be round removal as its mostly mega fauna or extreme explosions that should not leave a intact torso. carbon monoxide also seems like it should be its own pr as i don't see its relation to explosions at all. Im also not a big fan of most of its code but i imagine all the other gasses aren't much better.
I would prefer this being broken up into at least 2 prs probably more tbh.

FalloutFalcon · 2024-09-18T14:16:51Z

code/modules/mob/living/carbon/death.dm

@@ -24,7 +24,7 @@
 	M.Scale(1.8, 1.2)
 	animate(src, time = 40, transform = M, easing = SINE_EASING)

-/mob/living/carbon/gib(no_brain, no_organs, no_bodyparts, safe_gib = FALSE)
+/mob/living/carbon/gib(no_brain, no_organs, no_bodyparts, safe_gib = TRUE)


This has to be a separate pr

FalloutFalcon · 2024-09-18T14:20:09Z

code/modules/reagents/chemistry/reagents/other_reagents.dm

+		living_carbon.cure_trauma_type(/datum/brain_trauma/mild/muscle_weakness)
+		living_carbon.cure_trauma_type(/datum/brain_trauma/mild/concussion)
+		living_carbon.cure_trauma_type(/datum/brain_trauma/mild/speech_impediment)
+		living_carbon.cure_trauma_type(/datum/brain_trauma/mild/expressive_aphasia)


you can now clear a concussion by huffing a single breath of carbon monoxide. You need to add source types if you want this so you only clear a trauma developed from carbon monoxide.

code/modules/atmospherics/auxgm/gas_types.dm

code/datums/components/pellet_cloud.dm

FalloutFalcon · 2024-09-18T14:23:32Z

code/datums/components/pellet_cloud.dm

-	if(!isammocasing(parent) && !isgrenade(parent) && !islandmine(parent) && !issupplypod(parent))
-		return COMPONENT_INCOMPATIBLE


please at least check that its an atom or obj

FalloutFalcon · 2024-09-18T14:24:47Z

code/modules/reagents/chemistry/reagents/other_reagents.dm

+			to_chat(src, "<span class='warning'>You feel dizzy.</span>")
+		if(50 to 150)
+			to_chat(victim, "<span class='warning'>[pick("Your head hurts.", "Your head pounds.")]</span>")
+			victim.Dizzy(5)
+			victim.adjustStaminaLoss(1)
+		if(150 to 250)
+			to_chat(victim, "<span class='userdanger'>[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]</span>")
+			victim.adjustStaminaLoss(3)
+			victim.Stun(10)
+			victim.Dizzy(5)
+			victim.confused += (accumilation/50)
+			victim.gain_trauma(/datum/brain_trauma/mild/expressive_aphasia)
+			victim.gain_trauma(/datum/brain_trauma/mild/muscle_weakness)
+		if(250 to 350)
+			to_chat(victim, "<span class='userdanger'>[pick("What were you doing...?", "Where are you...?", "What's going on...?")]</span>")


span define all of these

code/modules/surgery/organs/lungs.dm

generalthrax · 2024-09-18T17:40:13Z

As of right now, the tank max pressure means that air pumps will immediately blow up tanks if you fill them.

Is carbon monoxide produced by anything other than pacmans? I've noticed that its just Everywhere on a ship even though scrubbers should be robust enough to deal with it.

Co-authored-by: FalloutFalcon <[email protected]> Signed-off-by: rye-rice <[email protected]>

…into gretchen's-bane

firebudgy · 2024-09-18T20:36:55Z

Ships aren't properly scrubbing CO in engine bays, and apparently it makes you permanently hallucinate upon entering them. Might be something worth tuning.

Gristlebee · 2024-09-18T20:37:26Z

I'd maybe recommend adding some hint or addition to the descs welding tanks and gas tanks to indicate it can explode if you smoke near them, so there's some stated warning to a punishment mechanic.

KittyNoodle · 2024-09-18T20:38:20Z

a major problem with Carbon Monoxide is that it works like BZ, so if you take in a whif of a tiny amount of the gas you just get fucked for the next 7 minutes

firebudgy · 2024-09-18T21:40:38Z

Probably worth adding some form of indication to exploding emergency oxygen tanks and the like since nobody seems to know what the safe pressure is (as there's no feedback).

SomeguyManperson · 2024-09-19T21:52:58Z

code/__DEFINES/atmospherics.dm

+#define TANK_LEAK_PRESSURE (20 * ONE_ATMOSPHERE + 5)
 /// Tank spills all contents into atmosphere
-#define TANK_RUPTURE_PRESSURE (35.*ONE_ATMOSPHERE)
+#define TANK_RUPTURE_PRESSURE (20 * ONE_ATMOSPHERE)


2023 kpa is less than the air pump, which fills to ~2533, so people trying to fill tanks with one can break them (source: experience). I'd think at the very least tanks should have warning labels for maximum pressure/temperature

Good idea

Probably on a examine()

code/game/objects/items/tanks/tanks.dm

SomeguyManperson · 2024-09-19T22:01:33Z

code/modules/power/port_gen.dm

+	var/pollution_multiplier = 0
+	var/pollution_gas = GAS_CO


This stuff feels like it would work better if not for the fact you are inside a ship all the time, moving a generator outside would be complicated and/or tedious and most ships rely on them

Yeah it's effectively disabled right now, atmos during testing and on live looked very different. I might keep it then enable it far far later when we got better primary engines

iirc Rylies ripping this out for now, for a separate pr.

SomeguyManperson · 2024-09-19T22:02:19Z

code/modules/reagents/chemistry/reagents/other_reagents.dm

+	if(holder.has_reagent(/datum/reagent/oxygen))
+		holder.remove_reagent(/datum/reagent/carbon_monoxide, 2*REM)
+		accumilation = accumilation/4


This is double dipped w/ oxygen reagent on_mob_life and I think it should be handled in one or the other

SomeguyManperson · 2024-09-19T22:07:02Z

code/modules/reagents/chemistry/reagents/other_reagents.dm

+			victim.gain_trauma(/datum/brain_trauma/mild/expressive_aphasia)
+			victim.gain_trauma(/datum/brain_trauma/mild/muscle_weakness)


The traumas here should probably be tracked somehow so huffing monoxide doesn't fix unrelated ones

There's no way to track it as far as I'm aware, the < 140 is a bandaid

code/modules/reagents/chemistry/reagents/other_reagents.dm

SomeguyManperson · 2024-09-19T22:14:13Z

code/__DEFINES/atmospherics.dm

 /// Tank starts leaking
-#define TANK_LEAK_PRESSURE (30.*ONE_ATMOSPHERE)
+#define TANK_LEAK_PRESSURE (20 * ONE_ATMOSPHERE + 5)


This is higher than the rupture pressure so tanks probably won't leak (for long) they'll just pop

I removed tank leaking from internal tanks, it didn't seem to even work as intended and during testing it was like... meh honestly

SomeguyManperson · 2024-09-19T22:15:18Z

code/__DEFINES/species.dm

+#define HAZARD_HIGH_PRESSURE 303
 /// This determins when the orange pressure icon is displayed (it is 0.7 * HAZARD_HIGH_PRESSURE)
-#define WARNING_HIGH_PRESSURE 325
+#define WARNING_HIGH_PRESSURE 202
 /// This is when the gray low pressure icon is displayed. (it is 2.5 * HAZARD_LOW_PRESSURE)
-#define WARNING_LOW_PRESSURE 50
+#define WARNING_LOW_PRESSURE 60
 /// This is when the black ultra-low pressure icon is displayed. (This one is set as a constant)
-#define HAZARD_LOW_PRESSURE 20
+#define HAZARD_LOW_PRESSURE 40


probably update the comments here because they will be inaccurate with the current numbers

code/__DEFINES/species.dm

SomeguyManperson · 2024-09-19T22:19:16Z

code/game/objects/items.dm

+		var/turf/test_turf = get_step(location, dir)
+		for(var/obj/to_test as obj in test_turf.contents)
+			if(istype(to_test, /obj/structure/reagent_dispensers/fueltank))
+				location.visible_message("<span class='userdanger'>A single ember from [src] drops gently onto [to_test]. Uh oh.</span>")


span macros

rye-rice · 2024-09-19T22:46:46Z

I'll try later to get this into a mergable state but tmt wanted to look at it post pref rework, so don't merge until then

thgvr · 2024-10-04T21:12:35Z

code/modules/mob/living/carbon/death.dm

@@ -24,7 +24,7 @@
 	M.Scale(1.8, 1.2)
 	animate(src, time = 40, transform = M, easing = SINE_EASING)

-/mob/living/carbon/gib(no_brain, no_organs, no_bodyparts, safe_gib = FALSE)
+/mob/living/carbon/gib(no_brain, no_organs, no_bodyparts, safe_gib = TRUE)


Again, please stop shoving this into random PRs without talking to anyone about it. I'm not interested in having extreme explosions just blow your limbs off like a lego man

additionally if your going to make the change because you want to prevent it specifically for explosion related gibbing it needs to be for those only instead of turning most if not all gibs into safe ones.
make this its own pr please..... and actually elaborate why..

thgvr · 2024-10-05T21:51:19Z

I'm almost sure now that setting safe_gib = TRUE will crash the server on gibbing

rye-rice · 2024-10-05T21:58:16Z

removed safe_gib from this, i still think its a good idea but it crashes the server unfortunately, for another time

im moving the temperture stuff to another pr

FalloutFalcon · 2024-10-10T05:44:04Z

removed safe_gib from this, i still think its a good idea but it crashes the server unfortunately, for another time

im moving the temperture stuff to another pr

this should have been removed from the pr regardless of if it crashed.

rye-rice · 2024-10-24T20:21:14Z

For another time

rye-rice added 7 commits September 16, 2024 16:56

get this party started with carbon monoxide

ec4c776

removes flammablity

7f44e89

should be better

31bbc79

brings back this anti salt measure

50e86c9

yeah

0584462

gatekeeping ass component

205585a

last m inute changes

0e5c49b

github-actions bot added the Code change Watch something violently break. label Sep 18, 2024

fucker

b0db41f

github-actions bot requested a review from FalloutFalcon September 18, 2024 06:35

rye-rice added 3 commits September 17, 2024 23:41

FUCK

bfb5c49

bitch

109e294

CI fail

65521fe

FalloutFalcon requested changes Sep 18, 2024

View reviewed changes

fixes, l inux auxmos works weirdly

e72401d

github-actions bot requested a review from FalloutFalcon September 18, 2024 17:42

rye-rice and others added 5 commits September 18, 2024 10:56

Update code/datums/components/pellet_cloud.dm

8efcbbd

Co-authored-by: FalloutFalcon <[email protected]> Signed-off-by: rye-rice <[email protected]>

on second thought

361b504

Merge branch 'gretchen's-bane' of https://github.com/rye-rice/Shiptest …

c491220

…into gretchen's-bane

lets see

1031041

typo

dc73e62

rye-rice added 4 commits September 18, 2024 15:02

changes for TM

beb7563

wawa

cede190

boom

974eb1d

fine tuning

c834e3a

rye-rice added 3 commits September 18, 2024 19:30

fixes extingusher

81c7376

better metabolism?

ab74cb3

monoxide filtered by defaul

3300ddb

SomeguyManperson reviewed Sep 19, 2024

View reviewed changes

rye-rice changed the title ~~Domino of Explosions: Explosion on a Dwayne-Class~~ PGFCSB/OSHA update: Various workplace hazards now are hazards Oct 2, 2024

thgvr reviewed Oct 4, 2024

View reviewed changes

whatever

d28e214

MOVED TO ANOTHER PR

8591ca0

Anticept mentioned this pull request Oct 10, 2024

[BUG] Crushed Cans lacking sprites #3517

Open

rye-rice closed this Oct 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PGFCSB/OSHA update: Various workplace hazards now are hazards #3387

PGFCSB/OSHA update: Various workplace hazards now are hazards #3387

rye-rice commented Sep 18, 2024

FalloutFalcon left a comment

FalloutFalcon Sep 18, 2024

FalloutFalcon Sep 18, 2024

FalloutFalcon Sep 18, 2024

FalloutFalcon Sep 18, 2024

generalthrax commented Sep 18, 2024

firebudgy commented Sep 18, 2024

Gristlebee commented Sep 18, 2024 •

edited

Loading

KittyNoodle commented Sep 18, 2024

firebudgy commented Sep 18, 2024

SomeguyManperson Sep 19, 2024

rye-rice Sep 19, 2024

SomeguyManperson Sep 19, 2024

rye-rice Sep 19, 2024

generalthrax Sep 19, 2024

SomeguyManperson Sep 19, 2024

SomeguyManperson Sep 19, 2024

rye-rice Sep 19, 2024

SomeguyManperson Sep 19, 2024

rye-rice Sep 19, 2024

SomeguyManperson Sep 19, 2024

rye-rice Sep 19, 2024

SomeguyManperson Sep 19, 2024

rye-rice commented Sep 19, 2024

thgvr Oct 4, 2024

FalloutFalcon Oct 5, 2024

thgvr commented Oct 5, 2024

rye-rice commented Oct 5, 2024

FalloutFalcon commented Oct 10, 2024

rye-rice commented Oct 24, 2024

		if(!isammocasing(parent) && !isgrenade(parent) && !islandmine(parent) && !issupplypod(parent))
		return COMPONENT_INCOMPATIBLE

		victim.gain_trauma(/datum/brain_trauma/mild/expressive_aphasia)
		victim.gain_trauma(/datum/brain_trauma/mild/muscle_weakness)

PGFCSB/OSHA update: Various workplace hazards now are hazards #3387

PGFCSB/OSHA update: Various workplace hazards now are hazards #3387

Conversation

rye-rice commented Sep 18, 2024

About The Pull Request

Why It's Good For The Game

Changelog

FalloutFalcon left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

generalthrax commented Sep 18, 2024

firebudgy commented Sep 18, 2024

Gristlebee commented Sep 18, 2024 • edited Loading

KittyNoodle commented Sep 18, 2024

firebudgy commented Sep 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rye-rice commented Sep 19, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thgvr commented Oct 5, 2024

rye-rice commented Oct 5, 2024

FalloutFalcon commented Oct 10, 2024

rye-rice commented Oct 24, 2024

Gristlebee commented Sep 18, 2024 •

edited

Loading