cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 11:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #805 from TheFurryFeline/TFF-Orange_Is_The_New_Orange

Browse Source 
Orange Is the New Orange!
This commit is contained in:
Razgriz
2019-09-24 00:25:42 -07:00
committed by GitHub
parent 7552dd8fcc a0ba399e16
commit d3355ac7c0
12 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/secrets/admin_secrets/prison_warp.dm
+2 -1
View File
@@ -30,7 +30,8 @@
H.drop_from_inventory(W)
//teleport person to cell
H.loc = pick(prisonwarp)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), slot_w_uniform)
//CHOMPStation edit TFF 22/9/19 - refactor of prison jumpsuit
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/prison(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), slot_shoes)
else
//teleport security person
code/modules/admin/topic.dm
+2 -1
View File
@@ -1011,7 +1011,8 @@
M.loc = prison_cell
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/prisoner = M
prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), slot_w_uniform)
//CHOMPStation edit TFF 22/9/19 - refactor of prison jumpsuit
prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/prison(prisoner), slot_w_uniform)
prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes)
M << "<font color='red'>You have been sent to the prison station!</font>"
code/modules/admin/verbs/randomverbs.dm
+2 -1
View File
@@ -35,7 +35,8 @@
M.loc = pick(prisonwarp)
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/prisoner = M
prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), slot_w_uniform)
//CHOMPStation edit TFF 22/9/19 - refactor of prison jumpsuit
prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/prison(prisoner), slot_w_uniform)
prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes)
spawn(50)
M << "<font color='red'>You have been sent to the prison station!</font>"
code/modules/clothing/under/color.dm
+7 -2
View File
@@ -30,13 +30,18 @@
icon_state = "grey"
rolled_sleeves = 0
//TFF 21/9/19 - add a different icon_state to both jumpsuits, orange and prison. Refactors orange and prison jumpsuit slightly.
/obj/item/clothing/under/color/orange
name = "orange jumpsuit"
desc = "It's standardized prisoner-wear. Its suit sensors are permanently set to the \"Tracking\" position."
icon_state = "orange"
rolled_sleeves = 0
/obj/item/clothing/under/color/prison
name = "prison jumpsuit"
desc = "It's standardized prisoner-wear. Its suit sensors are permanently set to the \"Tracking\" position."
icon_state = "prison"
has_sensor = 2
sensor_mode = 3
rolled_sleeves = 0
/obj/item/clothing/under/color/pink
name = "pink jumpsuit"