From c5c329af4fc0f7ef953d26bbe3733ebb92e85ad3 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sun, 26 May 2019 23:15:29 -0700 Subject: [PATCH 1/4] Suit Cycler now applies suit stats Suit Cycler now applies the proper armor, descriptions, and temperature protection stats to all of the engineering and medical suits. --- code/game/machinery/suit_storage_unit.dm | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 7d8afeffa6..930a94a066 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -979,12 +979,19 @@ helmet.name = "engineering voidsuit helmet" helmet.icon_state = "rig0-engineering" helmet.item_state = "rig0-engineering" + helmet.max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + helmet.armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80) + helmet.desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding." if(suit) suit.name = "engineering voidsuit" suit.icon_state = "rig-engineering" suit.item_state = "rig-engineering" suit.item_state_slots[slot_r_hand_str] = "eng_voidsuit" suit.item_state_slots[slot_l_hand_str] = "eng_voidsuit" + suit.max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE + suit.armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80) + suit.desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding." + if("Mining") if(helmet) helmet.name = "mining voidsuit helmet" @@ -1001,12 +1008,16 @@ helmet.name = "medical voidsuit helmet" helmet.icon_state = "rig0-medical" helmet.item_state = "rig0-medical" + helmet.armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50) + helmet.desc = "A special helmet that protects against hazardous, low pressure environments. Has minor radiation shielding." if(suit) suit.name = "medical voidsuit" suit.icon_state = "rig-medical" suit.item_state = "rig-medical" suit.item_state_slots[slot_r_hand_str] = "medical_voidsuit" suit.item_state_slots[slot_l_hand_str] = "medical_voidsuit" + suit.armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50) + suit.desc = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding." if("Security") if(helmet) helmet.name = "security voidsuit helmet" @@ -1034,56 +1045,89 @@ helmet.name = "atmospherics voidsuit helmet" helmet.icon_state = "rig0-atmos" helmet.item_state = "rig0-atmos" + helmet.max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + helmet.armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 50) + helmet.desc = "A special helmet designed for work in a hazardous, low pressure environments. Has improved thermal protection and minor radiation shielding." + if(suit) suit.name = "atmospherics voidsuit" suit.icon_state = "rig-atmos" suit.item_state = "rig-atmos" suit.item_state_slots[slot_r_hand_str] = "atmos_voidsuit" suit.item_state_slots[slot_l_hand_str] = "atmos_voidsuit" + suit.max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + suit.armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 50) + suit.desc = "A special suit that protects against hazardous, low pressure environments. Has improved thermal protection and minor radiation shielding." + if("HAZMAT") if(helmet) helmet.name = "HAZMAT voidsuit helmet" helmet.icon_state = "rig0-engineering_rad" helmet.item_state = "rig0-engineering_rad" + helmet.max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + helmet.armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 50, bio = 100, rad = 100) + helmet.desc = "A engineering helmet designed for work in a low-pressure environment. Extra radiation shielding appears to have been installed at the price of comfort." + if(suit) suit.name = "HAZMAT voidsuit" suit.icon_state = "rig-engineering_rad" suit.item_state = "rig-engineering_rad" suit.item_state_slots[slot_r_hand_str] = "eng_voidsuit_rad" suit.item_state_slots[slot_l_hand_str] = "eng_voidsuit_rad" + suit.max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE + suit.armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 50, bio = 100, rad = 100) + suit.desc = "A engineering voidsuit that protects against hazardous, low pressure environments. Has enhanced radiation shielding compared to regular engineering voidsuits." if("Construction") if(helmet) helmet.name = "Construction voidsuit helmet" helmet.icon_state = "rig0-engineering_con" helmet.item_state = "rig0-engineering_con" + helmet.max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + helmet.armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80) + helmet.desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding." if(suit) suit.name = "Construction voidsuit" suit.icon_state = "rig-engineering_con" suit.item_state = "rig-engineering_con" suit.item_state_slots[slot_r_hand_str] = "eng_voidsuit_con" suit.item_state_slots[slot_l_hand_str] = "eng_voidsuit_con" + suit.max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE + suit.armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80) + suit.desc = "A special suit designed for work in a hazardous, low-pressure environment. Has radiation shielding." + if("Biohazard") if(helmet) helmet.name = "Biohazard voidsuit helmet" helmet.icon_state = "rig0-medical_bio" helmet.item_state = "rig0-medical_bio" + helmet.armor = list(melee = 45, bullet = 5, laser = 20, energy = 5, bomb = 15, bio = 100, rad = 75) + helmet.desc = "A special helmet that protects against hazardous environments. Has minor radiation shielding." + if(suit) suit.name = "Biohazard voidsuit" suit.icon_state = "rig-medical_bio" suit.item_state = "rig-medical_bio" suit.item_state_slots[slot_r_hand_str] = "medical_voidsuit_bio" suit.item_state_slots[slot_l_hand_str] = "medical_voidsuit_bio" + suit.armor = list(melee = 45, bullet = 5, laser = 20, energy = 5, bomb = 15, bio = 100, rad = 75) + suit.desc = "A special suit that protects against hazardous, environments. It feels heavier than the standard suit with extra protection around the joints." + if("Emergency Medical Response") if(helmet) helmet.name = "emergency medical response voidsuit helmet" helmet.icon_state = "rig0-medical_emt" helmet.item_state = "rig0-medical_emt" + helmetarmor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50) + helmet.desc = "A special helmet that protects against hazardous, low pressure environments. Has minor radiation shielding." + if(suit) suit.name = "emergency medical response voidsuit" suit.icon_state = "rig-medical_emt" suit.item_state = "rig-medical_emt" suit.item_state_slots[slot_r_hand_str] = "medical_voidsuit_emt" suit.item_state_slots[slot_l_hand_str] = "medical_voidsuit_emt" + suit.armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50) + suit.desc = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding." if("^%###^%$" || "Mercenary") if(helmet) helmet.name = "blood-red voidsuit helmet" From d5741fb1ae788e80ea8d3412c02ac198caa01caf Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sun, 26 May 2019 23:24:56 -0700 Subject: [PATCH 2/4] Add files via upload --- .../Razgriz1032 - Suit Cycler Stats.yml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/Razgriz1032 - Suit Cycler Stats.yml diff --git a/html/changelogs/Razgriz1032 - Suit Cycler Stats.yml b/html/changelogs/Razgriz1032 - Suit Cycler Stats.yml new file mode 100644 index 0000000000..7ad8ca8fbb --- /dev/null +++ b/html/changelogs/Razgriz1032 - Suit Cycler Stats.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Razgriz1032 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a changelog editing system that should cause fewer conflicts and more accurate timestamps." \ No newline at end of file From 4bcd56ec077504fb1c35c1fbd66c46dd26644c44 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sun, 26 May 2019 23:26:34 -0700 Subject: [PATCH 3/4] fix --- code/game/machinery/suit_storage_unit.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 930a94a066..3838c995d4 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -1117,7 +1117,7 @@ helmet.name = "emergency medical response voidsuit helmet" helmet.icon_state = "rig0-medical_emt" helmet.item_state = "rig0-medical_emt" - helmetarmor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50) + helmet.armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50) helmet.desc = "A special helmet that protects against hazardous, low pressure environments. Has minor radiation shielding." if(suit) From f4af2f959b3502c790aeaf110ef38c3bd509486d Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sun, 26 May 2019 23:29:10 -0700 Subject: [PATCH 4/4] correct file --- .../Razgriz1032 - Suit Cycler Stats.yml | 33 ++----------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/html/changelogs/Razgriz1032 - Suit Cycler Stats.yml b/html/changelogs/Razgriz1032 - Suit Cycler Stats.yml index 7ad8ca8fbb..ca1b328ec0 100644 --- a/html/changelogs/Razgriz1032 - Suit Cycler Stats.yml +++ b/html/changelogs/Razgriz1032 - Suit Cycler Stats.yml @@ -1,36 +1,7 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. author: Razgriz1032 -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. + delete-after: True -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - - rscadd: "Added a changelog editing system that should cause fewer conflicts and more accurate timestamps." \ No newline at end of file + - rscadd: "Suit Cycler now applies the proper armor, descriptions, and temperature protection stats to all of the engineering and medical suits." \ No newline at end of file