kevinz000
ca777c6c8b
Merge pull request #11153 from Ghommie/Ghommie-cit587
...
Fixing addiction moodlets not going away and secret sauce recipe paper.
2020-02-20 06:17:33 -07:00
Ghom
f94f997cc2
Merge pull request #11080 from kevinz000/surubatons
...
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
2020-02-20 11:09:46 +01:00
kevinz000
49279086b7
Merge pull request #11113 from CameronWoof/biogeneratin'
...
Adds diethylamine and saltpetre to the biogenerator
2020-02-19 19:03:35 -07:00
kevinz000
8567346501
Merge pull request #10953 from Ghommie/Ghommie-cit564
...
The awesome adventures of the missing spurdo line replacement file.
2020-02-19 19:00:53 -07:00
kevinz000
b983aa75ea
Merge pull request #11145 from Ghommie/Ghommie-cit586
...
Something about pAIs and silicon access priviledges.
2020-02-19 18:59:10 -07:00
Ghommie
37ba75ec12
Fixing addiction moodlets not going away and secret sauce recipe paper.
2020-02-19 14:07:11 +01:00
Ghommie
698f0b8177
Something about pAIs and silicon access priviledges.
2020-02-18 16:20:44 +01:00
kevinz000
d04126226b
Merge pull request #11082 from Hatterhat/preservahyde
...
preservahyde, alt title "what if i didnt die from having shit rng and a single epipen"
2020-02-18 02:21:37 -07:00
kevinz000
c1df5d5313
Merge pull request #11111 from Ghommie/Ghommie-cit582
...
Virology support for synthetic blood and some blood subtypes removal.
2020-02-18 02:18:03 -07:00
Cameron!
a9f103fb34
removes unused bottle, kicks travis?
2020-02-17 15:28:10 -08:00
Unknown
3286f43d90
Didnt know I could make it a subtype
2020-02-16 11:17:54 -05:00
Unknown
313f544aee
Make it require some heating
2020-02-16 08:34:08 -05:00
Unknown
38f32d28b7
Mixable Synthblood
2020-02-16 08:06:22 -05:00
Unknown
f4734e44f0
o ye this should be something else
2020-02-16 07:52:34 -05:00
Unknown
f0b3021f5d
I miss my powergame
2020-02-16 07:41:26 -05:00
CameronWoof
14e41e8d68
adds diethylamine and saltpetre to the biogenerator
2020-02-16 03:52:07 -08:00
Ghommie
1d9982d00a
Virology support for synthetic blood and some blood subtypes removal.
2020-02-16 10:36:16 +01:00
kevinz000
7ee04aa608
Merge pull request #10998 from Ghommie/Ghommie-cit569
...
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
Ghommie
4a621fb1aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
2020-02-14 19:39:53 +01:00
Ghom
2f417ef95a
Merge pull request #11042 from Arturlang/pandemic_nerfs
...
Nerfs the pandemics production.
2020-02-14 08:04:16 +01:00
Hatterhat
c8d0cacf51
bad recipe
2020-02-13 21:08:38 -06:00
Hatterhat
1276453dc4
initial commit - preservahyde
2020-02-13 21:01:28 -06:00
kevinz000
e8ccf4b6d7
fix
2020-02-13 16:25:43 -07:00
Artur
7964d768fa
Initial Commit
2020-02-13 20:51:52 +02:00
Artur
be30ca1642
Tweaks the blood type and volume, plus hopefully fixes the lag exploit.
2020-02-13 15:48:37 +02:00
Winter Flare
ac55d1d25d
Merge branch 'master' into tinytweaks-2-9-20
2020-02-13 03:34:44 -05:00
Winter Flare
f32affdb1c
Made Mugs Colorful
2020-02-13 03:26:35 -05:00
kevinz000
c790478a3d
Merge pull request #11012 from keronshb/RatvarDrink
...
Introduces the Ratvarian mixed drink, the CogChamp!
2020-02-12 23:58:14 -07:00
kevinz000
5b01691834
Merge pull request #11005 from Arturlang/Hypospray_fix
...
Moves the hypospray mode change to CTRL click
2020-02-12 23:57:50 -07:00
Artur
2bd8499b94
We shallnt want mass production.
2020-02-12 14:28:35 +02:00
Ghom
2ed19e0a5a
Merge pull request #10861 from ancientpower/far-sliding-port
...
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
Winter Flare
5549cd93f1
Merge branch 'master' into tinytweaks-2-9-20
2020-02-11 07:20:16 -05:00
Artur
ce2ab532d9
Maintainer suggestion
2020-02-11 11:23:56 +02:00
keronshb
42fda3d88b
CogChamp
...
Adds the CogChamp drink! Bloodcult gets one so why not Clock?
2020-02-10 21:18:51 -05:00
Artur
af95921155
Goddamnit
2020-02-10 15:20:22 +01:00
Ghom
c8a62e7acf
Merge pull request #10985 from r4d6/Dwarf
...
Dwarven Update
2020-02-10 12:23:23 +01:00
Ghom
3ee4f25626
Merge pull request #11001 from Arturlang/P.A.N.D.E.M.I.C_fixes
...
Pandemic Fixes
2020-02-10 12:22:40 +01:00
kevinz000
c29e0e1a1d
Merge pull request #10596 from Seris02/hijackbackup
...
Hijack Implant
2020-02-10 04:16:14 -07:00
Artur
816f94bd61
pandemic fixes
2020-02-10 10:20:57 +02:00
Ghommie
c34714cb90
Something about the in operator and spaceDMM version update.
2020-02-10 07:37:59 +01:00
Winter Flare
bb641fecf8
Sprites, Tweaks, and Snacks
...
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.
Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
2020-02-09 23:07:32 -05:00
r4d6
e4f2af2d77
compile
2020-02-09 07:34:21 -05:00
r4d6
9ba0a1b470
Code update
2020-02-09 07:21:47 -05:00
r4d6
a8403cb072
Make Dwarves heal from Plump Helmet
2020-02-08 22:40:17 -05:00
IHOPMommyLich
860c8136df
Lowers the movespeed provided by Stimulants, weakening Stimpacks and Adrenals.
2020-02-08 17:01:12 -05:00
Seris02
4ec99a38e2
merge fixes
2020-02-07 15:28:05 +08:00
Ghommie
7362b89aeb
More stuff.
2020-02-07 08:04:07 +01:00
Ghommie
0703c6eea6
First tweak to cargo reagents selling.
2020-02-06 22:34:54 +01:00
Ghom
cd14f13d0d
Merge pull request #10917 from Arturlang/Hyposprays_QOL
...
Removes the hypospray verb for toggling spray/inject mode and makes it into an Alt click proc.
2020-02-06 20:31:46 +01:00
kevinz000
542cae89d4
Merge pull request #10906 from Hatterhat/tg-48717-48726
...
husking is stupid - 5u rezadone/100u synthflesh heals husking, husking takes more burn
2020-02-06 00:42:05 -07:00
