cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

SWAT suit tweak (#21049)

Browse Source 
* removed SWAT suit spaceproof, removed SWAT suit slowdown, added BLOCKHAIR to SWAT helmet

* Update code/modules/clothing/suits/armor.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/clothing/suits/armor.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
HMBGERDO
2023-05-22 22:06:13 +02:00
committed by GitHub
co-authored by Henri215 Farie82
parent 1aa914ac02
commit 3931617e67
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/helmet.dm
+1 -1
View File
@@ -122,7 +122,7 @@
icon_state = "swat"
item_state = "swat"
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 50, BIO = 450, RAD = 10, FIRE = 50, ACID = 50)
flags = null
flags = BLOCKHAIR
flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
code/modules/clothing/spacesuits/misc_spacesuits.dm
-15
View File
@@ -63,21 +63,6 @@
strip_delay = 130
dog_fashion = /datum/dog_fashion/back/deathsquad
//NEW SWAT suit
/obj/item/clothing/suit/space/swat
name = "SWAT armor"
desc = "Space-proof tactical SWAT armor."
icon_state = "heavy"
item_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/kitchen/knife/combat)
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 50, BIO = 450, RAD = 10, FIRE = INFINITY, ACID = INFINITY)
strip_delay = 120
resistance_flags = FIRE_PROOF | ACID_PROOF
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/head/helmet/space/deathsquad/beret
name = "officer beret"
desc = "An armored beret commonly used by special operations officers."
code/modules/clothing/suits/armor.dm
+15
View File
@@ -313,6 +313,21 @@
item_state = "armor"
blood_overlay_type = "armor"
/obj/item/clothing/suit/armor/swat
name = "SWAT armor"
desc = "Tactical SWAT armor."
icon_state = "heavy"
item_state = "swat_suit"
body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
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/kitchen/knife/combat)
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 50, BIO = 450, RAD = 10, FIRE = INFINITY, ACID = INFINITY)
strip_delay = 12 SECONDS
resistance_flags = FIRE_PROOF | ACID_PROOF
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/armor/laserproof
name = "ablative armor vest"
desc = "A vest that excels in protecting the wearer against energy projectiles. Projects an energy field around the user, allowing a chance of energy projectile deflection no matter where on the user it would hit."
code/modules/supply/supply_packs/pack_security.dm
+2 -2
View File
@@ -165,8 +165,8 @@
name = "SWAT Gear Crate"
contains = list(/obj/item/clothing/head/helmet/swat,
/obj/item/clothing/head/helmet/swat,
/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/kitchen/knife/combat,
/obj/item/kitchen/knife/combat,
/obj/item/clothing/mask/gas/sechailer/swat,