cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #278 from caelaislinn/master

Browse Source 
Fixed disposals error from using a grab on a disposal chute.
This commit is contained in:
Albert Iordache
2012-01-13 11:52:53 -08:00
parent e3c4b0f88f 07fb3f1eb8
commit 725ec31a57
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/recycling/disposal.dm
View File

@@ -44,6 +44,10 @@
if(stat & BROKEN) if(stat & BROKEN)
return return
//robots shouldn't be able to grab/carry stuff anyway
if(isrobot(user))
return
if(istype(I, /obj/item/weapon/melee/energy/blade)) if(istype(I, /obj/item/weapon/melee/energy/blade))
user << "You can't place that item inside the disposal unit." user << "You can't place that item inside the disposal unit."
return return
@@ -91,10 +95,6 @@
for (var/mob/C in viewers(src)) for (var/mob/C in viewers(src))
C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3) C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3)
del(G) del(G)
if(isrobot(user))
return
else else
if(!I || isnull(I)) if(!I || isnull(I))
//CRASH("disposal/attackby() was called, but I was nulled before calling user.drop_item()") //CRASH("disposal/attackby() was called, but I was nulled before calling user.drop_item()")