cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Crafting/Cooking menu update [MDB IGNORE] (#18334)

Browse Source 
* Crafting/Cooking menu update

* Yeeted away all of the merge conflicts, time to fix the code

* Okay, now it compiles, and after testing, it seems to work just fine

* Actually, early addition of an upstream fix, so those that don't have hunger can still open the cooking menu

* Fixes the units tests by removing the extra comma in the Stuffed Muli Pod recipe

Co-authored-by: Andrew <mt.forspam@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-01-08 15:02:18 -05:00
committed by GitHub
co-authored by Andrew GoldenAlpharex GoldenAlpharex
parent f5e10c7d53
commit ae713bf18a
126 changed files with 3400 additions and 1660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/shell/controller.dm
+2 -2
View File
@@ -23,8 +23,8 @@
/obj/item/circuit_component/controller
display_name = "Controller"
desc = "Used to receive inputs from the controller shell. Use the shell in hand to trigger the output signal. Alt-click for the alternate signal. Right click for the extra signal."
desc = "Used to receive inputs from the controller shell. Use the shell in hand to trigger the output signal."
desc_controls = "Alt-click for the alternate signal. Right click for the extra signal."
/// The three separate buttons that are called in attack_hand on the shell.
var/datum/port/output/signal
var/datum/port/output/alt