mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-10 15:36:56 +01:00
Merge pull request #612 from ArchieBeepBoop/runtimesgetsquashed
Fixes Meatwheat Poisoning, Wrong Simplemob Gibs and a runtime.
This commit is contained in:
@@ -224,7 +224,7 @@
|
||||
/obj/item/reagent_containers/food/snacks/meat/slab/meatwheat
|
||||
name = "meatwheat clump"
|
||||
desc = "This doesn't look like meat, but your standards aren't <i>that</i> high to begin with."
|
||||
list_reagents = list("nutriment" = 3, "vitamin" = 2, "blood" = 5, "cooking_oil" = 1)
|
||||
list_reagents = list("nutriment" = 3, "vitamin" = 2, "cooking_oil" = 1)
|
||||
filling_color = rgb(150, 0, 0)
|
||||
icon_state = "meatwheat_clump"
|
||||
bitesize = 4
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
/mob/living/proc/spawn_gibs(with_bodyparts, atom/loc_override)
|
||||
var/location = loc_override ? loc_override.drop_location() : drop_location()
|
||||
if(mob_biotypes & MOB_ROBOTIC)
|
||||
if(MOB_ROBOTIC in mob_biotypes)
|
||||
new /obj/effect/gibspawner/robot(location, src, get_static_viruses())
|
||||
else
|
||||
new /obj/effect/gibspawner/generic(location, src, get_static_viruses())
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
if(starting)
|
||||
splatter_dir = get_dir(starting, target_loca)
|
||||
var/obj/item/bodypart/B = L.get_bodypart(def_zone)
|
||||
if(B.status == BODYPART_ROBOTIC) // So if you hit a robotic, it sparks instead of bloodspatters
|
||||
if(B && B.status == BODYPART_ROBOTIC) // So if you hit a robotic, it sparks instead of bloodspatters
|
||||
do_sparks(2, FALSE, target.loc)
|
||||
if(prob(25))
|
||||
new /obj/effect/decal/cleanable/oil(target_loca)
|
||||
|
||||
Reference in New Issue
Block a user