cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 09:03:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Removes ability to put collars on jumpsuits (#15155)" (#15169)

Browse Source 
This reverts commit df1f548198.
This commit is contained in:
Fox McCloud
2020-12-28 13:43:32 -05:00
committed by GitHub
parent 19644cdd88
commit 2c4733f8bc
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+2 -15
View File
@@ -666,19 +666,10 @@ BLIND // can't see anything
3 = Report location
*/
var/list/accessories = list()
/// List of blacklisted accessory types
var/list/blacklisted_accessory_typecache
var/displays_id = 1
var/rolled_down = 0
var/basecolor
/obj/item/clothing/under/Initialize(mapload)
. = ..()
blacklisted_accessory_typecache = typecacheof(list(
/obj/item/clothing/accessory/petcollar // No collars on jumpsuits
))
/obj/item/clothing/under/rank/New()
if(random_sensor)
sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_VITALS, SENSOR_COORDS)
@@ -694,17 +685,11 @@ BLIND // can't see anything
else
return FALSE
if(is_type_in_typecache(A, blacklisted_accessory_typecache))
to_chat(usr, "<span class='notice'>[A] doesn't fit on [src].</span>")
return FALSE
if(accessories.len)
for(var/obj/item/clothing/accessory/AC in accessories)
if((A.slot in list(ACCESSORY_SLOT_UTILITY, ACCESSORY_SLOT_ARMBAND)) && AC.slot == A.slot)
to_chat(usr, "<span class='notice'>[A] doesn't fit on [src].</span>")
return FALSE
if(!A.allow_duplicates && AC.type == A.type)
to_chat(usr, "<span class='notice'>You cannot attach more accessories of this type to [src].</span>")
return FALSE
/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
@@ -731,6 +716,8 @@ BLIND // can't see anything
H.update_inv_w_uniform()
return TRUE
else
to_chat(user, "<span class='notice'>You cannot attach more accessories of this type to [src].</span>")
return FALSE