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

Removes unreachable return in organ/external/remove(), smaller embedded items are no longer deleted. Implants changed to w_class 1 because seriously a w_class 3 implant makes no sense at all.

Browse Source
This commit is contained in:
mwerezak
2015-12-05 22:30:10 -05:00
parent 92b47c94de
commit b12e094112
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/items/weapons/implants/implant.dm
View File

@@ -6,6 +6,7 @@
name = "implant" name = "implant"
icon = 'icons/obj/device.dmi' icon = 'icons/obj/device.dmi'
icon_state = "implant" icon_state = "implant"
w_class = 1
var/implanted = null var/implanted = null
var/mob/imp_in = null var/mob/imp_in = null
var/obj/item/organ/external/part = null var/obj/item/organ/external/part = null

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

@@ -687,14 +687,11 @@ Note that amputating the affected organ does in fact remove the infection from t
****************************************************/ ****************************************************/
//Handles dismemberment //Handles dismemberment
/obj/item/organ/external/proc/droplimb(var/clean, var/disintegrate, var/ignore_children) /obj/item/organ/external/proc/droplimb(var/clean, var/disintegrate = DROPLIMB_EDGE, var/ignore_children = null)
if(cannot_amputate || !owner) if(cannot_amputate || !owner)
return return
if(!disintegrate)
disintegrate = DROPLIMB_EDGE
switch(disintegrate) switch(disintegrate)
if(DROPLIMB_EDGE) if(DROPLIMB_EDGE)
if(!clean) if(!clean)
@@ -942,7 +939,7 @@ Note that amputating the affected organ does in fact remove the infection from t
H.drop_from_inventory(W) H.drop_from_inventory(W)
W.loc = owner W.loc = owner
/obj/item/organ/external/removed(var/mob/living/user, var/ignore_children) /obj/item/organ/external/removed(var/mob/living/user, var/ignore_children = 0)
if(!owner) if(!owner)
return return
@@ -954,11 +951,11 @@ Note that amputating the affected organ does in fact remove the infection from t
status |= ORGAN_DESTROYED status |= ORGAN_DESTROYED
victim.bad_external_organs -= src victim.bad_external_organs -= src
for(var/obj/item/implant in implants) for(var/atom/movable/implant in implants)
if(!istype(implant)) //large items and non-item objs fall to the floor, everything else stays
return var/obj/item/I = implant
if(implant.w_class <= 2) if(istype(I) && I.w_class < 3)
qdel(implant) implant.loc = get_turf(victim.loc)
else else
implant.loc = src implant.loc = src
implants.Cut() implants.Cut()
@@ -1050,7 +1047,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if(wound_descriptors.len) if(wound_descriptors.len)
var/list/flavor_text = list() var/list/flavor_text = list()
var/list/no_exclude = list("gaping wound", "big gaping wound", "massive wound", "large bruise",\ var/list/no_exclude = list("gaping wound", "big gaping wound", "massive wound", "large bruise",\
"huge bruise", "massive bruise", "severe burn", "large burn", "deep burn", "carbonised area") "huge bruise", "massive bruise", "severe burn", "large burn", "deep burn", "carbonised area") //note to self make this more robust
for(var/wound in wound_descriptors) for(var/wound in wound_descriptors)
switch(wound_descriptors[wound]) switch(wound_descriptors[wound])
if(1) if(1)