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

Merge pull request #399 from Bone-White/master

Browse Source 
Rigid suit equip delay rework
This commit is contained in:
ZomgPonies
2014-08-20 03:07:09 -04:00
parent f4b6450a20 b5fcd209b2
commit 6ebb6d617e
5 changed files with 75 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+11 -3
View File
@@ -151,8 +151,17 @@
//canremove==0 means that object may not be removed. You can still wear it. This only applies to clothing. /N
if(!src.canremove)
return 0
else
if(istype(user,/mob/living/carbon/human))
if(istype(src, /obj/item/clothing/suit/space/rig)) // If the item to be unequipped is a rigid suit
if(user.delay_clothing_u_equip(src) == 0)
return 0
else
user.u_equip(src)
else
user.u_equip(src)
/*
if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
if(istype(src, /obj/item/clothing/suit/space/rig)) // If the item to unequip item is a rigid suit
@@ -186,8 +195,7 @@
H << "\red \The [src] is too fiddly to remove whilst moving."
return 0
H << "\blue You finish removing the [src]."
user.u_equip(src)
*/
else
if(isliving(src.loc))
return 0