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

Merge pull request #1191 from Kelenius/inventoryCleanup

Browse Source 
Mob inventory cleanup
This commit is contained in:
Neerti
2016-03-22 21:42:27 -04:00
parent 9027b0f391 afbc235b96
commit a9ad84da4b
59 changed files with 432 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/organs/organ_external.dm
View File

@@ -98,7 +98,7 @@
if (2)
take_damage(4)
/obj/item/organ/external/attack_self(var/mob/user)
/obj/item/organ/external/attack_self(var/mob/living/user)
if(!contents.len)
return ..()
var/list/removable_objects = list()
@@ -113,8 +113,7 @@
var/obj/item/I = pick(removable_objects)
I.loc = get_turf(user) //just in case something was embedded that is not an item
if(istype(I))
if(!(user.l_hand && user.r_hand))
user.put_in_hands(I)
user.put_in_hands(I)
user.visible_message("<span class='danger'>\The [user] rips \the [I] out of \the [src]!</span>")
return //no eating the limb until everything's been removed
return ..()
@@ -128,7 +127,7 @@
usr << "<span class='danger'>There is \a [I] sticking out of it.</span>"
return
/obj/item/organ/external/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/organ/external/attackby(obj/item/weapon/W as obj, mob/living/user as mob)
switch(stage)
if(0)
if(istype(W,/obj/item/weapon/scalpel))
@@ -145,8 +144,7 @@
if(contents.len)
var/obj/item/removing = pick(contents)
removing.loc = get_turf(user.loc)
if(!(user.l_hand && user.r_hand))
user.put_in_hands(removing)
user.put_in_hands(removing)
user.visible_message("<span class='danger'><b>[user]</b> extracts [removing] from [src] with [W]!</span>")
else
user.visible_message("<span class='danger'><b>[user]</b> fishes around fruitlessly in [src] with [W].</span>")