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

896 Commits

Author SHA1 Message Date
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
9490261230 Adds Kitsuhanan Cure for resleeving sickness 2020-01-06 07:15:13 +10:00
Atermonera
45b4947d1e Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers 
Printable Spray Bottles
 2019-12-25 18:10:16 -05:00
Unknown
ea4c6075b7 Fixes busted syringes 2019-12-07 10:25:28 -05:00
Mechoid
e1fa847bc2 Xenowork Prep For Future (#6491) 
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
 2019-11-04 21:38:02 -05:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Unknown
fdca4f7554 Master Runtime Fix 2019-10-01 03:09:58 -04:00
Heroman
31d459f230 Fixes Blood-Onator 2019-09-14 15:01:58 +10:00
Unknown
14eb525030 Adjusts Vorestation pills and pillbottles 2019-08-28 04:06:19 -04:00
Atermonera
8f067fe785 Chemistry Expansion 2019-08-21 17:43:01 -04:00
Novacat
dd7a7842ed Merge pull request #5567 from Novacat/nova-survival 
Adds Prototype Hypospray
 2019-08-12 13:15:35 -04:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Novacat
8e321b3725 Update hypospray.dm 2019-08-06 22:10:50 -04:00
Unknown
d7406088b5 Test 2019-08-06 21:07:40 -04:00
Unknown
b5824871ed Removes unnecessary check 2019-08-06 21:05:51 -04:00
Unknown
03976d3dd3 Moves var 2019-08-06 21:03:35 -04:00
Unknown
f699825119 Forgot a Var 2019-08-06 20:58:25 -04:00
Unknown
1fb88e40e2 Adds Prototype Hypospray 
- Can be researched and manufactured by Science
- Identical to a mk1 hypospray, except does not instantly inject reagents at friendly intents

Not terribly useful right now under the current meta, but probably will be useful down the road if/when syringes become disposable again.
 2019-08-06 20:54:14 -04:00
Atermonera
6a12033368 Merge pull request #6321 from Nalarac/patch-2 
Allows Longer Visible Text on Beakers
 2019-07-22 00:44:19 -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
Heroman
2de30ebaf7 Removes fertilizer aspect 2019-06-02 07:09:44 +10: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
1b1489d8cc Adds medicíne pills/bottles for adminbus 2019-05-02 17:08:39 -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
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
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
mistyLuminescence
5dc4686ad9 Unidentified Auto Tweak 2: Electric Boogaloo (#5990) 
* Remakes #5983 by request.
 2019-03-31 19:19:59 -04:00
Unknown
ad181e797a Conflict Resolution 
Also fixes a compiling error with previous PR
 2019-03-28 17:24:03 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -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
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Unknown
b48efb138f More merge conflict fixes 
I think I got them all.
 2018-12-13 00:33:32 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Spades
b28213c906 Merge pull request #4356 from Novacat/nova-ert 
ERT Equipment Redo
 2018-10-20 17:34:41 -04:00
Arokha Sieyes
ce187f64ed Fixup other vorestation things 
Stop using the web editor please
 2018-10-16 12:05:32 -04:00