diff --git a/_maps/map_files/tgstation.2.1.3.dmm b/_maps/map_files/tgstation.2.1.3.dmm index eb8960a02b6..8c1b69338f3 100644 --- a/_maps/map_files/tgstation.2.1.3.dmm +++ b/_maps/map_files/tgstation.2.1.3.dmm @@ -7306,7 +7306,7 @@ "cKz" = (/obj/structure/cable,/obj/structure/computerframe{anchored = 1},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) "cKA" = (/obj/structure/cable,/obj/structure/computerframe{anchored = 1},/obj/item/stack/cable_coil/cut,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) "cKB" = (/obj/structure/rack,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) -"cKC" = (/obj/structure/rack,/obj/item/clothing/suit/space/rig/medical,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/medical,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) +"cKC" = (/obj/structure/rack,/obj/item/clothing/suit/space/hardsuit/medical,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/hardsuit/medical,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) "cKD" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate/black/med,/obj/item/clothing/head/helmet/space/syndicate/black/med,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) "cKE" = (/obj/machinery/power/apc{cell_type = 5000; dir = 8; environ = 0; equipment = 0; lighting = 0; locked = 0; name = "Worn-out APC"; pixel_x = -24; pixel_y = 0},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) "cKF" = (/obj/machinery/light/small,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) diff --git a/code/datums/spell.dm b/code/datums/spell.dm index b3a01b8aaae..8a0e6658edb 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -82,13 +82,13 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin return 0 if(clothes_req) //clothes check - if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(H.wear_suit, /obj/item/clothing/suit/space/rig/wizard)) + if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/wizard)) H << "I don't feel strong enough without my robe." return 0 if(!istype(H.shoes, /obj/item/clothing/shoes/sandal)) H << "I don't feel strong enough without my sandals." return 0 - if(!istype(H.head, /obj/item/clothing/head/wizard) && !istype(H.head, /obj/item/clothing/head/helmet/space/rig/wizard)) + if(!istype(H.head, /obj/item/clothing/head/wizard) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/wizard)) H << "I don't feel strong enough without my hat." return 0 else diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index 0097faa46fc..64df74eb89a 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -105,8 +105,8 @@ if("staffdoor") new /obj/item/weapon/gun/magic/staff/door(get_turf(H)) if("armor") - new /obj/item/clothing/suit/space/rig/wizard(get_turf(H)) - new /obj/item/clothing/head/helmet/space/rig/wizard(get_turf(H)) + new /obj/item/clothing/suit/space/hardsuit/wizard(get_turf(H)) + new /obj/item/clothing/head/helmet/space/hardsuit/wizard(get_turf(H)) if("scrying") new /obj/item/weapon/scrying(get_turf(H)) if (!(XRAY in H.mutations)) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 03fbafa36b4..1c093893398 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -315,8 +315,8 @@ feedback_add_details("wizard_spell_learned","HS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells new /obj/item/clothing/shoes/sandal(get_turf(H)) //In case they've lost them. new /obj/item/clothing/gloves/purple(get_turf(H))//To complete the outfit - new /obj/item/clothing/suit/space/rig/wizard(get_turf(H)) - new /obj/item/clothing/head/helmet/space/rig/wizard(get_turf(H)) + new /obj/item/clothing/suit/space/hardsuit/wizard(get_turf(H)) + new /obj/item/clothing/head/helmet/space/hardsuit/wizard(get_turf(H)) temp = "You have purchased a suit of wizard armor." max_uses-- if("staffanimation") diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 45ca8eda6b7..bcf4182a6ea 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -39,40 +39,40 @@ /obj/machinery/suit_storage_unit/captain SUIT_TYPE = /obj/item/clothing/suit/space/captain - HELMET_TYPE = /obj/item/clothing/head/helmet/space/capspace + HELMET_TYPE = /obj/item/clothing/head/helmet/space/captain MASK_TYPE = /obj/item/clothing/mask/gas STORAGE_TYPE = /obj/item/weapon/tank/jetpack/oxygen /obj/machinery/suit_storage_unit/engine - SUIT_TYPE = /obj/item/clothing/suit/space/rig - HELMET_TYPE = /obj/item/clothing/head/helmet/space/rig + SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit + HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit MASK_TYPE = /obj/item/clothing/mask/breath /obj/machinery/suit_storage_unit/ce - SUIT_TYPE = /obj/item/clothing/suit/space/rig/elite - HELMET_TYPE = /obj/item/clothing/head/helmet/space/rig/elite + SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/elite + HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/elite MASK_TYPE = /obj/item/clothing/mask/breath STORAGE_TYPE= /obj/item/clothing/shoes/magboots/advance /obj/machinery/suit_storage_unit/security - SUIT_TYPE = /obj/item/clothing/suit/space/rig/security - HELMET_TYPE = /obj/item/clothing/head/helmet/space/rig/security + SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/security + HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/security MASK_TYPE = /obj/item/clothing/mask/gas/sechailer /obj/machinery/suit_storage_unit/atmos - SUIT_TYPE = /obj/item/clothing/suit/space/rig/atmos - HELMET_TYPE = /obj/item/clothing/head/helmet/space/rig/atmos + SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/atmos + HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/atmos MASK_TYPE = /obj/item/clothing/mask/gas STORAGE_TYPE = /obj/item/weapon/watertank/atmos /obj/machinery/suit_storage_unit/mining - SUIT_TYPE = /obj/item/clothing/suit/space/rig/mining - HELMET_TYPE = /obj/item/clothing/head/helmet/space/rig/mining + SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/mining + HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/mining MASK_TYPE = /obj/item/clothing/mask/breath /obj/machinery/suit_storage_unit/cmo - SUIT_TYPE = /obj/item/clothing/suit/space/rig/medical - HELMET_TYPE = /obj/item/clothing/head/helmet/space/rig/medical + SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/medical + HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/medical MASK_TYPE = /obj/item/clothing/mask/breath /obj/machinery/suit_storage_unit/New() diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 703767baebd..97539334704 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -69,8 +69,8 @@ new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/shoes/swat(src) new /obj/item/clothing/shoes/swat(src) - new /obj/item/clothing/suit/armor/swat(src) - new /obj/item/clothing/suit/armor/swat(src) + new /obj/item/clothing/suit/space/deathsquad(src) + new /obj/item/clothing/suit/space/deathsquad(src) new /obj/item/clothing/under/syndicate/tacticool(src) new /obj/item/clothing/under/syndicate/tacticool(src) diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index a100193d9a7..79e6edcfe80 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -15,8 +15,8 @@ new /obj/item/weapon/tank/jetpack/oxygen/harness(src) new /obj/item/clothing/mask/gas/syndicate(src) new /obj/item/clothing/under/syndicate(src) - new /obj/item/clothing/head/helmet/space/rig/syndi(src) - new /obj/item/clothing/suit/space/rig/syndi(src) + new /obj/item/clothing/head/helmet/space/hardsuit/syndi(src) + new /obj/item/clothing/suit/space/hardsuit/syndi(src) new /obj/item/weapon/storage/belt/military(src) new /obj/item/weapon/crowbar/red(src) new /obj/item/weapon/stock_parts/cell/high(src) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 832fe3a43f1..731d2b34fda 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -868,7 +868,7 @@ var/global/list/g_fancy_list_of_safe_types = null M.equip_to_slot_or_del(new /obj/item/clothing/under/color/green(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/swat(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/deathsquad(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad(M), slot_head) M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/swat(M), slot_wear_mask) @@ -963,7 +963,7 @@ var/global/list/g_fancy_list_of_safe_types = null M.equip_to_slot_or_del(R, slot_ears) M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate/combat(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/swat/officer(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/deathsquad/officer(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 4810f26c8e6..797f9880edb 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -141,12 +141,12 @@ /obj/effect/landmark/corpse/syndicatecommando name = "Syndicate Commando" corpseuniform = /obj/item/clothing/under/syndicate - corpsesuit = /obj/item/clothing/suit/space/rig/syndi + corpsesuit = /obj/item/clothing/suit/space/hardsuit/syndi corpseshoes = /obj/item/clothing/shoes/swat corpsegloves = /obj/item/clothing/gloves/combat corpseradio = /obj/item/device/radio/headset corpsemask = /obj/item/clothing/mask/gas/syndicate - corpsehelmet = /obj/item/clothing/head/helmet/space/rig/syndi + corpsehelmet = /obj/item/clothing/head/helmet/space/hardsuit/syndi corpseback = /obj/item/weapon/tank/jetpack/oxygen corpsepocket1 = /obj/item/weapon/tank/emergency_oxygen corpseid = 1 @@ -196,9 +196,9 @@ corpseidaccess = "Station Engineer" /obj/effect/landmark/corpse/engineer/rig - corpsesuit = /obj/item/clothing/suit/space/rig + corpsesuit = /obj/item/clothing/suit/space/hardsuit corpsemask = /obj/item/clothing/mask/breath - corpsehelmet = /obj/item/clothing/head/helmet/space/rig + corpsehelmet = /obj/item/clothing/head/helmet/space/hardsuit /obj/effect/landmark/corpse/clown name = "Clown" @@ -234,9 +234,9 @@ corpseidaccess = "Shaft Miner" /obj/effect/landmark/corpse/miner/rig - corpsesuit = /obj/item/clothing/suit/space/rig/mining + corpsesuit = /obj/item/clothing/suit/space/hardsuit/mining corpsemask = /obj/item/clothing/mask/breath - corpsehelmet = /obj/item/clothing/head/helmet/space/rig/mining + corpsehelmet = /obj/item/clothing/head/helmet/space/hardsuit/mining /////////////////Officers////////////////////// diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/hardsuit.dm similarity index 66% rename from code/modules/clothing/spacesuits/rig.dm rename to code/modules/clothing/spacesuits/hardsuit.dm index 33703267467..c8b468424b5 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -1,185 +1,185 @@ -//Regular rig suits -/obj/item/clothing/head/helmet/space/rig - name = "engineering hardsuit helmet" - desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding." - icon_state = "rig0-engineering" - item_state = "eng_helm" - armor = list(melee = 10, bullet = 5, laser = 10,energy = 5, bomb = 10, bio = 100, rad = 75) - allowed = list(/obj/item/device/flashlight) - var/brightness_on = 4 //luminosity when on - var/on = 0 - item_color = "engineering" //Determines used sprites: rig[on]-[color] and rig[on]-[color]2 (lying down sprite) - action_button_name = "Toggle Helmet Light" - - attack_self(mob/user) - if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities. - return - on = !on - icon_state = "rig[on]-[item_color]" -// item_state = "rig[on]-[item_color]" - user.update_inv_head() //so our mob-overlays update - - if(on) user.AddLuminosity(brightness_on) - else user.AddLuminosity(-brightness_on) - - pickup(mob/user) - if(on) - user.AddLuminosity(brightness_on) -// user.UpdateLuminosity() - SetLuminosity(0) - - dropped(mob/user) - if(on) - user.AddLuminosity(-brightness_on) -// user.UpdateLuminosity() - SetLuminosity(brightness_on) - -/obj/item/clothing/suit/space/rig - name = "engineering hardsuit" - desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding." - icon_state = "rig-engineering" - item_state = "eng_hardsuit" - slowdown = 2 - armor = list(melee = 10, bullet = 5, laser = 10,energy = 5, bomb = 10, bio = 100, rad = 75) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/t_scanner, /obj/item/weapon/rcd) - -//Atmospherics -/obj/item/clothing/head/helmet/space/rig/atmos - name = "atmospherics hardsuit helmet" - desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has thermal shielding." - icon_state = "rig0-atmospherics" - item_state = "atmo_helm" - item_color = "atmospherics" - armor = list(melee = 10, bullet = 5, laser = 10,energy = 5, bomb = 10, bio = 100, rad = 0) - heat_protection = HEAD //Uncomment to enable firesuit protection - max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT - -/obj/item/clothing/suit/space/rig/atmos - name = "atmospherics hardsuit" - desc = "A special suit that protects against hazardous, low pressure environments. Has thermal shielding." - icon_state = "rig-atmospherics" - item_state = "atmo_hardsuit" - armor = list(melee = 10, bullet = 5, laser = 10,energy = 5, bomb = 10, bio = 100, rad = 0) - heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection - max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT - -//Chief Engineer's rig -/obj/item/clothing/head/helmet/space/rig/elite - name = "advanced hardsuit helmet" - desc = "An advanced helmet designed for work in a hazardous, low pressure environment. Shines with a high polish." - icon_state = "rig0-white" - item_state = "ce_helm" - item_color = "white" - armor = list(melee = 40, bullet = 5, laser = 10,energy = 5, bomb = 50, bio = 100, rad = 90) - heat_protection = HEAD //Uncomment to enable firesuit protection - max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT - -/obj/item/clothing/suit/space/rig/elite - icon_state = "rig-white" - name = "advanced hardsuit" - desc = "An advanced suit that protects against hazardous, low pressure environments. Shines with a high polish." - item_state = "ce_hardsuit" - armor = list(melee = 40, bullet = 5, laser = 10,energy = 5, bomb = 50, bio = 100, rad = 90) - heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection - max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT - - -//Mining rig -/obj/item/clothing/head/helmet/space/rig/mining - name = "mining hardsuit helmet" - desc = "A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating." - icon_state = "rig0-mining" - item_state = "mining_helm" - item_color = "mining" - armor = list(melee = 40, bullet = 5, laser = 10,energy = 5, bomb = 50, bio = 100, rad = 50) - -/obj/item/clothing/suit/space/rig/mining - icon_state = "rig-mining" - name = "mining hardsuit" - desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating." - item_state = "mining_hardsuit" - armor = list(melee = 40, bullet = 5, laser = 10,energy = 5, bomb = 50, bio = 100, rad = 50) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/pickaxe) - - - -//Syndicate rig -/obj/item/clothing/head/helmet/space/rig/syndi - name = "blood-red hardsuit helmet" - desc = "An advanced helmet designed for work in special operations. Property of Gorlex Marauders." - icon_state = "rig0-syndi" - item_state = "syndie_helm" - item_color = "syndi" - armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 50) - -/obj/item/clothing/suit/space/rig/syndi - icon_state = "rig-syndi" - name = "blood-red hardsuit" - desc = "An advanced suit that protects against injuries during special operations. Property of Gorlex Marauders." - item_state = "syndie_hardsuit" - slowdown = 1 - w_class = 3 - armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50) - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) - -//Wizard Rig -/obj/item/clothing/head/helmet/space/rig/wizard - name = "gem-encrusted hardsuit helmet" - desc = "A bizarre gem-encrusted helmet that radiates magical energies." - icon_state = "rig0-wiz" - item_state = "wiz_helm" - item_color = "wiz" - unacidable = 1 //No longer shall our kind be foiled by lone chemists with spray bottles! - armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 50) - heat_protection = HEAD //Uncomment to enable firesuit protection - max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT - -/obj/item/clothing/suit/space/rig/wizard - icon_state = "rig-wiz" - name = "gem-encrusted hardsuit" - desc = "A bizarre gem-encrusted suit that radiates magical energies." - item_state = "wiz_hardsuit" - slowdown = 1 - w_class = 3 - unacidable = 1 - armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 50) - allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen) - heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection - max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT - - -//Medical Rig -/obj/item/clothing/head/helmet/space/rig/medical - name = "medical hardsuit helmet" - desc = "A special helmet designed for work in a hazardous, low pressure environment. Built with lightweight materials for extra comfort." - icon_state = "rig0-medical" - item_state = "medical_helm" - item_color = "medical" - armor = list(melee = 10, bullet = 5, laser = 10,energy = 5, bomb = 10, bio = 100, rad = 50) - -/obj/item/clothing/suit/space/rig/medical - icon_state = "rig-medical" - name = "medical hardsuit" - desc = "A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement." - item_state = "medical_hardsuit" - slowdown = 1 - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical) - armor = list(melee = 10, bullet = 5, laser = 10,energy = 5, bomb = 10, bio = 100, rad = 50) - - //Security -/obj/item/clothing/head/helmet/space/rig/security - name = "security hardsuit helmet" - desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." - icon_state = "rig0-sec" - item_state = "sec_helm" - item_color = "sec" - armor = list(melee = 30, bullet = 15, laser = 30,energy = 10, bomb = 10, bio = 100, rad = 50) - -/obj/item/clothing/suit/space/rig/security - icon_state = "rig-sec" - name = "security hardsuit" - desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor." - item_state = "sec_hardsuit" - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank, /obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) - armor = list(melee = 30, bullet = 15, laser = 30,energy = 10, bomb = 10, bio = 100, rad = 50) \ No newline at end of file +//Regular hardsuits +/obj/item/clothing/head/helmet/space/hardsuit + name = "engineering hardsuit helmet" + desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding." + icon_state = "hardsuit0-engineering" + item_state = "eng_helm" + armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75) + allowed = list(/obj/item/device/flashlight) + var/brightness_on = 4 //luminosity when on + var/on = 0 + item_color = "engineering" //Determines used sprites: hardsuit[on]-[color] and hardsuit[on]-[color]2 (lying down sprite) + action_button_name = "Toggle Helmet Light" + + attack_self(mob/user) + if(!isturf(user.loc)) + user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities. + return + on = !on + icon_state = "hardsuit[on]-[item_color]" +// item_state = "hardsuit[on]-[item_color]" + user.update_inv_head() //so our mob-overlays update + + if(on) user.AddLuminosity(brightness_on) + else user.AddLuminosity(-brightness_on) + + pickup(mob/user) + if(on) + user.AddLuminosity(brightness_on) +// user.UpdateLuminosity() + SetLuminosity(0) + + dropped(mob/user) + if(on) + user.AddLuminosity(-brightness_on) +// user.UpdateLuminosity() + SetLuminosity(brightness_on) + +/obj/item/clothing/suit/space/hardsuit + name = "engineering hardsuit" + desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding." + icon_state = "hardsuit-engineering" + item_state = "eng_hardsuit" + slowdown = 2 + armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/t_scanner, /obj/item/weapon/rcd) + +//Atmospherics +/obj/item/clothing/head/helmet/space/hardsuit/atmos + name = "atmospherics hardsuit helmet" + desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has thermal shielding." + icon_state = "hardsuit0-atmospherics" + item_state = "atmo_helm" + item_color = "atmospherics" + armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 0) + heat_protection = HEAD //Uncomment to enable firesuit protection + max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT + +/obj/item/clothing/suit/space/hardsuit/atmos + name = "atmospherics hardsuit" + desc = "A special suit that protects against hazardous, low pressure environments. Has thermal shielding." + icon_state = "hardsuit-atmospherics" + item_state = "atmo_hardsuit" + armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 0) + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection + max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT + +//Chief Engineer's hardsuit +/obj/item/clothing/head/helmet/space/hardsuit/elite + name = "advanced hardsuit helmet" + desc = "An advanced helmet designed for work in a hazardous, low pressure environment. Shines with a high polish." + icon_state = "hardsuit0-white" + item_state = "ce_helm" + item_color = "white" + armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 90) + heat_protection = HEAD //Uncomment to enable firesuit protection + max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT + +/obj/item/clothing/suit/space/hardsuit/elite + icon_state = "hardsuit-white" + name = "advanced hardsuit" + desc = "An advanced suit that protects against hazardous, low pressure environments. Shines with a high polish." + item_state = "ce_hardsuit" + armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 90) + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection + max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT + + +//Mining hardsuit +/obj/item/clothing/head/helmet/space/hardsuit/mining + name = "mining hardsuit helmet" + desc = "A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating." + icon_state = "hardsuit0-mining" + item_state = "mining_helm" + item_color = "mining" + armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50) + +/obj/item/clothing/suit/space/hardsuit/mining + icon_state = "hardsuit-mining" + name = "mining hardsuit" + desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating." + item_state = "mining_hardsuit" + armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/pickaxe) + + + +//Syndicate hardsuit +/obj/item/clothing/head/helmet/space/hardsuit/syndi + name = "blood-red hardsuit helmet" + desc = "An advanced helmet designed for work in special operations. Property of Gorlex Marauders." + icon_state = "hardsuit0-syndi" + item_state = "syndie_helm" + item_color = "syndi" + armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50) + +/obj/item/clothing/suit/space/hardsuit/syndi + icon_state = "hardsuit-syndi" + name = "blood-red hardsuit" + desc = "An advanced suit that protects against injuries during special operations. Property of Gorlex Marauders." + item_state = "syndie_hardsuit" + slowdown = 1 + w_class = 3 + armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + +//Wizard hardsuit +/obj/item/clothing/head/helmet/space/hardsuit/wizard + name = "gem-encrusted hardsuit helmet" + desc = "A bizarre gem-encrusted helmet that radiates magical energies." + icon_state = "hardsuit0-wiz" + item_state = "wiz_helm" + item_color = "wiz" + unacidable = 1 //No longer shall our kind be foiled by lone chemists with spray bottles! + armor = list(melee = 40, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 100, rad = 50) + heat_protection = HEAD //Uncomment to enable firesuit protection + max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT + +/obj/item/clothing/suit/space/hardsuit/wizard + icon_state = "hardsuit-wiz" + name = "gem-encrusted hardsuit" + desc = "A bizarre gem-encrusted suit that radiates magical energies." + item_state = "wiz_hardsuit" + slowdown = 1 + w_class = 3 + unacidable = 1 + armor = list(melee = 40, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 100, rad = 50) + allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen) + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection + max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT + + + //Medical hardsuit +/obj/item/clothing/head/helmet/space/hardsuit/medical + name = "medical hardsuit helmet" + desc = "A special helmet designed for work in a hazardous, low pressure environment. Built with lightweight materials for extra comfort." + icon_state = "hardsuit0-medical" + item_state = "medical_helm" + item_color = "medical" + armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50) + +/obj/item/clothing/suit/space/hardsuit/medical + icon_state = "hardsuit-medical" + name = "medical hardsuit" + desc = "A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement." + item_state = "medical_hardsuit" + slowdown = 1 + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical) + armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50) + + //Security hardsuit +/obj/item/clothing/head/helmet/space/hardsuit/security + name = "security hardsuit helmet" + desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." + icon_state = "hardsuit0-sec" + item_state = "sec_helm" + item_color = "sec" + armor = list(melee = 30, bullet = 15, laser = 30,energy = 10, bomb = 10, bio = 100, rad = 50) + +/obj/item/clothing/suit/space/hardsuit/security + icon_state = "hardsuit-sec" + name = "security hardsuit" + desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor." + item_state = "sec_hardsuit" + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank, /obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) + armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 50) diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 949743e2ea8..5c38d9a037e 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -1,16 +1,15 @@ -//Captain's Spacesuit -/obj/item/clothing/head/helmet/space/capspace + //Captain's space suit, not hardsuits because no flashlight! + /obj/item/clothing/head/helmet/space/captain name = "captain's space helmet" 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." + desc = "A special helmet designed for only the most fashionable of military figureheads." flags_inv = HIDEFACE permeability_coefficient = 0.01 - armor = list(melee = 65, bullet = 50, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 50) + armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50) -//Captain's space suit This is not the proper path but I don't currently know enough about how this all works to mess with it. /obj/item/clothing/suit/space/captain - name = "captain's armor" + name = "captain's space suit" desc = "A bulky, heavy-duty piece of exclusive Nanotrasen armor. YOU are in charge!" icon_state = "caparmor" item_state = "capspacesuit" @@ -20,24 +19,41 @@ armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50) -//Deathsquad suit + //Death squad armoed space suits, not hardsuits! /obj/item/clothing/head/helmet/space/deathsquad name = "deathsquad helmet" desc = "That's not red paint. That's real blood." icon_state = "deathsquad" item_state = "deathsquad" - armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30) + armor = list(melee = 65, bullet = 55, laser = 35, energy = 20, bomb = 30, bio = 30, rad = 30) + +/obj/item/clothing/suit/space/deathsquad + name = "deathsquad suit" + desc = "A heavily armored, advanced space suit that protects against most forms of damage." + icon_state = "deathsquad" + item_state = "swat_suit" + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 0, rad = 0) + slowdown = 1 /obj/item/clothing/head/helmet/space/deathsquad/beret name = "officer's beret" - desc = "An armored beret commonly used by special operations officers. Uses forcefield technology to protect the head from space." + desc = "An armored beret commonly used by special operations officers. Uses advanced force field technology to protect the head from space." icon_state = "beret_badge" - armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30) - flags = STOPSPRESSUREDMAGE flags_inv = 0 +/obj/item/clothing/suit/space/deathsquad/officer + name = "officer's jacket" + desc = "An armored, space-proof jacket used in special operations." + icon_state = "detective" + item_state = "det_suit" + blood_overlay_type = "coat" + slowdown = 0 + flags_inv = 0 + w_class = 3 -//NASA Voidsuit + + //NASA Voidsuit /obj/item/clothing/head/helmet/space/nasavoid name = "NASA Void Helmet" desc = "An old, NASA Centcom branch designed, dark red space suit helmet." @@ -53,7 +69,7 @@ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/multitool) -//Space santa outfit suit + //Space santa outfit suit /obj/item/clothing/head/helmet/space/santahat name = "Santa's hat" desc = "Ho ho ho. Merrry X-mas!" @@ -70,7 +86,7 @@ allowed = list(/obj/item) //for stuffing exta special presents -//Space pirate outfit + //Space pirate outfit /obj/item/clothing/head/helmet/space/pirate name = "pirate hat" desc = "Yarr." diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index c37212b46d1..062b25f7362 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -80,32 +80,6 @@ if (prob(hit_reflect_chance)) return 1 -/obj/item/clothing/suit/armor/swat - name = "swat suit" - desc = "A heavily armored suit that protects against moderate damage. Used in special operations." - icon_state = "deathsquad" - item_state = "swat_suit" - gas_transfer_coefficient = 0.01 - permeability_coefficient = 0.01 - flags = THICKMATERIAL - body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) - slowdown = 1 - armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 0, rad = 0) - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS - min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT - heat_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS - max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT - -/obj/item/clothing/suit/armor/swat/officer - name = "officer jacket" - desc = "An armored jacket used in special operations." - icon_state = "detective" - item_state = "det_suit" - blood_overlay_type = "coat" - flags_inv = 0 - /obj/item/clothing/suit/armor/vest/det_suit name = "armor" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d3996e7ca41..d927ce725de 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -585,7 +585,7 @@ threatcount += 2 //Check for dresscode violations - if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/rig/wizard)) + if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/wizard)) threatcount += 2 //Check for nonhuman scum @@ -600,4 +600,4 @@ if(istype(idcard, /obj/item/weapon/card/id/syndicate)) threatcount -= 2 - return threatcount + return threatcount diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index f3ea15d4843..eb4e94be870 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -103,12 +103,12 @@ /obj/effect/landmark/mobcorpse/syndicatecommando name = "Syndicate Commando" corpseuniform = /obj/item/clothing/under/syndicate - corpsesuit = /obj/item/clothing/suit/space/rig/syndi + corpsesuit = /obj/item/clothing/suit/space/hardsuit/syndi corpseshoes = /obj/item/clothing/shoes/swat corpsegloves = /obj/item/clothing/gloves/combat corpseradio = /obj/item/device/radio/headset corpsemask = /obj/item/clothing/mask/gas/syndicate - corpsehelmet = /obj/item/clothing/head/helmet/space/rig/syndi + corpsehelmet = /obj/item/clothing/head/helmet/space/hardsuit/syndi corpseback = /obj/item/weapon/tank/jetpack/oxygen corpsepocket1 = /obj/item/weapon/tank/emergency_oxygen corpseid = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 499083ac14d..d8f592d145e 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -421,7 +421,7 @@ /obj/item/asteroid/goliath_hide/afterattack(atom/target, mob/user, proximity_flag) if(proximity_flag) - if(istype(target, /obj/item/clothing/suit/space/rig/mining) || istype(target, /obj/item/clothing/head/helmet/space/rig/mining)) + if(istype(target, /obj/item/clothing/suit/space/hardsuit/mining) || istype(target, /obj/item/clothing/head/helmet/space/hardsuit/mining)) var/obj/item/clothing/C = target var/current_armor = C.armor if(current_armor.["melee"] < 80) diff --git a/tgstation.dme b/tgstation.dme index 7529297d96e..465e078040a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -786,7 +786,7 @@ #include "code\modules\clothing\shoes\miscellaneous.dm" #include "code\modules\clothing\spacesuits\miscellaneous.dm" #include "code\modules\clothing\spacesuits\ninja.dm" -#include "code\modules\clothing\spacesuits\rig.dm" +#include "code\modules\clothing\spacesuits\hardsuit.dm" #include "code\modules\clothing\spacesuits\syndi.dm" #include "code\modules\clothing\suits\armor.dm" #include "code\modules\clothing\suits\bio.dm"