cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Biosuit Code Cleanup and Tweaks (#15233)

Browse Source
This commit is contained in:
SleepyGemmy
2022-12-08 21:33:05 +01:00
committed by GitHub
parent c6b2930176
commit df52af42ca
49 changed files with 236 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/exports/gear.dm
+2 -2
View File
@@ -65,12 +65,12 @@
/datum/export/gear/biohood
cost = 50
unit_name = "biosuit hood"
export_types = list(/obj/item/clothing/head/bio_hood)
export_types = list(/obj/item/clothing/head/hazmat)
/datum/export/gear/biosuit
cost = 100
unit_name = "biosuit"
export_types = list(/obj/item/clothing/suit/bio_suit)
export_types = list(/obj/item/clothing/suit/hazmat)
/datum/export/gear/bombhelmet
cost = 50
code/modules/cargo/random_stock/large.dm
+1 -1
View File
@@ -20,7 +20,7 @@ STOCK_ITEM_LARGE(EOD, 1.5)
new /obj/structure/closet/bombcloset(L)
STOCK_ITEM_LARGE(biosuit, 3)
var/list/allsuits = typesof(/obj/structure/closet/l3closet)
var/list/allsuits = typesof(/obj/structure/closet/hazmat)
var/type = pick(allsuits)
new type(L)
code/modules/cargo/random_stock/t1_common.dm
-1
View File
@@ -490,7 +490,6 @@ STOCK_ITEM_COMMON(warning, 2.2)
STOCK_ITEM_COMMON(gasmask, 2)
var/list/masks = list(
/obj/item/clothing/mask/gas = 10,
/obj/item/clothing/mask/gas/plaguedoctor = 1,
/obj/item/clothing/mask/gas/swat = 5,
/obj/item/clothing/mask/gas/mime = 0.5,
/obj/item/clothing/mask/gas/monkeymask = 0.5,
code/modules/clothing/head/hazmat.dm
+41
View File
@@ -0,0 +1,41 @@
//
// Hazmat Hoods
//
// Hazmat Hood
/obj/item/clothing/head/hazmat
name = "hazmat hood"
desc = "A hood that protects against biological hazards."
icon = 'icons/contained_items/clothing/headwear/hazmat.dmi'
icon_state = "hazmat"
item_state = "hazmat"
contained_sprite = TRUE
permeability_coefficient = 0
gas_transfer_coefficient = 0
siemens_coefficient = 0.75
armor = list(
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SMALL
)
body_parts_covered = HEAD | FACE | EYES
flags_inv = HIDEMASK | HIDEEARS | HIDEEYES | BLOCKHAIR
// General
/obj/item/clothing/head/hazmat/general
icon_state = "hazmat_general"
item_state = "hazmat_general"
// Research
/obj/item/clothing/head/hazmat/research
icon_state = "hazmat_research"
item_state = "hazmat_research"
// Security
/obj/item/clothing/head/hazmat/security
icon_state = "hazmat_security"
item_state = "hazmat_security"
// Custodial
/obj/item/clothing/head/hazmat/custodial
icon_state = "hazmat_custodial"
item_state = "hazmat_custodial"
code/modules/clothing/head/misc.dm
-7
View File
@@ -115,13 +115,6 @@
icon_state = "mailman"
desc = "<i>Choo-choo</i>!"
/obj/item/clothing/head/plaguedoctorhat
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
/obj/item/clothing/head/nursehat
name = "nurse's hat"
desc = "It allows quick identification of trained medical personnel."
code/modules/clothing/masks/gasmask.dm
-11
View File
@@ -52,17 +52,6 @@
item_state = "gas_mask"
icon_state = "gas_mask"
//Plague Dr suit can be found in clothing/suits/bio.dm
/obj/item/clothing/mask/gas/plaguedoctor
name = "plague doctor mask"
desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply."
icon_state = "plaguedoctor"
item_state = "plaguedoctor"
armor = list(
bio = ARMOR_BIO_SHIELDED
)
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/gas/swat
name = "\improper SWAT mask"
desc = "A close-fitting tactical mask that can be connected to an air supply."
code/modules/clothing/suits/bio.dm
-105
View File
@@ -1,105 +0,0 @@
//Biosuit complete with shoes (in the item sprite)
/obj/item/clothing/head/bio_hood
name = "bio hood"
icon_state = "bio"
item_state_slots = list(
slot_l_hand_str = "bio_hood",
slot_r_hand_str = "bio_hood"
)
desc = "A hood that protects the head and face from biological comtaminants."
permeability_coefficient = 0.01
armor = list(
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SMALL
)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
siemens_coefficient = 0.75
/obj/item/clothing/suit/bio_suit
name = "bio suit"
desc = "A suit that protects against biological contamination."
icon_state = "bio"
item_state = "bio_suit"
randpixel = 0
center_of_mass = null
w_class = ITEMSIZE_LARGE//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
slowdown = 1.0
allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/pen,/obj/item/device/flashlight/pen)
armor = list(
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SMALL
)
flags_inv = HIDEWRISTS|HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
siemens_coefficient = 0.75
//Standard biosuit, orange stripe
/obj/item/clothing/head/bio_hood/general
icon_state = "bio_general"
body_parts_covered = HEAD|FACE|EYES
desc = "A hood that protects the head and face from biological comtaminants. And bees."
/obj/item/clothing/suit/bio_suit/general
icon_state = "bio_general"
desc = "A suit that protects against biological contamination and beestings."
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEWRISTS|HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
//Virology biosuit, green stripe
/obj/item/clothing/head/bio_hood/virology
icon_state = "bio_virology"
/obj/item/clothing/suit/bio_suit/virology
icon_state = "bio_virology"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEWRISTS|HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
//Security biosuit, grey with red stripe across the chest
/obj/item/clothing/head/bio_hood/security
icon_state = "bio_security"
/obj/item/clothing/suit/bio_suit/security
icon_state = "bio_security"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEWRISTS|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"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEWRISTS|HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
//Scientist's biosuit, white with a pink-ish hue
/obj/item/clothing/head/bio_hood/scientist
icon_state = "bio_scientist"
/obj/item/clothing/suit/bio_suit/scientist
icon_state = "bio_scientist"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEWRISTS|HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
//CMO's biosuit, blue stripe
/obj/item/clothing/suit/bio_suit/cmo
icon_state = "bio_cmo"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEWRISTS|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
name = "plague doctor suit"
desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses."
icon_state = "plaguedoctor"
item_state = "bio_suit"
flags_inv = HIDEWRISTS|HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
code/modules/clothing/suits/hazmat.dm
+42
View File
@@ -0,0 +1,42 @@
//
// Hazmat Suits
//
// Hazmat Suit
/obj/item/clothing/suit/hazmat
name = "hazmat suit"
desc = "A suit that protects against biological hazards."
icon = 'icons/contained_items/clothing/bottomwear/hazmat.dmi'
icon_state = "hazmat"
item_state = "hazmat"
contained_sprite = TRUE
permeability_coefficient = 0
gas_transfer_coefficient = 0
siemens_coefficient = 0.75
armor = list(
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SMALL
)
body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
flags_inv = HIDEWRISTS | HIDEGLOVES | HIDESHOES | HIDEJUMPSUIT | HIDETAIL
allowed = list(/obj/item/tank/emergency_oxygen)
// General
/obj/item/clothing/suit/hazmat/general
icon_state = "hazmat_general"
item_state = "hazmat_general"
// Research
/obj/item/clothing/suit/hazmat/research
icon_state = "hazmat_research"
item_state = "hazmat_research"
// Security
/obj/item/clothing/suit/hazmat/security
icon_state = "hazmat_security"
item_state = "hazmat_security"
// Custodial
/obj/item/clothing/suit/hazmat/custodial
icon_state = "hazmat_custodial"
item_state = "hazmat_custodial"
code/modules/item_worth/worths_list.dm
+2 -3
View File
@@ -447,7 +447,6 @@ var/list/worths = list(
/obj/item/clothing/mask/luchador = 60,
/obj/item/clothing/mask/breath/medical = 180,
/obj/item/clothing/mask/breath = 80,
/obj/item/clothing/mask/gas/plaguedoctor = 100,
/obj/item/clothing/mask/gas/swat = 200,
/obj/item/clothing/mask/gas/voice = 600,
/obj/item/clothing/mask/gas/tactical = 500,
@@ -490,7 +489,7 @@ var/list/worths = list(
/obj/item/clothing/suit/armor/heavy = 1000,
/obj/item/clothing/suit/armor/tactical = 1500,
/obj/item/clothing/suit/armor = 500,
/obj/item/clothing/suit/bio_suit = 150,
/obj/item/clothing/suit/hazmat = 150,
/obj/item/clothing/suit/captunic/capjacket = 100,
/obj/item/clothing/suit/storage/hazardvest = 60,
/obj/item/clothing/suit/storage/toggle/labcoat = 55,
@@ -526,7 +525,7 @@ var/list/worths = list(
/obj/item/clothing/head/welding = 150,
/obj/item/clothing/head/bomb_hood = 200,
/obj/item/clothing/head/radiation = 250,
/obj/item/clothing/head/bio_hood = 100,
/obj/item/clothing/head/hazmat = 100,
/obj/item/clothing/head/sol = 250,
/obj/item/clothing/head/sol/dress/admiral = 1000,
/obj/item/clothing/head/sol/dress = 350,
code/modules/research/xenoarchaeology/artifact/effect.dm
+2 -2
View File
@@ -95,12 +95,12 @@ proc/GetAnomalySusceptibility(var/mob/living/carbon/human/H)
var/protected = 0
if(istype(H.wear_suit,/obj/item/clothing/suit/bio_suit/anomaly))
if(istype(H.wear_suit,/obj/item/clothing/suit/hazmat/anomaly))
protected += 0.6
else if(istype(H.wear_suit,/obj/item/clothing/suit/space/anomaly))
protected += 0.5
if(istype(H.head,/obj/item/clothing/head/bio_hood/anomaly))
if(istype(H.head,/obj/item/clothing/head/hazmat/anomaly))
protected += 0.3
else if(istype(H.head,/obj/item/clothing/head/helmet/space/anomaly))
protected += 0.2
code/modules/research/xenoarchaeology/tools/anomaly_suit.dm
+2 -2
View File
@@ -1,13 +1,13 @@
//changes: rad protection up to 100 from 20/50 respectively
/obj/item/clothing/suit/bio_suit/anomaly
/obj/item/clothing/suit/hazmat/anomaly
name = "anomaly suit"
desc = "A sealed bio suit capable of insulating against exotic alien energies."
icon_state = "engspace_suit"
item_state = "engspace_suit"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
/obj/item/clothing/head/bio_hood/anomaly
/obj/item/clothing/head/hazmat/anomaly
name = "anomaly hood"
desc = "A sealed bio hood capable of insulating against exotic alien energies."
icon_state = "engspace_helmet"