cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kitchen Resprites (#17311)

Browse Source 
* Kitchen Resprites

* for ata

* Update code/modules/cooking/machinery/cooking_machines/container.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/cooking/machinery/cooking_machines/container.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/cooking/machinery/cooking_machines/container.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/cooking/machinery/cooking_machines/container.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* admiral ackbar cereal

* walter j hartwell

* for real?

* hank schrader

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
This commit is contained in:
Wowzewow (Wezzy)
2023-09-19 09:58:22 +00:00
committed by GitHub
co-authored by Fluffy
parent 8d17f98dca
commit 1b51600ca6
31 changed files with 208 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/kitchen_spike.dm
+7 -7
View File
@@ -16,30 +16,31 @@
if(!istype(G, /obj/item/grab) || !G.affecting)
return
if(occupied)
to_chat(user, "<span class = 'danger'>The spike already has something on it, finish collecting its meat first!</span>")
to_chat(user, SPAN_DANGER("The spike already has something on it, finish collecting its meat first!"))
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_DANGER("[user] has forced [G.affecting] onto the spike, killing them instantly!"))
qdel(G.affecting)
qdel(G)
else
to_chat(user, "<span class='danger'>They are too big for the spike, try something smaller!</span>")
to_chat(user, SPAN_DANGER("They are too big for the spike, try something smaller!"))
/obj/structure/kitchenspike/proc/spike(var/mob/living/victim)
if(!istype(victim))
return
cut_overlays()
if(istype(victim, /mob/living/carbon/human))
var/mob/living/carbon/human/H = victim
if(!issmall(H))
return 0
meat_type = H.species.meat_type
icon_state = "spikebloody"
add_overlay(overlay_image(icon, "spikebloody"))
else if(istype(victim, /mob/living/carbon/alien))
var/mob/living/carbon/alien/A = victim
meat_type = A.meat_type
icon_state = "spikebloodygreen"
add_overlay(overlay_image(icon, "spikebloodygreen"))
else
return 0
@@ -60,7 +61,6 @@
icon_state = "spike"
occupied = 0
/obj/structure/kitchenspike/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if (!mover)
return 1
@@ -74,4 +74,4 @@
else if(mover.checkpass(PASSTABLE))
//Animals can run under them, lots of empty space
return 1
return ..()
return ..()