diff --git a/code/datums/agents/tools/conceal_gloves.dm b/code/datums/agents/tools/conceal_gloves.dm index 8bb7e98a5085..de8d3753dc70 100644 --- a/code/datums/agents/tools/conceal_gloves.dm +++ b/code/datums/agents/tools/conceal_gloves.dm @@ -5,9 +5,7 @@ icon_state = "black" item_state = "bgloves" - siemens_coefficient = 0 - permeability_coefficient = 0.05 flags_cold_protection = BODY_FLAG_HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROT flags_heat_protection = BODY_FLAG_HANDS diff --git a/code/datums/disease.dm b/code/datums/disease.dm index 497c62cddec6..57eb1e2d73fe 100644 --- a/code/datums/disease.dm +++ b/code/datums/disease.dm @@ -104,16 +104,20 @@ GLOBAL_LIST_INIT(diseases, typesof(/datum/disease) - /datum/disease) how_spread = force_spread if(how_spread == SPECIAL || how_spread == NON_CONTAGIOUS || how_spread == BLOOD)//does not spread - return + return FALSE if(stage < contagious_period) //the disease is not contagious at this stage - return + return FALSE if(!source)//no holder specified if(affected_mob)//no mob affected holder source = affected_mob else //no source and no mob affected. Rogue disease. Break - return + return FALSE + + var/mob/source_mob = source + if(istype(source_mob) && !source_mob.can_pass_disease()) + return FALSE var/check_range = airborne_range//defaults to airborne - range 2 @@ -122,7 +126,7 @@ GLOBAL_LIST_INIT(diseases, typesof(/datum/disease) - /datum/disease) if(isturf(source.loc)) FOR_DOVIEW(var/mob/living/carbon/victim, check_range, source, HIDE_INVISIBLE_OBSERVER) - if(isturf(victim.loc)) + if(isturf(victim.loc) && victim.can_pass_disease()) if(AStar(source.loc, victim.loc, /turf/proc/AdjacentTurfs, /turf/proc/Distance, check_range)) victim.contract_disease(src, 0, 1, force_spread) FOR_DOVIEW_END diff --git a/code/datums/diseases/mob_procs.dm b/code/datums/diseases/mob_procs.dm index c27efecdff84..83f8c65c5b3f 100644 --- a/code/datums/diseases/mob_procs.dm +++ b/code/datums/diseases/mob_procs.dm @@ -49,36 +49,10 @@ if(prob(15/virus.permeability_mod)) return //the power of immunity compels this disease! but then you forgot resistances var/passed = 1 - //chances to target this zone - var/head_ch - var/body_ch - var/hands_ch - var/feet_ch - if(spread_type == -5) spread_type = virus.spread_type - switch(spread_type) - if(CONTACT_HANDS) - head_ch = 0 - body_ch = 0 - hands_ch = 100 - feet_ch = 0 - if(CONTACT_FEET) - head_ch = 0 - body_ch = 0 - hands_ch = 0 - feet_ch = 100 - else - head_ch = 100 - body_ch = 100 - hands_ch = 25 - feet_ch = 25 - - - var/target_zone = pick(head_ch;1,body_ch;2,hands_ch;3,feet_ch;4)//1 - head, 2 - body, 3 - hands, 4- feet - - passed = check_disease_pass_clothes(target_zone) + passed = can_pass_disease() if(passed) AddDisease(virus) @@ -102,45 +76,3 @@ . = ..() med_hud_set_status() -//returns whether the mob's clothes stopped the disease from passing through -/mob/proc/check_disease_pass_clothes(target_zone) - return 1 - -/mob/living/carbon/human/check_disease_pass_clothes(target_zone) - var/obj/item/clothing/Cl - var/protection = 0 - switch(target_zone) - if(1) - if(isobj(head) && !istype(head, /obj/item/paper)) - Cl = head - protection += (Cl.permeability_coefficient*100)-100 - if(isobj(wear_mask)) - Cl = wear_mask - protection += (Cl.permeability_coefficient*100)-100 - if(2)//arms and legs included - if(isobj(wear_suit)) - Cl = wear_suit - protection += (Cl.permeability_coefficient*100)-100 - if(isobj(WEAR_BODY)) - Cl = WEAR_BODY - protection += (Cl.permeability_coefficient*100)-100 - if(3) - if(isobj(wear_suit) && wear_suit.flags_armor_protection & BODY_FLAG_HANDS) - Cl = wear_suit - protection += (Cl.permeability_coefficient*100)-100 - - if(isobj(gloves)) - Cl = gloves - protection += (Cl.permeability_coefficient*100)-100 - if(4) - if(isobj(wear_suit) && wear_suit.flags_armor_protection & BODY_FLAG_FEET) - Cl = wear_suit - protection += (Cl.permeability_coefficient*100)-100 - - if(isobj(shoes)) - Cl = shoes - protection += (Cl.permeability_coefficient*100)-100 - else - to_chat(src, "Something bad happened with disease target zone code, tell a dev or admin ") - return prob(clamp(protection, 5, 90)) - diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 7fd82aeb9c10..0733c46a872a 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -90,13 +90,8 @@ var/list/actions /// list of paths of action datums to give to the item on New(). var/list/actions_types - - //var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible - /// for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets) var/gas_transfer_coefficient = 1 - /// for chemicals/diseases - var/permeability_coefficient = 1 /// for electrical admittance/conductance (electrocution checks and shit) var/siemens_coefficient = 1 /// How much clothing is slowing you down. Negative values speeds you up diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm index fa5332c0c996..fa2e959b7f64 100644 --- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm +++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm @@ -1,27 +1,25 @@ /obj/structure/closet/l3closet name = "level-3 biohazard suit closet" desc = "It's a storage unit for level-3 biohazard gear." - icon_state = "bio" - icon_closed = "bio" - icon_opened = "bioopen" + icon_state = "bio_general" + icon_closed = "bio_general" + icon_opened = "bio_generalopen" /obj/structure/closet/l3closet/Initialize() . = ..() - new /obj/item/clothing/suit/bio_suit/general( src ) - new /obj/item/clothing/head/bio_hood/general( src ) - + new /obj/item/clothing/suit/bio_suit( src ) + new /obj/item/clothing/head/bio_hood( src ) -/obj/structure/closet/l3closet/general - icon_state = "bio_general" - icon_closed = "bio_general" - icon_opened = "bio_generalopen" +/obj/structure/closet/l3closet/medical + icon_state = "bio_medical" + icon_closed = "bio_medical" + icon_opened = "bio_medicalopen" -/obj/structure/closet/l3closet/general/Initialize() +/obj/structure/closet/l3closet/medical/Initialize() . = ..() contents = list() - new /obj/item/clothing/suit/bio_suit/general( src ) - new /obj/item/clothing/head/bio_hood/general( src ) - + new /obj/item/clothing/suit/bio_suit/medical( src ) + new /obj/item/clothing/head/bio_hood/medical( src ) /obj/structure/closet/l3closet/virology icon_state = "bio_virology" @@ -33,9 +31,6 @@ contents = list() new /obj/item/clothing/suit/bio_suit/virology( src ) new /obj/item/clothing/head/bio_hood/virology( src ) - new /obj/item/clothing/mask/breath(src) - new /obj/item/tank/oxygen(src) - /obj/structure/closet/l3closet/security icon_state = "bio_security" @@ -48,19 +43,6 @@ new /obj/item/clothing/suit/bio_suit/security( src ) new /obj/item/clothing/head/bio_hood/security( src ) - -/obj/structure/closet/l3closet/janitor - icon_state = "bio_janitor" - icon_closed = "bio_janitor" - icon_opened = "bio_janitoropen" - -/obj/structure/closet/l3closet/janitor/Initialize() - . = ..() - contents = list() - new /obj/item/clothing/suit/bio_suit/janitor( src ) - new /obj/item/clothing/head/bio_hood/janitor( src ) - - /obj/structure/closet/l3closet/scientist icon_state = "bio_scientist" icon_closed = "bio_scientist" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 323b5ead1df2..8144f58bb8fe 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -333,7 +333,7 @@ siemens_coefficient = 0.9 flags_armor_protection = BODY_FLAG_FEET flags_equip_slot = SLOT_FEET - permeability_coefficient = 0.50 + slowdown = SHOES_SLOWDOWN blood_overlay_type = "feet" /// The currently inserted item. diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 3f8e2080f35e..ce28669a9710 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -4,7 +4,7 @@ icon_state = "insulated" item_state = "insulated" siemens_coefficient = 0 - permeability_coefficient = 0.05 + flags_cold_protection = BODY_FLAG_HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROT flags_heat_protection = BODY_FLAG_HANDS @@ -16,7 +16,6 @@ icon_state = "insulated" item_state = "insulated" siemens_coefficient = 1 //Set to a default of 1, gets overridden in New() - permeability_coefficient = 0.05 /obj/item/clothing/gloves/fyellow/New() siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5) diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index d36073bb48a0..e178f4dcc3cb 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -7,7 +7,7 @@ icon_state = "black" item_state = "black" siemens_coefficient = 0.6 - permeability_coefficient = 0.05 + flags_cold_protection = BODY_FLAG_HANDS flags_heat_protection = BODY_FLAG_HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROT @@ -84,7 +84,7 @@ icon_state = "yellow" item_state = "ygloves" siemens_coefficient = 0 - permeability_coefficient = 0.01 + adopts_squad_color = FALSE /obj/item/clothing/gloves/marine/techofficer/commander diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 15a4cf742464..20e4f2d4424c 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -21,7 +21,7 @@ icon_state = "black" item_state = "swat_gl" siemens_coefficient = 0.6 - permeability_coefficient = 0.05 + flags_cold_protection = BODY_FLAG_HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROT @@ -34,7 +34,7 @@ icon_state = "black" item_state = "swat_gl" siemens_coefficient = 0 - permeability_coefficient = 0.05 + flags_cold_protection = BODY_FLAG_HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROT flags_heat_protection = BODY_FLAG_HANDS @@ -46,14 +46,13 @@ icon_state = "latex" item_state = "lgloves" siemens_coefficient = 0.30 - permeability_coefficient = 0.35 + armor_bio = CLOTHING_ARMOR_LOW /obj/item/clothing/gloves/botanic_leather desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin." name = "botanist's leather gloves" icon_state = "leather" item_state = "ggloves" - permeability_coefficient = 0.9 siemens_coefficient = 0.9 diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 3d0471a48253..e0ea973094b5 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -87,7 +87,7 @@ hardhat_color = "red" name = "firefighter helmet" gas_transfer_coefficient = 0.01 - permeability_coefficient = 0.01 + flags_inventory = NOPRESSUREDMAGE|BLOCKSHARPOBJ|COVERMOUTH|ALLOWINTERNALS|COVEREYES|BLOCKGASEFFECT|ALLOWREBREATH|ALLOWCPR flags_heat_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES flags_cold_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 140d73fd05a0..a574546afa5d 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -1462,7 +1462,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( armor_rad = CLOTHING_ARMOR_HIGHPLUS force = 0 //"The M3 MOPP mask would be a normal weapon if you were to hit someone with it." throwforce = 0 - flags_inventory = BLOCKSHARPOBJ + flags_inventory = BLOCKSHARPOBJ|BLOCKGASEFFECT flags_marine_helmet = NO_FLAGS flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE flags_inv_hide = HIDEEARS|HIDEALLHAIR diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index d5b2f98b6d09..1bb853beaa9a 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -45,7 +45,6 @@ name = "plague doctor's hat" desc = "These were once used by Plague doctors. They're pretty much useless." icon_state = "plaguedoctor" - permeability_coefficient = 0.01 siemens_coefficient = 0.9 flags_armor_protection = 0 diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index ffdda93f8a73..bbfb67042cf8 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -7,7 +7,6 @@ flags_armor_protection = 0 w_class = SIZE_SMALL gas_transfer_coefficient = 0.10 - permeability_coefficient = 0.50 var/hanging = 0 @@ -37,7 +36,7 @@ name = "medical mask" icon_state = "medical" item_state = "medical" - permeability_coefficient = 0.01 + @@ -235,4 +234,4 @@ flags_armor_protection = 0 w_class = SIZE_SMALL gas_transfer_coefficient = 0.10 - permeability_coefficient = 0.50 + diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index b13fab0ae5a4..ff4d520bb952 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -11,7 +11,6 @@ w_class = SIZE_SMALL item_state = "gas_alt" gas_transfer_coefficient = 0.01 - permeability_coefficient = 0.9 armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 4f928f62399f..7edf77525e23 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -17,13 +17,12 @@ flags_inventory = COVERMOUTH flags_armor_protection = 0 gas_transfer_coefficient = 0.90 - permeability_coefficient = 0.3 armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE armor_energy = CLOTHING_ARMOR_NONE armor_bomb = CLOTHING_ARMOR_NONE - armor_bio = CLOTHING_ARMOR_NONE + armor_bio = CLOTHING_ARMOR_LOW armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_NONE diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index f3de770790a8..2de4df03fc71 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -49,7 +49,7 @@ /obj/item/clothing/shoes/white name = "white shoes" icon_state = "white" - permeability_coefficient = 0.01 + /obj/item/clothing/shoes/leather name = "leather shoes" diff --git a/code/modules/clothing/shoes/marine_shoes.dm b/code/modules/clothing/shoes/marine_shoes.dm index b71c69643ff4..e80983172a19 100644 --- a/code/modules/clothing/shoes/marine_shoes.dm +++ b/code/modules/clothing/shoes/marine_shoes.dm @@ -144,7 +144,7 @@ /obj/item/clothing/shoes/veteran/pmc/commando name = "\improper PMC commando boots" desc = "A pair of heavily armored, acid-resistant boots." - permeability_coefficient = 0.01 + armor_bio = CLOTHING_ARMOR_HIGH siemens_coefficient = 0.2 unacidable = TRUE diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 91ae13958e46..c5fc3d27cced 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -3,7 +3,7 @@ name = "brown shoes" icon_state = "brown" item_state = "brown" - permeability_coefficient = 0.05 + flags_inventory = NOSLIPPING var/list/clothing_choices = list() @@ -52,7 +52,7 @@ name = "ninja shoes" desc = "A pair of running shoes. Excellent for running and even better for smashing skulls." icon_state = "s-ninja" - permeability_coefficient = 0.01 + flags_inventory = NOSLIPPING armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH @@ -85,7 +85,7 @@ desc = "Rubber boots" name = "galoshes" icon_state = "galoshes" - permeability_coefficient = 0.05 + flags_inventory = NOSLIPPING /obj/item/clothing/shoes/clown_shoes diff --git a/code/modules/clothing/spacesuits/captain.dm b/code/modules/clothing/spacesuits/captain.dm index 2643e43b2b6a..2222648f6250 100644 --- a/code/modules/clothing/spacesuits/captain.dm +++ b/code/modules/clothing/spacesuits/captain.dm @@ -4,7 +4,7 @@ icon_state = "capspace" item_state = "capspacehelmet" desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads." - permeability_coefficient = 0.01 + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH armor_laser = CLOTHING_ARMOR_MEDIUMHIGH @@ -22,7 +22,6 @@ item_state = "capspacesuit" w_class = SIZE_LARGE gas_transfer_coefficient = 0.01 - permeability_coefficient = 0.02 flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun, /obj/item/ammo_magazine, /obj/item/weapon/baton,/obj/item/restraint/handcuffs) slowdown = 1.5 diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index a8b056d0bb9d..13996e9688a7 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -6,7 +6,7 @@ icon_state = "space" desc = "A special helmet designed for work in a hazardous, low-pressure environment." item_state = "space" - permeability_coefficient = 0.01 + armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE @@ -30,7 +30,6 @@ item_state = "s_suit" w_class = SIZE_LARGE//bulky item gas_transfer_coefficient = 0.01 - permeability_coefficient = 0.02 flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS allowed = list(/obj/item/device/flashlight,/obj/item/tank/emergency_oxygen) slowdown = 3 diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 7e9a41c6becc..519f848abb42 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -248,7 +248,7 @@ icon_state = "deathsquad" item_state = "swat_suit" gas_transfer_coefficient = 0.01 - permeability_coefficient = 0.01 + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/baton,/obj/item/restraint/handcuffs,/obj/item/tank/emergency_oxygen) slowdown = 1 diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index eb99005328bc..a53ff33a1969 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -1,18 +1,19 @@ //Biosuit complete with shoes (in the item sprite) +//Standard biosuit, orange stripe + /obj/item/clothing/head/bio_hood name = "bio hood" - icon_state = "bio" + icon_state = "bio_general" desc = "A hood that protects the head and face from biological contaminants." - permeability_coefficient = 0.2 armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE armor_energy = CLOTHING_ARMOR_NONE armor_bomb = CLOTHING_ARMOR_NONE - armor_bio = CLOTHING_ARMOR_ULTRAHIGH + armor_bio = CLOTHING_ARMOR_HARDCORE armor_rad = CLOTHING_ARMOR_MEDIUM armor_internaldamage = CLOTHING_ARMOR_LOW - flags_inventory = COVEREYES|COVERMOUTH + flags_inventory = COVEREYES|COVERMOUTH|BLOCKGASEFFECT flags_inv_hide = HIDEFACE|HIDEMASK|HIDEEARS|HIDEALLHAIR flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES siemens_coefficient = 0.9 @@ -26,11 +27,10 @@ /obj/item/clothing/suit/bio_suit name = "bio suit" desc = "A suit that protects against biological contamination." - icon_state = "bio" + icon_state = "bio_general" item_state = "bio_suit" w_class = SIZE_LARGE//bulky item gas_transfer_coefficient = 0.01 - permeability_coefficient = 0.2 flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS slowdown = 1 armor_melee = CLOTHING_ARMOR_NONE @@ -47,7 +47,7 @@ /obj/item/clothing/suit/storage/synthbio name = "bio suit" desc = "Synthetic compliant bio-hazard suit. Intended to allow a synthetic to offer the illusion of infection control to humans. Has had most of the internal protective lining removed, allowing it to hold equipment and be lighter to move in." - icon_state = "bio" + icon_state = "bio_general" item_state = "bio_suit" allowed = list( /obj/item/weapon/baton, @@ -65,13 +65,13 @@ /obj/item/device/motiondetector, ) -//Standard biosuit, orange stripe -/obj/item/clothing/head/bio_hood/general - icon_state = "bio_general" +//Medical biosuit, blue wrist bands +/obj/item/clothing/head/bio_hood/medical + icon_state = "bio_med" flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES -/obj/item/clothing/suit/bio_suit/general - icon_state = "bio_general" +/obj/item/clothing/suit/bio_suit/medical + icon_state = "bio_med" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS|BODY_FLAG_HANDS|BODY_FLAG_FEET flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL @@ -84,7 +84,7 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL -//Security biosuit, grey with red stripe across the chest +//Security biosuit, red wrist bands /obj/item/clothing/head/bio_hood/security icon_state = "bio_security" @@ -93,17 +93,7 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL -//Janitor's biosuit, grey with purple arms -/obj/item/clothing/head/bio_hood/janitor - icon_state = "bio_janitor" - -/obj/item/clothing/suit/bio_suit/janitor - icon_state = "bio_janitor" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS - flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL - - -//Scientist's biosuit, white with a pink-ish hue +//Scientist's biosuit, purple wrist bands /obj/item/clothing/head/bio_hood/scientist icon_state = "bio_scientist" @@ -112,15 +102,6 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL -//CMO's biosuit, blue stripe -/obj/item/clothing/suit/bio_suit/cmo - icon_state = "bio_cmo" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS - flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL - -/obj/item/clothing/head/bio_hood/cmo - icon_state = "bio_cmo" - //Plague Dr mask can be found in clothing/masks/gasmask.dm /obj/item/clothing/suit/bio_suit/plaguedoctorsuit diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 589fb3b97221..4ff7c16e4595 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -100,7 +100,7 @@ icon_state = "chef" item_state = "chef" gas_transfer_coefficient = 0.90 - permeability_coefficient = 0.50 + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS allowed = list ( /obj/item/tool/kitchen/knife, diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 3b415cf0f9e8..3776958eb6e7 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -16,7 +16,7 @@ item_state = "fire_suit" w_class = SIZE_LARGE//bulky item gas_transfer_coefficient = 0.90 - permeability_coefficient = 0.50 + fire_intensity_resistance = BURN_LEVEL_TIER_1 flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS allowed = list( @@ -85,7 +85,7 @@ item_state = "bombsuit" w_class = SIZE_LARGE//bulky item gas_transfer_coefficient = 0.01 - permeability_coefficient = 0.01 + slowdown = 2 armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE @@ -150,7 +150,7 @@ item_state = "rad_suit" w_class = SIZE_LARGE//bulky item gas_transfer_coefficient = 0.90 - permeability_coefficient = 0.50 + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS|BODY_FLAG_HANDS|BODY_FLAG_FEET allowed = list( /obj/item/clothing/head/radiation, diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 4b1fd077415c..54839e562636 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -63,7 +63,7 @@ name = "botanist's jumpsuit" icon_state = "hydroponics" item_state = "g_suit" - permeability_coefficient = 0.50 + /obj/item/clothing/under/rank/internalaffairs desc = "The plain, professional attire of an Internal Affairs Agent. The collar is immaculately starched." diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 74507c2e5593..5d2be0cb82af 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -7,7 +7,7 @@ name = "research director's uniform" icon_state = "rdalt_s" worn_state = "rdalt_s" - permeability_coefficient = 0.50 + armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE @@ -22,7 +22,7 @@ desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer is a Research Director." name = "research director's jumpsuit" icon_state = "rdalt" - permeability_coefficient = 0.50 + armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE @@ -38,7 +38,7 @@ name = "scientist's jumpsuit" icon_state = "science" item_state = "w_suit" - permeability_coefficient = 0.50 + armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE @@ -53,7 +53,7 @@ name = "chemist's jumpsuit" icon_state = "chemistry" item_state = "w_suit" - permeability_coefficient = 0.50 + armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE @@ -71,7 +71,7 @@ name = "chief medical officer's jumpsuit" icon_state = "cmo" item_state = "w_suit" - permeability_coefficient = 0.50 + armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE @@ -86,7 +86,7 @@ name = "geneticist's jumpsuit" icon_state = "genetics" item_state = "w_suit" - permeability_coefficient = 0.50 + armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE @@ -101,7 +101,7 @@ name = "virologist's jumpsuit" icon_state = "virology" item_state = "w_suit" - permeability_coefficient = 0.50 + armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE @@ -116,7 +116,7 @@ desc = "It's a jumpsuit commonly worn by nursing staff in the medical department." name = "nurse's suit" icon_state = "nursesuit" - permeability_coefficient = 0.50 + armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE @@ -132,7 +132,7 @@ desc = "A dress commonly worn by the nursing staff in the medical department." name = "nurse's dress" icon_state = "nurse" - permeability_coefficient = 0.50 + armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE @@ -148,7 +148,7 @@ desc = "A white suit to be worn by orderly people who love orderly things." name = "orderly's uniform" icon_state = "orderly" - permeability_coefficient = 0.50 + armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE @@ -165,7 +165,7 @@ name = "medical doctor's uniform" icon_state = "medical" item_state = "w_suit" - permeability_coefficient = 0.50 + armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE armor_laser = CLOTHING_ARMOR_NONE diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 42c61404a31a..d5ab3e6abc79 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -53,7 +53,6 @@ item_state = "bl_suit" w_class = SIZE_LARGE//bulky item gas_transfer_coefficient = 0.01 - permeability_coefficient = 0.02 flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS //Needs gloves and shoes with cold protection to be fully protected. min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROT diff --git a/code/modules/clothing/under/under.dm b/code/modules/clothing/under/under.dm index a48967d88538..0049ccd26dec 100644 --- a/code/modules/clothing/under/under.dm +++ b/code/modules/clothing/under/under.dm @@ -4,7 +4,6 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS - permeability_coefficient = 0.90 flags_equip_slot = SLOT_ICLOTHING armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index 77efbb7ad4ef..2effb251eae5 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -9,7 +9,7 @@ ) siemens_coefficient = 0 - permeability_coefficient = 0.05 + flags_item = ITEM_PREDATOR flags_inventory = CANTSTRIP flags_cold_protection = BODY_FLAG_HANDS diff --git a/code/modules/cm_preds/yaut_items.dm b/code/modules/cm_preds/yaut_items.dm index 97b0f14f5b9b..2e36acc2257b 100644 --- a/code/modules/cm_preds/yaut_items.dm +++ b/code/modules/cm_preds/yaut_items.dm @@ -209,7 +209,7 @@ icon_state = "y-boots1_ebony" unacidable = TRUE - permeability_coefficient = 0.01 + flags_inventory = NOSLIPPING flags_armor_protection = BODY_FLAG_FEET|BODY_FLAG_LEGS flags_item = ITEM_PREDATOR diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index db82e44ea890..daf700f0dd28 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -215,14 +215,14 @@ /datum/equipment_preset/synth/survivor/scientist_synth name = "Survivor - Synthetic - Scientist Synth" equipment_to_spawn = list( - WEAR_HEAD = /obj/item/clothing/head/bio_hood, + WEAR_HEAD = /obj/item/clothing/head/bio_hood/synth, WEAR_FACE = /obj/item/clothing/mask/surgical, WEAR_EYES = /obj/item/clothing/glasses/hud/health, WEAR_BODY = /obj/item/clothing/under/rank/scientist, WEAR_BACK = /obj/item/storage/backpack/satchel/chem, WEAR_IN_BACK = /obj/item/reagent_container/glass/beaker/vial/random/good, WEAR_IN_BACK = /obj/item/paper/research_notes/good, - WEAR_JACKET = /obj/item/clothing/suit/bio_suit, + WEAR_JACKET = /obj/item/clothing/suit/storage/synthbio, WEAR_WAIST = /obj/item/storage/belt/medical/lifesaver/full, WEAR_HANDS = /obj/item/clothing/gloves/black, WEAR_R_HAND = /obj/item/device/motiondetector, diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 993042a14a2b..2b42b8afa0b9 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -156,30 +156,62 @@ . = ..() -/mob/living/carbon/attack_hand(mob/M as mob) - if(!istype(M, /mob/living/carbon)) return +/mob/living/carbon/attack_hand(mob/target_mob as mob) + if(!istype(target_mob, /mob/living/carbon)) return - if(M.mob_flags & SURGERY_MODE_ON && M.a_intent & (INTENT_HELP|INTENT_DISARM)) - var/datum/surgery/current_surgery = active_surgeries[M.zone_selected] + if(target_mob.mob_flags & SURGERY_MODE_ON && target_mob.a_intent & (INTENT_HELP|INTENT_DISARM)) + var/datum/surgery/current_surgery = active_surgeries[target_mob.zone_selected] if(current_surgery) - if(current_surgery.attempt_next_step(M, null)) + if(current_surgery.attempt_next_step(target_mob, null)) return TRUE else - var/obj/limb/affecting = get_limb(check_zone(M.zone_selected)) - if(affecting && initiate_surgery_moment(null, src, affecting, M)) + var/obj/limb/affecting = get_limb(check_zone(target_mob.zone_selected)) + if(affecting && initiate_surgery_moment(null, src, affecting, target_mob)) return TRUE - for(var/datum/disease/D in viruses) - if(D.spread_by_touch()) - M.contract_disease(D, 0, 1, CONTACT_HANDS) + if(can_pass_disease() && target_mob.can_pass_disease()) + for(var/datum/disease/virus in viruses) + if(virus.spread_by_touch()) + target_mob.contract_disease(virus, FALSE, TRUE, CONTACT_HANDS) - for(var/datum/disease/D in M.viruses) - if(D.spread_by_touch()) - contract_disease(D, 0, 1, CONTACT_HANDS) + for(var/datum/disease/virus in target_mob.viruses) + if(virus.spread_by_touch()) + contract_disease(virus, FALSE, TRUE, CONTACT_HANDS) - M.next_move += 7 //Adds some lag to the 'attack'. Adds up to 11 in combination with click_adjacent. + target_mob.next_move += 7 //Adds some lag to the 'attack'. Adds up to 11 in combination with click_adjacent. return +/// Whether or not a mob can pass diseases to another, or receive said diseases. +/mob/proc/can_pass_disease() + return TRUE + +/mob/living/carbon/human/can_pass_disease() + // Multiplier for checked pieces. + var/mult = 0 + // Total amount of bio protection + var/total_prot = 0 + // Super bio armor + var/bio_hardcore = 0 + + var/list/worn_clothes = list(head, wear_suit, hands, glasses, w_uniform, shoes, wear_mask) + + for(var/obj/item/clothing/worn_item in worn_clothes) + total_prot += worn_item.armor_bio + mult++ + if(worn_item.armor_bio == CLOTHING_ARMOR_HARDCORE) + bio_hardcore++ + + if(!mult) + return FALSE + + if(bio_hardcore >= 2) + return FALSE + + var/perc = (total_prot / mult) + if(!prob(perc)) + return TRUE + return FALSE + /mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, def_zone = null) if(status_flags & GODMODE) //godmode return FALSE diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 7faf2f85a7f7..6b3cc9cba578 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -93,24 +93,14 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) if(method == TOUCH && permeable && !istype(self.holder.my_atom, /obj/effect/particle_effect/smoke/chem)) // If the chemicals are in a smoke cloud, do not try to let the chemicals "penetrate" into the mob's system (balance station 13) -- Doohl var/chance = 1 - var/block = FALSE for(var/obj/item/clothing/clothing in M.get_equipped_items()) - if(clothing.permeability_coefficient < chance) - chance = clothing.permeability_coefficient - if(istype(clothing, /obj/item/clothing/suit/bio_suit)) - // bio suits are just about completely fool-proof - Doohl - // kind of a hacky way of making bio suits more resistant to chemicals but w/e - if(prob(75)) - block = TRUE + if(clothing.armor_bio > chance) + chance = clothing.armor_bio - if(istype(clothing, /obj/item/clothing/head/bio_hood)) - if(prob(75)) - block = TRUE + chance = (100 - chance) - chance *= 100 - - if(prob(chance) && !block) + if(prob(chance))//This will need testing, I'm not confident I did it correctly. if(M.reagents) M.reagents.add_reagent(self.id, self.volume * 0.5) diff --git a/icons/mob/humans/onmob/head_0.dmi b/icons/mob/humans/onmob/head_0.dmi index 862953a27be3..b09b0d0a382d 100644 Binary files a/icons/mob/humans/onmob/head_0.dmi and b/icons/mob/humans/onmob/head_0.dmi differ diff --git a/icons/mob/humans/onmob/suit_0.dmi b/icons/mob/humans/onmob/suit_0.dmi index db5514a0f3b8..41c886ef0485 100644 Binary files a/icons/mob/humans/onmob/suit_0.dmi and b/icons/mob/humans/onmob/suit_0.dmi differ diff --git a/icons/obj/items/clothing/hats.dmi b/icons/obj/items/clothing/hats.dmi index 45e09ebf7eaa..1a31a9990326 100644 Binary files a/icons/obj/items/clothing/hats.dmi and b/icons/obj/items/clothing/hats.dmi differ diff --git a/icons/obj/items/clothing/suits.dmi b/icons/obj/items/clothing/suits.dmi index cdb81b742d78..aec38eec8073 100644 Binary files a/icons/obj/items/clothing/suits.dmi and b/icons/obj/items/clothing/suits.dmi differ diff --git a/icons/obj/structures/closet.dmi b/icons/obj/structures/closet.dmi index 4377a48779cb..1d0c2138e0c1 100644 Binary files a/icons/obj/structures/closet.dmi and b/icons/obj/structures/closet.dmi differ diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index ec03a01d7633..b3bdae668e10 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -8325,7 +8325,7 @@ /turf/open/floor/white, /area/bigredv2/outside/virology) "aNa" = ( -/obj/structure/closet/l3closet/general, +/obj/structure/closet/l3closet, /turf/open/floor/white, /area/bigredv2/outside/virology) "aNb" = ( diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 59f0a59d6ca5..cba033af375d 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -22823,7 +22823,7 @@ /turf/open/floor/corsat/yellow, /area/corsat/omega/maint) "bLD" = ( -/obj/structure/closet/l3closet/janitor, +/obj/structure/closet/l3closet, /turf/open/floor/corsat/yellow/northeast, /area/corsat/omega/maint) "bLE" = ( @@ -25745,7 +25745,7 @@ /turf/open/floor/corsat, /area/corsat/inaccessible) "bYU" = ( -/obj/structure/closet/l3closet/general, +/obj/structure/closet/l3closet, /turf/open/floor/corsat/yellow, /area/corsat/omega/control) "bYW" = ( @@ -28704,7 +28704,7 @@ /turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "ePL" = ( -/obj/structure/closet/l3closet/general, +/obj/structure/closet/l3closet, /turf/open/floor/corsat/plate, /area/corsat/gamma/biodome/virology) "eQR" = ( @@ -41951,7 +41951,7 @@ /turf/open/floor/corsat/bluegrey/southeast, /area/corsat/gamma/hangar/flightcontrol) "sFD" = ( -/obj/structure/closet/l3closet/general, +/obj/structure/closet/l3closet, /obj/structure/machinery/light, /turf/open/floor/corsat/plate, /area/corsat/gamma/biodome/virology) diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 6878a0c1ed20..fb1e6aa1f555 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -10789,8 +10789,8 @@ "igQ" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/rank/janitor, -/obj/item/clothing/suit/bio_suit/janitor, -/obj/item/clothing/head/bio_hood/janitor, +/obj/item/clothing/suit/bio_suit, +/obj/item/clothing/head/bio_hood, /turf/open/floor/wood, /area/fiorina/station/civres_blue) "igV" = ( @@ -11859,7 +11859,7 @@ /turf/open/floor/prison/blue/southeast, /area/fiorina/station/civres_blue) "iXV" = ( -/obj/structure/closet/l3closet/general, +/obj/structure/closet/l3closet, /turf/open/floor/prison, /area/fiorina/tumor/aux_engi) "iYa" = ( @@ -24592,7 +24592,7 @@ /area/fiorina/tumor/civres) "sQr" = ( /obj/structure/janitorialcart, -/obj/item/clothing/head/bio_hood/janitor{ +/obj/item/clothing/head/bio_hood{ pixel_x = -4; pixel_y = 5 }, diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 1b74cfdcf760..4f0f889c4ec0 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -13329,11 +13329,11 @@ /turf/open/floor/almayer/plate, /area/almayer/shipboard/port_point_defense) "bVe" = ( -/obj/structure/closet/l3closet/general, /obj/structure/window/reinforced{ dir = 8; health = 80 }, +/obj/structure/closet/l3closet/scientist, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) "bVn" = ( @@ -36494,7 +36494,6 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) "lmw" = ( -/obj/structure/closet/l3closet/general, /obj/structure/machinery/light{ dir = 8 }, @@ -36502,6 +36501,7 @@ dir = 4; health = 80 }, +/obj/structure/closet/l3closet/scientist, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) "lmz" = ( @@ -42094,7 +42094,6 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_umbilical) "nDo" = ( -/obj/structure/closet/l3closet/general, /obj/structure/window/reinforced{ dir = 8; health = 80 @@ -42103,6 +42102,7 @@ dir = 4; health = 80 }, +/obj/structure/closet/l3closet/scientist, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) "nDy" = (