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

1907 Commits

Author SHA1 Message Date
Novacat
b039eacdd7 Merge pull request #5429 from Novacat/nova-basicfixes 
Ease of Eating Changes
 2019-07-17 17:35:58 -04:00
Atermonera
d987e1e7fd Merge pull request #6301 from Cerebulon/saltoid 
Salt is Salt
 2019-07-16 00:49:52 -04:00
Atermonera
257e3dd9fc Merge pull request #6287 from Wickedtemp/master 
Allows Set Transfer Amounts of 250 and 500 for Reagent Cartridges
 2019-07-12 02:51:39 -04:00
Atermonera
1472642b88 Merge pull request #6262 from Mechoid/CivilianExpansion1 
Civilian Expansion 1: The Plantening
 2019-07-07 17:29:32 -04:00
Novacat
baa2d5805b Update Chemistry-Recipes_vr.dm 2019-07-06 16:17:10 -04:00
Unknown
e18440a991 Recommended suggestions 2019-07-06 15:36:44 -04:00
Unknown
a5961d8e0e Ease of Eating Changes 
On request from Duke

- Microwave cooking times cut to 25% of normal times
- You now need 1/5 of the amount of clonexcadone for meat
- Cargo pizzas start out cooked
 2019-07-04 21:32:52 -04:00
GeneriedJenelle
12df030c0a Adds Cider Bottles (#6201) 
* Adds Cider

How has SS13 alcohol gone on so long without cider? Let's fix that.

* Update cartridge_presets.dm

* Update dispenser2_energy.dm

* Update dispenser_presets.dm

* Adds cider bottle sprite + adds to borgs

* Update Chemistry-Reagents-Food-Drinks.dm

* Removes additional cider entry
 2019-06-18 20:05:06 -04:00
Novacat
b7205d3b60 Update pill.dm 2019-06-16 21:51:52 -04:00
Novacat
13739440c2 Grey scale pills and colored pillbottles 2019-06-16 21:28:56 -04:00
Spades
fafd7675ef Merge pull request #4986 from Heroman3003/zoooooooom 
Rebalances zoom pills
 2019-06-12 17:11:48 -04:00
Neerti
21244ade2f Merge pull request #6204 from Ketrai/worms 
Adds worms
 2019-06-11 17:35:11 -04:00
Heroman
2de30ebaf7 Removes fertilizer aspect 2019-06-02 07:09:44 +10:00
Novacat
b7761ee3ef Update Chemistry-Recipes.dm 2019-05-06 14:18:39 -04:00
Atermonera
90ee680dd5 Fishing! 2019-05-06 14:16:27 -04:00
Novacat
048760f2ea Update Chemistry-Holder.dm 2019-05-05 14:17:53 -04:00
Atermonera
1757c30075 Ports #6039 with Virgo Fixes 2019-05-05 14:14:37 -04:00
Unknown
eeb198d3a4 Metabolism effects 2019-05-02 19:41:17 -04:00
Unknown
fcb2830fe5 Changes adminordrazine pill 2019-05-02 19:34:35 -04:00
Unknown
68649aeb71 Recommended changes 2019-05-02 17:38:26 -04:00
Unknown
bd08ef98aa Buffs adminordrazine 2019-05-02 17:27:07 -04:00
Unknown
1b1489d8cc Adds medicíne pills/bottles for adminbus 2019-05-02 17:08:39 -04:00
Neerti
d9a7b5705c Merge pull request #6115 from Mechoid/SterilizineTheThinkingXenobiologistsWeapon 
Sterilizine Hurts Slimes
 2019-04-22 01:25:15 -04:00
Novacat
17eadd4444 Merge pull request #5069 from Sebbe9123/mobpathfix 
Hopefully fixes all paths here and there
 2019-04-18 18:50:33 -04:00
Novacat
49e8fa5487 Merge pull request #5096 from VOREStation/upstream-merge-6096 
[MIRROR] Changes way syringes interact with containers
 2019-04-18 14:02:51 -04:00
Novacat
aac3f800ba Update syringes.dm 2019-04-18 13:53:34 -04:00
Novacat
8e93b70bb6 Update syringes.dm 2019-04-18 13:51:08 -04:00
Novacat
69cc49c009 Conflict Resolution 2019-04-18 13:44:38 -04:00
Atermonera
f986f56ec2 Changes way syringes interact with containers 2019-04-18 13:26:55 -04:00
Atermonera
30726b47d6 Starts work on Organs affecting Reagent Processing 2019-04-18 13:09:48 -04:00
Sebbe
1cf7fa2d69 Merge branch 'master' into mobpathfix 2019-04-16 11:39:01 +02:00
Sebbe
224ce6582b Hopefully fixes every path 
plz game, I didn't have fun ;w;
 2019-04-16 10:41:04 +02:00
Neerti
d2cb1f67a3 Merge pull request #6024 from Mechoid/Precursotech_Sleepers 
Precurso / Anomalotech Sleepers
 2019-04-14 01:16:46 -04:00
Heroman3003
4d47aa5030 Unruntimes chems 2019-04-12 09:25:14 +10:00
Novacat
552cafdb47 Merge pull request #4970 from Novacat/nova-ert 
Emergency Chemistry/NanoUI/Timer subsystem fixes
 2019-04-10 19:39:51 -04:00
Heroman
e811fec521 Rebalances zoom pills 2019-04-10 06:14:51 +10:00
Heroman
9e3aa54188 Rebalances zoom pills 2019-04-10 05:12:42 +10:00
Heroman
0588af5f16 Removes testing pill 2019-04-09 18:39:17 +10:00
Heroman
6cc3d0a2c4 Fixes promethean transformation 2019-04-09 18:35:50 +10:00
Unknown
26317c4017 Removes whitespace 2019-04-08 16:18:53 -04:00
Unknown
dcd2a1f606 Ports Chemistry/NanoUI Fixes Early 
Direct port of https://github.com/PolarisSS13/Polaris/pull/6039
 2019-04-08 16:15:29 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Novacat
07bc5814b2 Merge pull request #4903 from Heroman3003/research-re-do 
Moves Anomaly Lab to research outpost, replaces with Chemistry set
 2019-04-04 20:52:01 -04:00
Screemonster
629318de74 Refactors regeneration of ravenous races 2019-04-04 06:46:25 +01:00
Heroman3003
80c759ca1c Finishing touches 2019-04-04 10:35:39 +10:00
mistyLuminescence
5dc4686ad9 Unidentified Auto Tweak 2: Electric Boogaloo (#5990) 
* Remakes #5983 by request.
 2019-03-31 19:19:59 -04:00
Unknown
c0a0bb63a6 Buffs Xenochimera Protein 
Because protein is a sub-type of nutriment, I am 99% certain that this is required to offset the nutriment debuff.
 2019-03-29 09:39:30 -04:00
Unknown
7515897713 Whitespace Reeeeee 2019-03-29 09:39:30 -04:00
Unknown
6465150c4e Fixes some serious spacebrain gas 2019-03-29 09:39:30 -04:00