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

Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport

Browse Source 
Conflicts:
	baystation12.dme

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-08-25 01:41:27 +10:00
parent 7ebe6d16a2 bb9a8259ba
commit 3e650e6d52
13 changed files with 10333 additions and 10555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/inventory.dm
+2
View File
@@ -127,8 +127,10 @@
if(W == src.l_hand)
src.l_hand = null
update_inv_l_hand() //So items actually disappear from hands.
else if(W == src.r_hand)
src.r_hand = null
update_inv_r_hand()
W.loc = src
switch(slot)