cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 10 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

285 Commits

Author SHA1 Message Date
Ketrai
a9e139e152 Merge remote-tracking branch 'Ketrai/fishbranch' into fishbranch 2019-05-31 17:17:59 +02:00
Ketrai
95edaac47c Adds monkfish 
ITS HOOG
 2019-05-31 17:17:29 +02:00
Ketrai
8af709f599 Update snacks_vr.dm 2019-05-30 20:35:48 +02:00
Ketrai
e9cc1e48ab Adds lobsters and cuttlefish 2019-05-29 22:37:59 +02:00
Atermonera
90ee680dd5 Fishing! 2019-05-06 14:16:27 -04:00
Atermonera
ea2860eeb3 Merge pull request #6148 from Verkister/patch-22 
Removes melee damage from snacks.
 2019-05-03 21:56:22 -04:00
Unknown
1b1489d8cc Adds medicíne pills/bottles for adminbus 2019-05-02 17:08:39 -04:00
Neerti
8f9cc9a41e Merge pull request #6143 from Heroman3003/condiment-presets 
Adds some premade full condiment bottles
 2019-05-01 03:40:29 -04:00
Novacat
73b3b4c7b0 Update snacks.dm 2019-04-27 22:37:49 -04:00
Novacat
2672e10dc4 Conflict Resolution 2019-04-27 21:28:06 -04:00
Atermonera
8f3f8ad80f Allows liquidfoods to be eaten through protective gear 2019-04-27 19:54:46 -04:00
Atermonera
31a79f0c28 Merge pull request #6068 from Mechoid/WhatWasWillBe 
Re-adds the Space Worm.
 2019-04-26 19:33:43 -04:00
Atermonera
10d196de89 Merge pull request #6099 from Heroman3003/fcookie-runtime-fix 
Fixes fortune cookie recipe runtime
 2019-04-18 13:28:13 -04:00
Heroman
e0d243d44f Fixes missing shaker sprite 2019-04-13 08:31:39 +10:00
Heroman
4c1bb4a4c9 Changes shakers to use initialize 2019-04-12 17:30:38 +10:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman3003
35208e6e48 Fixes frozen pizzas, also ports polaris fix 2019-04-08 09:22:03 +10:00
Heroman
5a9e1f1566 Ports some fixes 2019-04-07 14:02:34 +10:00
Novacat
d7c7c073a5 Merge pull request #4868 from Novacat/nova-weapons 
Adds liquidprotein rations
 2019-04-05 17:17:53 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Unknown
6d3be92c8d Removes frost oil from pizza 
Fixes #4846
 2019-04-03 15:11:06 -04:00
Novacat
da63d0bacf Merge branch 'master' into nova-weapons 2019-03-30 23:00:48 -04:00
Novacat
9f1e3c4aa6 Update drinks.dm 2019-03-30 20:16:38 -04:00
Unknown
9fa575698b Conflict Resolution 2019-03-30 20:13:49 -04:00
Neerti
5967a92f02 Lynx Fixes Runtimes 2019-03-30 18:51:00 -04:00
Novacat
e632675748 Update snacks_vr.dm 2019-03-29 09:41:24 -04:00
Unknown
9c80690186 Adds liquidprotein rations 
For obligate carnivores.

- Adds liquidprotein rations, they can be found in exploration, sweatmax vendors, and shelter capsules.
- Ups the price for protein shakes to discourage hoarding.
 2019-03-29 09:40:24 -04:00
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
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