cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
Ccomp5950
2014-01-31 06:26:20 -06:00
parent f136fa1db2 649f777ee0
commit 8c5c5fb868
3 changed files with 432 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/living/carbon/human/inventory.dm
View File

@@ -81,20 +81,20 @@
if (W == wear_suit)
if(s_store)
u_equip(s_store)
drop_from_inventory(s_store)
if(W)
success = 1
wear_suit = null
update_inv_wear_suit()
else if (W == w_uniform)
if (r_store)
u_equip(r_store)
drop_from_inventory(r_store)
if (l_store)
u_equip(l_store)
drop_from_inventory(l_store)
if (wear_id)
u_equip(wear_id)
drop_from_inventory(wear_id)
if (belt)
u_equip(belt)
drop_from_inventory(belt)
w_uniform = null
success = 1
update_inv_w_uniform()

5
code/modules/mob/living/living.dm
View File

@@ -626,9 +626,10 @@
for(var/mob/O in viewers(CM))// lags so hard that 40s isn't lenient enough - Quarxink
O.show_message("\red <B>[CM] manages to remove the handcuffs!</B>", 1)
CM << "\blue You successfully remove \the [CM.handcuffed]."
CM.handcuffed.loc = usr.loc
CM.drop_from_inventory(CM.handcuffed)
CM.handcuffed = null
CM.update_inv_handcuffed()
else if(CM.legcuffed && CM.canmove && (CM.last_special <= world.time))
CM.next_move = world.time + 100
CM.last_special = world.time + 100
@@ -664,7 +665,7 @@
for(var/mob/O in viewers(CM))// lags so hard that 40s isn't lenient enough - Quarxink
O.show_message("\red <B>[CM] manages to remove the legcuffs!</B>", 1)
CM << "\blue You successfully remove \the [CM.legcuffed]."
CM.legcuffed.loc = usr.loc
CM.drop_from_inventory(CM.legcuffed)
CM.legcuffed = null
CM.update_inv_legcuffed()