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
65,398 Commits 10 Branches 0 Tags
481c0e314eace4f1e9acdb0da139d7d2954fc285
Commit Graph

134 Commits

Author SHA1 Message Date
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Aronai Sieyes
1974a32d1e Merge pull request #10918 from VOREStation/Arokha/smartdrinksfix 
Remove unneeded update_icon() override
 2021-07-05 23:58:11 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Aronai Sieyes
ecc9cf97df Merge pull request #10806 from VOREStation/Icons/vendors 
Port Eris, /tg/ vendors
 2021-07-03 20:32:22 +00:00
Nadyr
1236fda644 powder that makes you say yes 2021-07-01 19:44:44 -04:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Razgriz
3b0f1d91b7 Update cereal.dm 2021-06-17 22:54:36 -07:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Nadyr
ce20d09e0c Merge pull request #2054 from CHOMPStationBot/upstream-merge-10433 
[MIRROR] [MIRROR] Linter Introduction + Cleanup
 2021-05-27 21:35:05 -04:00
Nadyr
2c409ca754 powder that makes you say yes 2021-05-27 20:00:04 -04:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Aronai Sieyes
f6bcad07df Merge pull request #10370 from VOREStation/upstream-merge-8087 
[MIRROR] SSpersistence tweaks
 2021-05-27 16:30:41 +00:00
Nadyr
eba6a3fa36 powder that makes you say yes 2021-05-19 08:12:30 -04:00
Nadyr
6a64221963 powder that makes you say yes 2021-05-19 08:10:17 -04:00
Nadyr
6b9dc2a135 powder that makes you say yes 2021-05-19 08:08:57 -04:00
Chompstation Bot
9784331cdb Add persistent smartfridges with lossiness 2021-05-19 08:08:40 -04:00
Chompstation Bot
643e532256 [MIRROR] Adds persistent smartfridges for garden products, material sheets 2021-05-13 20:53:58 +00:00
Chompstation Bot
b7603497ce Fixup things for dm-langserver 2021-04-07 16:02:12 +00:00
Chompstation Bot
0001021815 [MIRROR] Tanning Tweaks 2021-03-30 20:55:26 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Razgriz
09899f191a Update oven.dm 2021-02-12 22:55:57 -07:00
Chompstation Bot
c11124cb58 [MIRROR] Absurd Amount of Food Fixes 2021-02-08 04:59:38 +00:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
Cadyn
a74f637820 Quick fix for oven shenanigans 2020-10-07 14:14:04 -07:00
Cadyn
1d0e69633f Fix silly stuff 2020-10-05 19:46:50 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
e72d810c31 Update _appliance.dm 2020-09-21 13:54:40 -04:00
Novacat
23d0b9a699 Update _appliance.dm 2020-09-21 13:54:02 -04:00
Mechoid
68a37c64fa Hydro upkeep 2020-09-16 19:40:41 -04:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02: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
Novacat
f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions 
Massive Ambience and Sound Overhaul + Addition
 2020-08-28 00:47:23 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Atermonera
dcd6ae56ca Merge pull request #7550 from Khloross/cookingfix 
Fix combinination_cook() creating items with no reagents
 2020-08-27 19:46:28 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Atermonera
0ebcca246e Merge pull request #7518 from Meghan-Rossi/borgcookfix 
Fix cyborgs not being able to cook
 2020-08-21 01:25:40 -04:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
Novacat
e4b5b8ea2d Merge pull request #8661 from ShadowLarkens/med_pass_2 
TGUI Medical: Second Pass
 2020-08-12 20:01:12 -04: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
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
ShadowLarkens
24cdba0042 TGUI Smartfridge 2020-08-10 04:46:28 -07:00
Razgriz
71cad743d1 Merge pull request #461 from Rykka-Stormheart/shep-dev-reduce-oven-heat-loss 
Halve Oven Heat Loss
 2020-08-10 01:08:31 -07:00
Rykka
1fef17858c Halve Oven Heat Loss 
Resolves https://github.com/CHOMPStation2/CHOMPStation2/issues/460
 2020-08-10 00:40:56 -04:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Atermonera
afb5819c32 Tweak to kitchen machinery: 2020-08-08 23:53:58 -04:00
Rykka
0214f52039 Aurora Cooking Pre-heating bugfix 
Appliances previously had 60k resist and 30k resist, for fryer and oven respectively.

This meant that fryer would heat up in 62 minutes and oven would heat in 35-45. Obviously completely out of wack.

Now grill heats in at 6:50, fryer at 10:35, and oven at 12:10 to reach peak/cap temperatures!
 2020-08-06 00:23:35 -04:00
Rykka
19a90b6bd3 Aurora Cooking Pre-heating bugfix 
Appliances previously had 60k resist and 30k resist, for fryer and oven respectively.

This meant that fryer would heat up in 62 minutes and oven would heat in 35-45. Obviously completely out of wack.

Now grill heats in at 6:50, fryer at 10:35, and oven at 12:10 to reach peak/cap temperatures!
 2020-08-06 00:19:12 -04:00