Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Internal Scarcity 3 - The five minutes nerf #56999

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions code/__DEFINES/obj_flags.dm
Expand Up @@ -41,18 +41,18 @@
#define LAVAPROTECT (1<<0)
#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 NOSLIP (1<<4) //prevents from slipping on wet floors, in space etc
#define NOSLIP_ICE (1<<5) //prevents from slipping on frozen floors
#define MASKINTERNALS (1<<3) // mask allows internals
#define NOSLIP (1<<4) //prevents from slipping on wet floors, in space etc
#define NOSLIP_ICE (1<<5) //prevents from slipping on frozen floors
#define THICKMATERIAL (1<<6) //prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
#define VOICEBOX_TOGGLABLE (1<<7) // The voicebox in this clothing can be toggled.
#define VOICEBOX_DISABLED (1<<8) // The voicebox is currently turned off.
#define SCAN_REAGENTS (1<<9) // Allows helmets, masks and glasses to scan reagents.
#define BLOCKS_SHOVE_KNOCKDOWN (1<<10) // Prevents shovies against a dense object from knocking the wearer down.
#define SNUG_FIT (1<<11) //Prevents knock-off from things like hat-throwing.
#define ANTI_TINFOIL_MANEUVER (1<<12) //Hats with negative effects when worn (i.e the tinfoil hat).
#define DANGEROUS_OBJECT (1<<13) //Clothes that cause a larger notification when placed on a person.
#define LARGE_WORN_ICON (1<<14) //Clothes that use large icons, for applying the proper overlays like blood
#define SNUG_FIT (1<<11) //Prevents knock-off from things like hat-throwing.
#define ANTI_TINFOIL_MANEUVER (1<<12) //Hats with negative effects when worn (i.e the tinfoil hat).
#define DANGEROUS_OBJECT (1<<13) //Clothes that cause a larger notification when placed on a person.
#define LARGE_WORN_ICON (1<<14) //Clothes that use large icons, for applying the proper overlays like blood

/// Flags for the organ_flags var on /obj/item/organ

Expand All @@ -73,7 +73,7 @@
/// Flags for the pod_flags var on /obj/structure/closet/supplypod
#define FIRST_SOUNDS (1<<0) // If it shouldn't play sounds the first time it lands, used for reverse mode

/// Flags for the gun_flags var for firearms
/// Flags for the gun_flags var for firearms
#define TOY_FIREARM_OVERLAY (1<<0) // If update_overlay would add some indicator that the gun is a toy, like a plastic cap on a pistol

/// Flags for sharpness in obj/item
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/tanks/tank_types.dm
Expand Up @@ -152,7 +152,7 @@
w_class = WEIGHT_CLASS_SMALL
force = 4
distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
volume = 1.5 //Around 5 minutes of air


/obj/item/tank/internals/emergency_oxygen/populate_gas()
Expand All @@ -169,7 +169,7 @@
worn_icon_state = "emergency_engi"
tank_holder_icon_state = "holder_emergency_engi"
worn_icon = null
volume = 6 // should last 24 minutes if full
volume = 3 // should last 14 minutes if full

/obj/item/tank/internals/emergency_oxygen/engi/empty/populate_gas()
return
Expand All @@ -179,7 +179,7 @@
icon_state = "emergency_double"
worn_icon_state = "emergency_engi"
tank_holder_icon_state = "holder_emergency_engi"
volume = 12 //If it's double of the above, shouldn't it be double the volume??
volume = 6 //If it's double of the above, shouldn't it be double the volume??

/obj/item/tank/internals/emergency_oxygen/double/empty/populate_gas()
return
Expand Down
2 changes: 0 additions & 2 deletions code/modules/research/designs/misc_designs.dm
Expand Up @@ -591,8 +591,6 @@
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL



/////////////////////////////////////////
/////////////////Tape////////////////////
/////////////////////////////////////////
Expand Down
1 change: 0 additions & 1 deletion code/modules/surgery/organs/lungs.dm
Expand Up @@ -279,7 +279,6 @@


// BZ

var/bz_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/bz][MOLES])
if(bz_pp > BZ_trip_balls_min)
H.hallucination += 10
Expand Down
Binary file modified icons/mob/clothing/mask.dmi
Binary file not shown.