cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-30 12:04:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,216 Commits 5 Branches 0 Tags
a0ab995551a0e8cb15b8ca5f0026aa5f21698cbc
Commit Graph

312 Commits

Author SHA1 Message Date
Unknown
8621295ba3 Runtimes plz 2019-03-29 08:42:06 -04:00
Unknown
d76d30c990 Fixes Potential Runtimes 2019-03-29 08:33:22 -04:00
Unknown
baffac60fc Lynx Fixes Runtimes 
There are still a couple of remaining runtimes...
 2019-03-28 23:50:37 -04:00
Novacat
a7ee250193 Merge pull request #4844 from VOREStation/upstream-merge-5991 
[MIRROR] Fixes drinks and adds new one.
 2019-03-28 22:01:05 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Novacat
21f4479636 Merge branch 'master' into upstream-merge-5991 2019-03-28 21:35:54 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Novacat
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814 
[MIRROR] [READY]Makes a bunch of processes subsystems instead
 2019-03-27 17:46:31 -04:00
Novacat
97e98dd04d Merge pull request #4682 from VOREStation/upstream-merge-5829 
[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
 2019-03-27 16:37:45 -04:00
Unknown
ec19a66eff Conflict Resolution 2019-03-27 16:36:41 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Novacat
c848a07f62 Merge pull request #4668 from VOREStation/upstream-merge-5815 
[MIRROR] Adds eggnog drink to the game.
 2019-03-27 15:17:14 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Unknown
a92eb4a414 Reverts to Polaris File 2019-03-27 12:50:51 -04:00
Neerti
373e1c766a Fixes infinite microwave sound when recipe fails 2019-03-27 12:45:09 -04:00
Unknown
4e67e1b9ab Conflict Resolution 2019-03-27 04:11:30 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Neerti
7b84411b7c Fixes drinks and adds new one. 2019-03-08 20:19:14 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Hawk_v3
2bc1f83de7 Merge remote-tracking branch 'upstream/master' 2019-01-15 20:56:39 +00:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Neerti
099ddeff20 Merge pull request #5815 from Heroman3003/eggnog 
Adds eggnog drink to the game.
 2019-01-12 04:29:39 -05:00
Spades
1338225afa Resolves some merge conflicts 2019-01-05 16:29:19 -05:00
Ketrai
4c62b1abde Fixes nutriment stacking 
Currently cooking the pizza caused the intended amount of nutriment to be too high. This fixes it.
 2019-01-02 00:36:27 +01:00
Ketrai
257a7809d0 Update snacks_vr.dm 2019-01-01 17:39:20 +01:00
Ketrai
1841614d78 Update snacks_vr.dm 2019-01-01 17:05:42 +01:00
Ketrai
681f52123f Update snacks_vr.dm 2019-01-01 16:40:00 +01:00
Ketrai
1c43cfd638 Update snacks_vr.dm 2019-01-01 16:22:29 +01:00
Ketrai
f93b25b1c9 Update recipes_microwave_vr.dm 2019-01-01 15:57:21 +01:00
Ketrai
e37cf040b4 Update snacks_vr.dm 2019-01-01 15:50:13 +01:00
Hawk_v3
b6988c5a09 Merge remote-tracking branch 'upstream/master' 2018-12-15 19:37:28 +00:00
Unknown
b48efb138f More merge conflict fixes 
I think I got them all.
 2018-12-13 00:33:32 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Hawk_v3
eac48b5283 Merge remote-tracking branch 'upstream/master' 2018-10-24 22:07:16 +01:00
Shophaune
fad2beb82e Fixes duplication of corpses by holding and then cooking (#5693) 
* Add files via upload

* Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix"

This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing
changes made to 6f909ce590.

* Fix for cooking mob duplication

* Actually this is a better method, thanks Baystation

Yeah they kinda fixed it three days ago way better than I did it so
 2018-10-22 20:54:02 -04:00
Hawk_v3
71b8f6582d Merge remote-tracking branch 'upstream/master' 2018-10-16 22:10:17 +01:00
Arokha Sieyes
ce187f64ed Fixup other vorestation things 
Stop using the web editor please
 2018-10-16 12:05:32 -04:00
Anewbe
12e34de332 Move almost everything food related into the kitchen module. 2018-10-15 15:47:14 -04:00
Ketrai
6ed59d63c5 Update recipes_microwave_vr.dm 2018-04-14 14:17:13 +02:00
Ketrai
6a94efd5da Makes donuts less of a strain on resources. 
considering you can put 6 donuts in a box, and they're supposed to be a small food item... this overrides all the donuts to use dough slices instead of a full wad of dough. 

Literally, who would realistically use two boxes of flour, six eggs, and whatnot to make one batch of donuts?
 2018-04-14 12:07:22 +02:00
Leshana
27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27 
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
 2018-01-27 23:08:53 -05:00
SunnyDaise
1f80c3336d Onions, Food and Plant Tweaks (#4629) 
* Onyonyon

* Fixes Potato's and adds Changelog.
 2018-01-27 16:53:54 -08:00
Cerebulon
8ec8b89e10 Adds a bunch of food recipes from /tg/station. (#4565) 
* Adds a bunch of food from /tg/station.
With recipes adjusted for our system.
Meat Bun, Sashimi, Eggs Benedict, Baked Beans, Sugar Cookie, Berry Muffin, Booberry Muffin, Egg Roll, Fruit Salad, Egg Bowl, Pork Bowl, Tortilla, Meat Burrito, Cheese Burrito, Fuego Burrito, Nachos, Cheesy Nachos, Cuban Nachos, Pig in Blanket.
 2018-01-23 19:16:30 -08:00
Arokha Sieyes
9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018 
# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
 2018-01-22 12:10:19 -05:00
SunnyDaise
10490fa5b4 Food and Drink: Additions and Bugfixes (#4598) 
* Food and Drink
 2018-01-21 22:18:33 -08:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Ketrai
2a5605555b adds 2 more dishes 2017-09-11 19:18:11 +02:00