cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #476 from PolarisSS13/Sin2_fixes_12-7-15

Browse Source 
Jacket and Helmet Fix
This commit is contained in:
SinTwo
2015-12-07 23:07:50 -05:00
parent 74d5e804d7 897e6c8382
commit 149fe99fcb
5 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/client/preferences_gear.dm
View File

@@ -1015,7 +1015,7 @@ var/global/list/gear_datums = list()
/datum/gear/leather_coat
display_name = "leather coat"
path = /obj/item/clothing/suit/leathercoat/alt
path = /obj/item/clothing/suit/leathercoat
cost = 2
slot = slot_wear_suit

3
code/modules/clothing/spacesuits/spacesuits.dm
View File

@@ -7,14 +7,13 @@
icon_state = "space"
desc = "A special helmet designed for work in a hazardous, low-pressure environment."
item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL | AIRTIGHT
flags_inv = BLOCKHAIR
item_state_slots = list(
slot_l_hand_str = "s_helmet",
slot_r_hand_str = "s_helmet",
)
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE

2
code/modules/clothing/spacesuits/syndi.dm
View File

@@ -122,7 +122,7 @@
name = "black medical space helmet"
desc = "A black helmet sporting a medical cross and durable plating. Hopefully the wearer abides by space geneva."
icon_state = "syndicate-helm-black-med"
item_state_slots = list(slot_head_str = "syndicate-black-med")
item_state_slots = list(slot_head_str = "syndicate-helm-black-med")
/obj/item/clothing/suit/space/syndicate/black/med
name = "black medical space suit"

2
code/modules/clothing/spacesuits/void/void.dm
View File

@@ -8,7 +8,7 @@
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
flags_inv = HIDEEARS | BLOCKHAIR
// flags_inv = HIDEEARS|BLOCKHAIR
//Species-specific stuff.
species_restricted = list("Human")

17
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -212,18 +212,12 @@
//coats
/obj/item/clothing/suit/leathercoat
name = "leather coat"
desc = "A long, thick black leather coat."
icon_state = "leathercoat"
item_state = "leathercoat"
/obj/item/clothing/suit/leathercoat/alt
name = "leather coat"
desc = "A long, thick black leather coat."
icon_state = "leathercoat_alt"
item_state = "leathercoat_alt"
/obj/item/clothing/suit/leathercoat/alt/sec
/obj/item/clothing/suit/leathercoat/sec
name = "leather coat"
desc = "A long, thick black leather coat."
icon_state = "leathercoat_sec"
@@ -397,11 +391,8 @@
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/leather_jacket/alt
name = "leather jacket"
desc = "A black leather coat."
icon_state = "leather_jacket_alt"
item_state = "leather_jacket_alt"
body_parts_covered = UPPER_TORSO|ARMS
icon_state = "leatherjacket_alt"
item_state = "leatherjacket_alt"
/obj/item/clothing/suit/storage/leather_jacket/nanotrasen
desc = "A black leather coat. A corporate logo is proudly displayed on the back."
@@ -409,7 +400,7 @@
//This one has buttons for some reason
/obj/item/clothing/suit/storage/toggle/brown_jacket
name = "leather jacket"
name = "brown jacket"
desc = "A brown leather coat."
icon_state = "brown_jacket"
item_state = "brown_jacket"