Merge pull request #871 from Fox-McCloud/goregib

More Gore from Gibbing
This commit is contained in:
TheDZD
2015-04-25 15:28:49 -04:00
3 changed files with 43 additions and 0 deletions
@@ -13,6 +13,11 @@
playsound(src.loc, 'sound/effects/gib.ogg', 100, 1, 10)
for(var/obj/item/organ/I in internal_organs)
if(istype(loc,/turf))
I.removed(src)
I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
for(var/obj/item/organ/external/E in src.organs)
if(istype(E, /obj/item/organ/external/chest))
continue
+25
View File
@@ -22,6 +22,13 @@ var/list/organ_cache = list()
// links chemical IDs to number of ticks for which they'll stay in the blood
germ_level = 0
/obj/item/organ/attack_self(mob/user as mob)
// Convert it to an edible form, yum yum.
if(!robotic && user.a_intent == "harm")
bitten(user)
return
/obj/item/organ/proc/update_health()
return
@@ -256,3 +263,21 @@ var/list/organ_cache = list()
target.update_eyes()
..()
/obj/item/organ/proc/bitten(mob/user)
if(robotic)
return
user << "\blue You take a bite out of \the [src]."
user.unEquip(src)
var/obj/item/weapon/reagent_containers/food/snacks/organ/O = new(get_turf(src))
O.name = name
O.icon_state = dead_icon ? dead_icon : icon_state
if(fingerprints) O.fingerprints = fingerprints.Copy()
if(fingerprintshidden) O.fingerprintshidden = fingerprintshidden.Copy()
if(fingerprintslast) O.fingerprintslast = fingerprintslast
user.put_in_active_hand(O)
del(src)
@@ -625,6 +625,19 @@
..()
reagents.add_reagent("nutriment", 1)
/obj/item/weapon/reagent_containers/food/snacks/organ
name = "organ"
desc = "It's good for you."
icon = 'icons/obj/surgery.dmi'
icon_state = "appendix"
filling_color = "#E00D34"
New()
..()
reagents.add_reagent("nutriment", 4)
src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/appendix
//yes, this is the same as meat. I might do something different in future
name = "appendix"