cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 15:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Leather jackets can now be unbuttoned (#5911)

Browse Source 
As well as their corporate version.
This commit is contained in:
VTCobaltblood
2019-01-22 23:40:31 +03:00
committed by Erki
parent 9fd00a5551
commit ec6760ce5f
8 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystems/traumas.dm
View File

@@ -84,7 +84,7 @@ var/datum/controller/subsystem/traumas/SStraumas
/obj/item/robot_parts, /obj/item/organ/cell, /obj/item/organ/data, /obj/item/toy/figure/borg)),
"nanotrasen" = typecacheof(list(/obj/item/toy/nanotrasenballoon, /obj/item/weapon/soap/nanotrasen, /obj/structure/sign/flag/nanotrasen,
/obj/item/clothing/suit/storage/leather_jacket/nanotrasen, /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen, /obj/item/weapon/storage/toolbox/lunchbox/nt,
/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen, /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen, /obj/item/weapon/storage/toolbox/lunchbox/nt,
/obj/structure/banner, /obj/structure/bed/chair/office/bridge, /obj/item/clothing/head/collectable/captain,
/obj/item/clothing/head/helmet/space/void/captain, /obj/item/clothing/suit/space/void/captain, /obj/item/clothing/suit/storage/hooded/wintercoat/captain,
/obj/item/clothing/under/captainformal, /obj/item/clothing/under/rank/captain, /obj/item/toy/figure/captain, /obj/item/weapon/card/id/captains_spare,

2
code/game/antagonist/outsider/raider.dm
View File

@@ -58,7 +58,7 @@ var/datum/antagonist/raider/raiders
/obj/item/clothing/suit/pirate,
/obj/item/clothing/suit/hgpirate,
/obj/item/clothing/suit/storage/toggle/bomber,
/obj/item/clothing/suit/storage/leather_jacket,
/obj/item/clothing/suit/storage/toggle/leather_jacket,
/obj/item/clothing/suit/storage/toggle/brown_jacket,
/obj/item/clothing/suit/storage/toggle/hoodie,
/obj/item/clothing/suit/storage/toggle/hoodie/black,

2
code/game/objects/random/random.dm
View File

@@ -737,7 +737,7 @@
/obj/item/clothing/shoes/clown_shoes = 0.1,
/obj/item/clothing/shoes/winter = 0.3,
/obj/item/clothing/suit/storage/hazardvest = 1,
/obj/item/clothing/suit/storage/leather_jacket/nanotrasen = 0.7,
/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 0.7,
/obj/item/clothing/suit/ianshirt = 0.5,
/obj/item/clothing/suit/syndicatefake = 0.6,
/obj/item/clothing/suit/imperium_monk = 0.4,

6
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -8,15 +8,15 @@
/datum/gear/suit/leather
display_name = "jacket selection"
path = /obj/item/clothing/suit/storage/leather_jacket
path = /obj/item/clothing/suit/storage/toggle/leather_jacket
/datum/gear/suit/leather/New()
..()
var/jackets = list()
jackets["bomber jacket"] = /obj/item/clothing/suit/storage/toggle/bomber
jackets["corporate black jacket"] = /obj/item/clothing/suit/storage/leather_jacket/nanotrasen
jackets["corporate black jacket"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen
jackets["corporate brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
jackets["black jacket"] = /obj/item/clothing/suit/storage/leather_jacket
jackets["black jacket"] = /obj/item/clothing/suit/storage/toggle/leather_jacket
jackets["brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket
jackets["flannel jacket, green"] = /obj/item/clothing/suit/storage/toggle/flannel
jackets["flannel jacket, red"] = /obj/item/clothing/suit/storage/toggle/flannel/red

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

@@ -234,16 +234,18 @@
min_cold_protection_temperature = T0C - 20
siemens_coefficient = 0.7
/obj/item/clothing/suit/storage/leather_jacket
/obj/item/clothing/suit/storage/toggle/leather_jacket
name = "leather jacket"
desc = "A black leather coat."
icon_state = "leather_jacket"
item_state = "leather_jacket"
icon_open = "leather_jacket_open"
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/leather_jacket/nanotrasen
/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen
desc = "A black leather coat. A corporate logo is proudly displayed on the back."
icon_state = "leather_jacket_nt"
icon_open = "leather_jacket_nt_open"
/obj/item/clothing/suit/storage/toggle/leather_vest
name = "leather vest"

2
code/modules/clothing/suits/storage.dm
View File

@@ -33,7 +33,7 @@
pockets.hear_talk(M, msg, verb, speaking)
..()
//Jackets with buttons, used for labcoats, IA jackets, First Responder jackets, and brown jackets.
//Jackets with buttons
/obj/item/clothing/suit/storage/toggle
var/icon_open
var/icon_closed