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
82,985 Commits 10 Branches 0 Tags
896094ef9c3b63037aedba786debb6a2ed859a29
Commit Graph

63 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
4099a9435b [MIRROR] Machine var shim (#11878) 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>
 2025-10-27 02:35:27 -04:00
CHOMPStation2StaffMirrorBot
ba1065b92e [MIRROR] clean up flags (Requires #11623 Merged First) (#11637) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-09-14 20:19:32 +02:00
CHOMPStation2StaffMirrorBot
1b8f394a14 [MIRROR] Makes uses of do_after sane (#11582) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-09-07 23:02:27 -04:00
CHOMPStation2StaffMirrorBot
2c9453b5c3 [MIRROR] var/global/list -> GLOB. conversion (#11193) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-07-16 00:24:42 +02:00
CHOMPStation2StaffMirrorBot
c8c53b84ec [MIRROR] Polish the microwave UI (#10748) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
 2025-04-26 12:12:52 +02:00
CHOMPStation2StaffMirrorBot
16a213f699 [MIRROR] Have you bingled that (#10545) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-29 22:12:53 +01:00
CHOMPStation2StaffMirrorBot
ce2446922e [MIRROR] Initialize fixing (#10335) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-08 22:22:04 +01:00
Kashargul
3771982275 [Manual Port] manually ports icon forge from Virgo (#9731) 2024-12-30 14:20:44 +01:00
CHOMPStation2StaffMirrorBot
fd5d9267ff [MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-12 02:11:06 +01:00
CHOMPStation2StaffMirrorBot
91f903f9d3 [MIRROR] Make the microwave preview what it'll (probably) create (#9565) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-11-30 14:57:59 +01:00
CHOMPStation2StaffMirrorBot
7c2aa4aac7 [MIRROR] Allow pAIs to attack_ai the machine they're inside, (#9564) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2024-11-30 14:07:08 +01:00
CHOMPStation2
7b54a9298d [MIRROR] some more small things (#9260) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-19 15:44:48 +02:00
CHOMPStation2
7416cbea22 [MIRROR] next set of spans (#9247) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-18 01:33:07 +02:00
CHOMPStation2
ab154b48b2 [MIRROR] refactors most spans (#9139) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-04 15:00:17 +02:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084) 
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-30 21:36:41 +02:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
CHOMPStation2
d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:37:41 -04:00
CHOMPStation2
507879aef8 [MIRROR] Fantasy redgate map (#7035) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-26 16:29:35 +02:00
Casey
a5ed33a2e1 Merge pull request #12944 from Somememeguy/MakeCookingGreatAgain 
Make Cooking Great Again [Tedium Update, Rebalance some cooking aspects]
 2022-05-12 19:26:08 +00:00
Novacat
2bf16244eb Merge pull request #12936 from FartMaster69420/microwave-patch 
Patching microwave recipes
 2022-05-10 14:57:20 +00:00
Casey
fbd967128d Merge pull request #12888 from FartMaster69420/pai_and_bots 
The pAI, Bot, and Microwave Tweaks
 2022-05-08 09:46:55 +00:00
Verkister
37fc075835 Fixes microwave disappearing when bloody 
Earlyport upstream fix
 2021-10-02 14:34:43 +03:00
Nadyr
c908563dec powder that makes you say yes 2021-08-25 22:28:33 -04:00
Nadyr
5c5591c16e powder that makes you say yes 2021-08-25 22:26:08 -04:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
ExabyteDiscord
a7c091e001 Merge branch 'master' into upstream-merge-11192 2021-07-21 11:35:25 -07:00
Chompstation Bot
b83a5c7990 These might be bad 2021-07-21 01:38:44 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot
b7603497ce Fixup things for dm-langserver 2021-04-07 16:02:12 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
ShadowLarkens
c32f05e1f7 TGUI Civilian 
UI's Converted:
 - Aurora Cooking
 - Chaplain Book Selection
 - ColorMate
 - Cryo Storage
 - Holodeck
 - Jukebox
 - Looking Glass
 - Microwave
 - Newscasters
 - Timeclock
 - Vending Machine Improvements
 2020-09-02 13:32:42 -07:00
Atermonera
194056340e Merge pull request #7447 from Cyantime/patch-3 
Gives NOREACT flag back to fixed microwaves
 2020-08-12 14:23:19 -04:00
Rykka
886ab72289 Huge Bundle of Fixes, Update Cooking to current Aurora 
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
 2020-07-22 21:34:13 -04:00
Rykka
93a4631005 Various fixes and bugfixes from live playtests 2020-07-20 23:33:30 -04:00
Rykka
df7bb084f1 Bugfixes, Feature Tweaks, and Final Touches 
Microwave not cooking micros/mice: Fixed
Invalid Recipe datum thanks to /microwave prefix: Fixed
Fryer earsplittingly loud: Fixed
Fryer/Oven continuing to cook even after items removed: Fixed
Oven having 'on' icon state when door closed but off: Fixed
Appliances not scaling cooking time/damage based on size: Fixed
Feature added - Burning Food will set off fire alarms and set off a black cloud of smoke!
Overcook time reduced to allow for less margin of error (IE Actively requires you to pay attention)
Multiple Microwave bugfixes, including multicooking/etc not working, recipe errors, icon state errors, ejection errors.
 2020-07-17 23:58:33 -04:00
Rykka
3974d7e87f Last Push - Everything is working, just needs testing! 2020-07-16 19:52:20 -04:00
Rykka
9f935ff59d Second Half of Aurora Cooking Initial Port - All files added 
Now onto the bugfixing nightmares!
 2020-07-16 00:37:22 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Atermonera
223fb23423 Merge pull request #6811 from Schnayy/mwsprites 
Deluxe microwave sprites work
 2020-03-12 03:21:45 -04:00
Cerebulon
80f7f3afb2 Adds more machine button sounds (#6802) 
* Adds more machine button sounds

* chang
 2020-03-11 20:32:06 -04:00
Arokha Sieyes
d5b820fc58 VChat: Redone chat output in Vue.js 
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
 2020-02-19 19:55:01 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Novacat
0679ed4042 Merge pull request #6481 from VOREStation/upstream-merge-6632 
[MIRROR] Move Microwave recipes to their own subtype of the recipe datum.
 2020-01-21 01:44:50 -05:00
Novacat
ae5fe87e38 Update microwave.dm 2020-01-21 01:36:15 -05:00
Novacat
1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621 
[MIRROR] Moar descriptions for things
 2020-01-21 01:33:06 -05:00
Unknown
c6a709b5e4 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6632 2020-01-21 01:28:43 -05:00