cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Meatspike fixes. (#4299)

Browse Source 
* Various fixes.

* Appeases the travis god by properly using isMonkey.

* Skips out on helpers entirely.

* Adds a parantheses.

I ruin commit histories just by glancing at them.
This commit is contained in:
Belsima
2017-11-19 14:42:37 -06:00
committed by Anewbe
parent 7d6332a845
commit b72cc54580
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/kitchen_spike.dm
+10 -9
View File
@@ -1,7 +1,7 @@
//////Kitchen Spike
/obj/structure/kitchenspike
name = "a meat spike"
name = "meat spike"
icon = 'icons/obj/kitchen.dmi'
icon_state = "spike"
desc = "A spike for collecting meat from animals."
@@ -16,16 +16,16 @@
if(!istype(G, /obj/item/weapon/grab) || !ismob(G.affecting))
return
if(occupied)
user << "<span class = 'danger'>The spike already has something on it, finish collecting its meat first!</span>"
to_chat(user, "<span class = 'danger'>The spike already has something on it, finish collecting its meat first!</span>")
else
if(spike(G.affecting))
visible_message("<span class = 'danger'>[user] has forced [G.affecting] onto the spike, killing them instantly!</span>")
visible_message("<span class = 'danger'>[user] has forced [G.affecting] onto the spike, killing \him instantly!</span>")
var/mob/M = G.affecting
M.forceMove(src)
qdel(G)
qdel(M)
else
user << "<span class='danger'>They are too big for the spike, try something smaller!</span>"
to_chat(user, "<span class='danger'>They are too big for the spike, try something smaller!</span>")
/obj/structure/kitchenspike/proc/spike(var/mob/living/victim)
if(!istype(victim))
@@ -33,10 +33,11 @@
if(istype(victim, /mob/living/carbon/human))
var/mob/living/carbon/human/H = victim
if(!issmall(H))
if(istype(H.species, /datum/species/monkey))
meat_type = H.species.meat_type
icon_state = "spikebloody"
else
return 0
meat_type = H.species.meat_type
icon_state = "spikebloody"
else if(istype(victim, /mob/living/carbon/alien))
meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat
icon_state = "spikebloodygreen"
@@ -54,8 +55,8 @@
meat--
new meat_type(get_turf(src))
if(meat > 1)
user << "You remove some meat from \the [victim_name]."
to_chat(user, "You cut some meat from \the [victim_name]'s body.")
else if(meat == 1)
user << "You remove the last piece of meat from \the [victim_name]!"
to_chat(user, "You remove the last piece of meat from \the [victim_name]!")
icon_state = "spike"
occupied = 0