cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes food not a subtype of reagent holders (#23379)

Browse Source 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-01-21 19:00:02 +00:00
committed by GitHub
co-authored by Ryan Henri215
parent 22fbd9aced
commit db578cdc6f
276 changed files with 10289 additions and 10287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/mission_code/ruins/watcher_grave.dm
+6 -6
View File
@@ -16,7 +16,7 @@
#define WATCHER_EGG_ACTIVE_MOD 0.5
/// Egg which hatches into a helpful pet. Or you can eat it if you want.
/obj/item/reagent_containers/food/snacks/egg/watcher
/obj/item/food/snacks/egg/watcher
name = "watcher egg"
desc = "A lonely egg still pulsing with life, somehow untouched by the corruption of the Necropolis."
icon_state = "egg_watcher"
@@ -30,15 +30,15 @@
/// Datum used to measure our steps
var/datum/movement_detector/pedometer
/obj/item/reagent_containers/food/snacks/egg/watcher/Initialize(mapload)
/obj/item/food/snacks/egg/watcher/Initialize(mapload)
. = ..()
pedometer = new(src, CALLBACK(src, PROC_REF(on_stepped)))
/obj/item/reagent_containers/food/snacks/egg/watcher/Destroy(force)
/obj/item/food/snacks/egg/watcher/Destroy(force)
. = ..()
QDEL_NULL(pedometer)
/obj/item/reagent_containers/food/snacks/egg/watcher/examine(mob/user)
/obj/item/food/snacks/egg/watcher/examine(mob/user)
. = ..()
if(steps_travelled < (steps_to_hatch * WATCHER_EGG_ACTIVE_MOD))
. += "<span class='notice'>Something stirs listlessly inside.</span>"
@@ -50,7 +50,7 @@
/// Called when we are moved, whether inside an inventory or by ourself somehow
/obj/item/reagent_containers/food/snacks/egg/watcher/proc/on_stepped(atom/movable/egg, atom/mover, atom/old_loc, direction)
/obj/item/food/snacks/egg/watcher/proc/on_stepped(atom/movable/egg, atom/mover, atom/old_loc, direction)
var/new_loc = get_turf(egg)
if(isnull(new_loc) || new_loc == get_turf(old_loc))
return // Didn't actually go anywhere
@@ -67,7 +67,7 @@
qdel(src)
/// Animate the egg
/obj/item/reagent_containers/food/snacks/egg/watcher/proc/jiggle()
/obj/item/food/snacks/egg/watcher/proc/jiggle()
var/animation = isturf(loc) ? rand(1, 3) : 1 // Pixel_x/y animations don't work in an inventory
switch(animation)
if(1)