cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

spess (#29730)

Browse Source
This commit is contained in:
PopeDaveThe3th
2025-07-18 17:22:05 +00:00
committed by GitHub
parent 7813564e1b
commit c8ef8c8c90
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/helmet.dm
+16 -4
View File
@@ -352,13 +352,17 @@
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/head.dmi'
)
flags = BLOCKHAIR
flags = BLOCKHAIR | STOPSPRESSUREDMAGE
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
flash_protect = FLASH_PROTECTION_WELDER
armor = list(MELEE = 40, BULLET = 45, LASER = 45, ENERGY = 40, BOMB = 100, RAD = 25, FIRE = 200, ACID = 100)
armor = list(MELEE = 40, BULLET = 45, LASER = 45, ENERGY = 40, BOMB = 100, RAD = 25, FIRE = INFINITY, ACID = 100)
strip_delay = 130
/obj/item/clothing/head/helmet/federation/marine/export
@@ -378,6 +382,10 @@
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
see_in_dark = 0
lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
flash_protect = FLASH_PROTECTION_NONE
@@ -398,12 +406,16 @@
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/head.dmi'
)
flags = BLOCKHAIR
flags = BLOCKHAIR | STOPSPRESSUREDMAGE
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
see_in_dark = 8
vision_flags = SEE_MOBS
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
flash_protect = FLASH_PROTECTION_WELDER
armor = list(MELEE = 40, BULLET = 45, LASER = 45, ENERGY = 40, BOMB = 100, RAD = 25, FIRE = 200, ACID = 100)
armor = list(MELEE = 40, BULLET = 45, LASER = 45, ENERGY = 40, BOMB = 100, RAD = 25, FIRE = INFINITY, ACID = 100)
strip_delay = 130
code/modules/clothing/suits/armor_suits.dm
+4 -2
View File
@@ -766,16 +766,18 @@
)
icon_state = "fedarmor_marine"
item_state = "fedarmor_marine"
armor = list(MELEE = 40, BULLET = 45, LASER = 45, ENERGY = 40, BOMB = 100, RAD = 25, FIRE = 200, ACID = 100)
armor = list(MELEE = 40, BULLET = 45, LASER = 45, ENERGY = 40, BOMB = 100, RAD = 25, FIRE = INFINITY, ACID = 100)
w_class = WEIGHT_CLASS_BULKY
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/rcd, /obj/item/crowbar, \
/obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \
/obj/item/radio, /obj/item/analyzer, /obj/item/gun, /obj/item/melee/baton, /obj/item/reagent_containers/spray/pepper, \
/obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/restraints/handcuffs)
flags = THICKMATERIAL
flags = THICKMATERIAL | STOPSPRESSUREDMAGE
slowdown = 0
strip_delay = 12 SECONDS