cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 03:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes pizzaguy and talon uniforms not rolling down

Browse Source
This commit is contained in:
Heroman
2021-11-20 19:26:02 +10:00
parent 7acd0f5bf4
commit 096e76320e
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+4 -2
View File
@@ -818,7 +818,9 @@
*/
var/displays_id = 1
var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
var/rolled_down_icon_override = TRUE
var/rolled_sleeves = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
var/rolled_sleeves_icon_override = TRUE
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/uniform/mob_teshari.dmi',
SPECIES_VOX = 'icons/inventory/uniform/mob_vox.dmi'
@@ -880,7 +882,7 @@
H = src.loc
var/icon/under_icon
if(icon_override)
if(icon_override && rolled_down_icon_override)
under_icon = icon_override
else if(H && LAZYACCESS(sprite_sheets, H.species.get_bodytype(H)))
under_icon = sprite_sheets[H.species.get_bodytype(H)]
@@ -903,7 +905,7 @@
H = src.loc
var/icon/under_icon
if(icon_override)
if(icon_override && rolled_sleeves_icon_override)
under_icon = icon_override
else if(H && LAZYACCESS(sprite_sheets, H.species.get_bodytype(H)))
under_icon = sprite_sheets[H.species.get_bodytype(H)]
code/modules/clothing/under/miscellaneous_vr.dm
+12
View File
@@ -142,7 +142,9 @@
name = "pizza delivery uniform"
desc = "A dedicated outfit for pizza delivery people, one of most dangerous occupations around these parts. Can be rolled up for extra show of skin."
icon = 'icons/inventory/uniform/item_vr.dmi'
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
rolled_down_icon_override = FALSE
icon_state = "pizzadelivery"
item_state = "pizzadelivery"
rolled_down = 0
@@ -158,6 +160,8 @@
icon_state = "talon_basic"
item_state = "talon_basic"
rolled_sleeves = 0
rolled_down_icon_override = FALSE
rolled_sleeves_icon_override = FALSE
/obj/item/clothing/under/rank/talon/proper
name = "Talon proper jumpsuit"
@@ -168,6 +172,8 @@
icon_state = "talon_jumpsuit"
item_state = "talon_jumpsuit"
rolled_sleeves = 0
rolled_down_icon_override = FALSE
rolled_sleeves_icon_override = FALSE
/obj/item/clothing/under/rank/talon/security
name = "Talon security jumpsuit"
@@ -178,6 +184,8 @@
icon_state = "talon_security"
item_state = "talon_security"
rolled_sleeves = 0
rolled_down_icon_override = FALSE
rolled_sleeves_icon_override = FALSE
/obj/item/clothing/under/rank/talon/pilot
name = "Talon pilot jumpsuit"
@@ -188,6 +196,8 @@
icon_state = "talon_pilot"
item_state = "talon_pilot"
rolled_sleeves = 0
rolled_down_icon_override = FALSE
rolled_sleeves_icon_override = FALSE
/obj/item/clothing/under/rank/talon/command
name = "Talon command jumpsuit"
@@ -198,6 +208,8 @@
icon_state = "talon_captain"
item_state = "talon_captain"
rolled_sleeves = 0
rolled_down_icon_override = FALSE
rolled_sleeves_icon_override = FALSE
// Excelsior uniforms
/obj/item/clothing/under/excelsior