cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 12:08:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] SWAT suit no longer has space-proofing, less slowdown and retains temp resist, cargo cost lowered to 1400 [MDB IGNORE] (#11045)

Browse Source 
* SWAT suit no longer has space-proofing, less slowdown and retains temp resist, cargo cost lowered to 1400 (#64343)

The SWAT suit ordered from cargo is no longer space-proof, but it's slowdown is cut back. It retains it's temperature proofing. It's crate cost from cargo has been reduced to 1400 from 2400.

* SWAT suit no longer has space-proofing, less slowdown and retains temp resist, cargo cost lowered to 1400

* Update zombieprison.dmm

Co-authored-by: castawaynont <76170211+castawaynont@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-01-27 02:28:27 +00:00
committed by GitHub
co-authored by castawaynont Gandalf
parent e5410dc775
commit 0eb602f6f9
6 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomZLevels/zombieprison.dmm
+1 -1
View File
@@ -1737,7 +1737,7 @@
/area/awaymission/prison/cella)
"ir" = (
/obj/item/clothing/shoes/combat/swat,
/obj/item/clothing/suit/space/swat,
/obj/item/clothing/suit/armor/swat,
/obj/item/clothing/mask/gas/sechailer/swat,
/obj/item/clothing/head/helmet/swat/nanotrasen,
/obj/item/clothing/gloves/combat,
code/modules/cargo/packs.dm
+4 -4
View File
@@ -637,12 +637,12 @@
/datum/supply_pack/security/armory/swat
name = "SWAT Crate"
desc = "Contains two fullbody sets of tough, fireproof, pressurized suits designed in a joint effort by IS-ERI and Nanotrasen. Each set contains a suit, helmet, mask, combat belt, and combat gloves. Requires Armory access to open."
cost = CARGO_CRATE_VALUE * 12
desc = "Contains two fullbody sets of tough, fireproof suits designed in a joint effort by IS-ERI and Nanotrasen. Each set contains a suit, helmet, mask, combat belt, and combat gloves. Requires Armory access to open."
cost = CARGO_CRATE_VALUE * 7
contains = list(/obj/item/clothing/head/helmet/swat/nanotrasen,
/obj/item/clothing/head/helmet/swat/nanotrasen,
/obj/item/clothing/suit/space/swat,
/obj/item/clothing/suit/space/swat,
/obj/item/clothing/suit/armor/swat,
/obj/item/clothing/suit/armor/swat,
/obj/item/clothing/mask/gas/sechailer/swat,
/obj/item/clothing/mask/gas/sechailer/swat,
/obj/item/storage/belt/military/assault,
code/modules/clothing/head/helmet.dm
+8 -1
View File
@@ -239,9 +239,16 @@
/obj/item/clothing/head/helmet/swat/nanotrasen
name = "\improper SWAT helmet"
desc = "An extremely robust, space-worthy helmet with the Nanotrasen logo emblazoned on the top."
desc = "An extremely robust helmet with the Nanotrasen logo emblazoned on the top."
icon_state = "swat"
inhand_icon_state = "swat"
clothing_flags = PLASMAMAN_HELMET_EXEMPT
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
/obj/item/clothing/head/helmet/thunderdome
name = "\improper Thunderdome helmet"
code/modules/clothing/spacesuits/swat.dm
-9
View File
@@ -1,9 +0,0 @@
/obj/item/clothing/suit/space/swat
name = "MK.I SWAT Suit"
desc = "A tactical space suit first developed in a joint effort by the defunct IS-ERI and Nanotrasen in 20XX for military space operations. A tried and true workhorse, it is very difficult to move in but offers robust protection against all threats!"
icon_state = "heavy"
inhand_icon_state = "swat_suit"
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/knife/combat)
armor = list(MELEE = 40, BULLET = 30, LASER = 30,ENERGY = 40, BOMB = 50, BIO = 90, FIRE = 100, ACID = 100, WOUND = 15)
strip_delay = 120
resistance_flags = FIRE_PROOF | ACID_PROOF
code/modules/clothing/suits/armor.dm
+16
View File
@@ -295,6 +295,22 @@
resistance_flags = FIRE_PROOF | ACID_PROOF
strip_delay = 80
/obj/item/clothing/suit/armor/swat
name = "MK.I SWAT Suit"
desc = "A tactical suit first developed in a joint effort by the defunct IS-ERI and Nanotrasen in 2321 for military operations. It has a minor slowdown, but offers decent protection."
icon_state = "heavy"
inhand_icon_state = "swat_suit"
armor = list(MELEE = 40, BULLET = 30, LASER = 30,ENERGY = 40, BOMB = 50, BIO = 90, FIRE = 100, ACID = 100, WOUND = 15)
strip_delay = 120
resistance_flags = FIRE_PROOF | ACID_PROOF
clothing_flags = THICKMATERIAL
cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT_OFF
heat_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
slowdown = 0.7
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
//All of the armor below is mostly unused
/obj/item/clothing/suit/armor/heavy
tgstation.dme
-1
View File
@@ -2483,7 +2483,6 @@
#include "code\modules\clothing\spacesuits\santa.dm"
#include "code\modules\clothing\spacesuits\softsuit.dm"
#include "code\modules\clothing\spacesuits\specialops.dm"
#include "code\modules\clothing\spacesuits\swat.dm"
#include "code\modules\clothing\spacesuits\syndi.dm"
#include "code\modules\clothing\suits\_suits.dm"
#include "code\modules\clothing\suits\ablativecoat.dm"