cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incoming mirror PR

Browse Source
This commit is contained in:
Rykka
2020-07-31 01:14:09 -04:00
parent ffbc61e37e
commit e8ebaee3dd
17 changed files with 8 additions and 1337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/food/kitchen/cooking_machines/_mixer.dm
View File

@@ -17,11 +17,7 @@ fundamental differences
/obj/machinery/appliance/mixer/examine(var/mob/user)
. = ..()
if(Adjacent(user))
<<<<<<< HEAD
to_chat(user, "<span class='notice'>It is currently set to make a [selected_option]</span>")
=======
. += "<span class='notice'>It is currently set to make a [selected_option]</span>"
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/obj/machinery/appliance/mixer/Initialize()
. = ..()
@@ -31,11 +27,7 @@ fundamental differences
//Mixers cannot-not do combining mode. So the default option is removed from this. A combine target must be chosen
/obj/machinery/appliance/mixer/choose_output()
<<<<<<< HEAD
set src in oview(1)
=======
set src in view(1)
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
set name = "Choose output"
set category = "Object"
@@ -99,11 +91,7 @@ fundamental differences
/obj/machinery/appliance/mixer/toggle_power()
<<<<<<< HEAD
set src in view()
=======
set src in view(1)
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
set name = "Toggle Power"
set category = "Object"