From 0627476aa6760ce0da01e4d5da40a491fa92a877 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 2 Sep 2020 02:58:27 +0200 Subject: [PATCH] [MIRROR] Gulag teleporters now give prison jumpskirt according to player preferences. (#596) * Gulag teleporters now give prison jumpskirt according to player preferences. (#53171) * It now gives jumpskirts when it should. * Code improvement (tm) * Comment. * Gulag teleporters now give prison jumpskirt according to player preferences. Co-authored-by: uomo <51800976+uomo91@users.noreply.github.com> --- code/game/machinery/gulag_teleporter.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index e69deb67508..1f6ce4d6ef5 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -21,6 +21,7 @@ The console is located at computer/gulag_teleporter.dm var/message_cooldown var/breakout_time = 600 var/jumpsuit_type = /obj/item/clothing/under/rank/prisoner + var/jumpskirt_type = /obj/item/clothing/under/rank/prisoner/skirt var/shoes_type = /obj/item/clothing/shoes/sneakers/orange var/obj/machinery/gulag_item_reclaimer/linked_reclaimer var/static/list/telegulag_required_items = typecacheof(list( @@ -151,7 +152,8 @@ The console is located at computer/gulag_teleporter.dm strip_occupant() var/mob/living/carbon/human/prisoner = occupant if(!isplasmaman(prisoner) && jumpsuit_type) - prisoner.equip_to_appropriate_slot(new jumpsuit_type) + var/suit_or_skirt = prisoner.jumpsuit_style == PREF_SKIRT ? jumpskirt_type : jumpsuit_type //Check player prefs for jumpsuit or jumpskirt toggle, then give appropriate prison outfit. + prisoner.equip_to_appropriate_slot(new suit_or_skirt) if(shoes_type) prisoner.equip_to_appropriate_slot(new shoes_type) if(id)