diff --git a/code/modules/cargo/random_stock/t3_rare.dm b/code/modules/cargo/random_stock/t3_rare.dm index 26314b09847..5e2ac22a984 100644 --- a/code/modules/cargo/random_stock/t3_rare.dm +++ b/code/modules/cargo/random_stock/t3_rare.dm @@ -43,7 +43,6 @@ STOCK_ITEM_RARE(hardsuit, 0.75) /obj/item/weapon/rig/ert/engineer = 0.1, /obj/item/weapon/rig/ert/medical = 0.15, /obj/item/weapon/rig/ert/security = 0.075, - /obj/item/weapon/rig/ert/assetprotection = 0.05, /obj/item/weapon/rig/light = 0.5, /obj/item/weapon/rig/light/hacker = 0.8, /obj/item/weapon/rig/light/stealth = 0.5, diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 2fc8d19e797..916f144b453 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -23,6 +23,7 @@ siemens_coefficient = 0.2 permeability_coefficient = 0.1 unacidable = 1 + slowdown = 1 // All rigs by default should have slowdown. var/has_sealed_state = FALSE diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index 344ac3b85c0..a0ea8d0f1a3 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -7,7 +7,6 @@ icon_state = "security_rig" suit_type = "combat hardsuit" armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60) - slowdown = 1 offline_slowdown = 3 offline_vision_restriction = TINT_HEAVY @@ -34,7 +33,6 @@ icon_state = "military_rig" suit_type = "military hardsuit" armor = list(melee = 80, bullet = 75, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 30) - slowdown = 1 offline_slowdown = 3 offline_vision_restriction = TINT_HEAVY allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs) diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm index 4a140ab2c15..e57d7a24f2d 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm @@ -32,7 +32,6 @@ desc = "A suit worn by the engineering division of an Emergency Response Team. Has orange highlights. Armoured and space ready." suit_type = "ERT engineer" icon_state = "ert_engineer_rig" - armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100) emp_protection = 30 glove_type = /obj/item/clothing/gloves/rig/eva @@ -98,7 +97,8 @@ desc = "A heavy suit worn by the highest level of Asset Protection, don't mess with the person wearing this. Armoured and space ready." suit_type = "heavy asset protection" icon_state = "asset_protection_rig" - armor = list(melee = 60, bullet = 60, laser = 60,energy = 40, bomb = 50, bio = 100, rad = 100) + armor = list(melee = 80, bullet = 75, laser = 60, energy = 40, bomb = 80, bio = 100, rad =100) + slowdown = 0 siemens_coefficient = 0 emp_protection = 50 diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm index ae32f11db2b..9dbcbb93ec0 100644 --- a/code/modules/clothing/spacesuits/rig/suits/merc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm @@ -9,7 +9,6 @@ icon_state = "merc_rig" suit_type = "crimson hardsuit" armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60) - slowdown = 1 offline_slowdown = 3 offline_vision_restriction = TINT_HEAVY emp_protection = 30 diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index e20723ae4b6..855b9fcdf5a 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -164,7 +164,6 @@ desc = "An Anomalous Material Interaction hardsuit that protects against the strangest energies the universe can throw at it." icon_state = "science_rig" armor = list(melee = 45, bullet = 5, laser = 40, energy = 65, bomb = 60, bio = 100, rad = 100) - slowdown = 1 offline_vision_restriction = TINT_HEAVY emp_protection = 40 @@ -192,7 +191,6 @@ desc = "A durable suit designed for medical rescue in high risk areas." icon_state = "medical_rig" armor = list(melee = 30, bullet = 15, laser = 20, energy = 60, bomb = 30, bio = 100, rad = 100) - slowdown = 1 offline_vision_restriction = TINT_HEAVY helm_type = /obj/item/clothing/head/helmet/space/rig/medical @@ -220,7 +218,6 @@ desc = "A Security hardsuit designed for prolonged EVA in dangerous environments." icon_state = "hazard_rig" armor = list(melee = 60, bullet = 40, laser = 30, energy = 15, bomb = 60, bio = 100, rad = 30) - slowdown = 1 offline_slowdown = 3 offline_vision_restriction = TINT_HEAVY diff --git a/code/modules/clothing/spacesuits/rig/suits/terminator.dm b/code/modules/clothing/spacesuits/rig/suits/terminator.dm index bdff5d1a97d..f710e224ce0 100644 --- a/code/modules/clothing/spacesuits/rig/suits/terminator.dm +++ b/code/modules/clothing/spacesuits/rig/suits/terminator.dm @@ -4,7 +4,6 @@ icon_state = "terminator_rig" suit_type = "synthetic exoskeleton" armor = list(melee = 80, bullet = 75, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 30) - slowdown = 1 offline_slowdown = 3 offline_vision_restriction = TINT_HEAVY has_sealed_state = TRUE diff --git a/html/changelogs/Sindorman-rig.yml b/html/changelogs/Sindorman-rig.yml new file mode 100644 index 00000000000..2588346aa32 --- /dev/null +++ b/html/changelogs/Sindorman-rig.yml @@ -0,0 +1,43 @@ +################################ +# 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 +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: PoZe + +# 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: + - tweak: "Rigs by default now have slowdown. Only affects ERT rigs." + - balance: "ERT rigs now use default slowdown value, so they are slower for balance reasons." + - balance: "HAPT rig armor values were bumped to military rig, plus it has 35 extra energy armor. HAPT rig is removed from rare loot spawn chance."