cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-27 06:36:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linked uniforms

Browse Source 
Initial addition of the labelled prisoner jumpsuits and cell control
functionality for the introduction of the communal brig. One note to
review (namely, if id = null for cell spawning, that may cause a runtime
error).
This commit is contained in:
skull132
2015-06-10 02:08:42 +03:00
parent 9d1d24b4c8
commit f7bd2b41e1
4 changed files with 93 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/color.dm
+17
View File
@@ -42,6 +42,23 @@
has_sensor = 2
sensor_mode = 3
flags = FPRINT | TABLEPASS
var/id
/obj/item/clothing/under/color/orange/cell1
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position.\nThis one has \"Cell 1\" marked on it."
id = "Cell 1"
/obj/item/clothing/under/color/orange/cell2
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position.\nThis one has \"Cell 2\" marked on it."
id = "Cell 2"
/obj/item/clothing/under/color/orange/cell3
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position.\nThis one has \"Cell 3\" marked on it."
id = "Cell 3"
/obj/item/clothing/under/color/orange/cell4
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position.\nThis one has \"Cell 4\" marked on it."
id = "Cell 4"
/obj/item/clothing/under/color/pink
name = "pink jumpsuit"
code/modules/mob/living/carbon/human/examine.dm
+9 -3
View File
@@ -66,6 +66,7 @@
//Ties
var/tie_msg
var/aband_msg
var/cell_msg
if(istype(w_uniform,/obj/item/clothing/under))
var/obj/item/clothing/under/U = w_uniform
if(U.hastie && U.aband)
@@ -81,12 +82,17 @@
else
aband_msg += " with \icon[U.webbing] \a [U.webbing]"
if(istype(w_uniform,/obj/item/clothing/under/color/orange))
var/obj/item/clothing/under/color/orange/V = w_uniform
if(V.id)
cell_msg = " It has a marker for \"[V.id]\" painted on the front and back."
if(w_uniform.blood_DNA)
msg += "<span class='warning'>[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] blood-stained [w_uniform.name][tie_msg][aband_msg]!</span>\n"
msg += "<span class='warning'>[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] blood-stained [w_uniform.name][tie_msg][aband_msg]![cell_msg]</span>\n"
else if(w_uniform.wasbloody == 2)
msg += "<span class='warning'>[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] luminol-covered [w_uniform.name][tie_msg][aband_msg]!</span>\n"
msg += "<span class='warning'>[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] luminol-covered [w_uniform.name][tie_msg][aband_msg]![cell_msg]</span>\n"
else
msg += "[t_He] [t_is] wearing \icon[w_uniform] \a [w_uniform][tie_msg][aband_msg].\n"
msg += "[t_He] [t_is] wearing \icon[w_uniform] \a [w_uniform][tie_msg][aband_msg].[cell_msg]\n"
//head
if(head)