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
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
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
Arturlang
23834ce3f5
Parent call
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-02-05 22:54:01 +02:00
Artur
5602289013
Parent call
...
Failed to get in the previous commit for some reason.
2020-02-05 20:25:04 +01:00
Artur
9951f291fd
Reviewer suggestions
2020-02-05 20:14:35 +01:00
Artur
8b5e3e6004
Removes the shitty verb
2020-02-05 14:55:47 +01:00
Seris02
d0100345fd
done hopefully
2020-02-05 17:00:38 +08:00
Seris02
6cc6aa12be
yeehaw it's done
2020-02-05 16:54:57 +08:00
Hatterhat
bad4b5cb56
huskies
2020-02-04 22:13:03 -06:00
Hatterhat
fe717597da
fuck fermichem
2020-02-04 18:35:26 -06:00
ancientpower
335c28ff25
fixes for the requested changes
2020-02-04 17:02:13 -06:00
ancientpower
a85f05a628
requested changes
2020-02-04 16:58:24 -06:00
ancientpower
0d6ffbc432
fixed it for real this time
2020-02-04 16:38:20 -06:00
ancientpower
9dd411f11b
fixes the restoration for reals
2020-02-04 16:11:12 -06:00
ancientpower
524836c2b2
restores drink flinging
2020-02-04 15:48:03 -06:00
kevinz000
275b1f73e0
Merge pull request #10849 from Ghommie/Ghommie-cit547
...
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
kevinz000
97583bd98f
Merge pull request #10853 from Ghommie/Ghommie-cit549
...
A PR about runtime errors
2020-02-04 03:20:34 -07:00
ancientpower
937f6356ab
vgstation drink sliding
2020-02-02 13:26:16 -06:00
Ghom
6f66d76680
Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
...
Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
Artur
e7ddfdd8d8
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
kevinz000
33577e0d82
Merge pull request #10813 from Ghommie/Ghommie-cit540
...
Unicode support updates from tgstation.
2020-02-02 01:47:24 -07:00
Ghommie
fedb05b3be
A PR about runtime errors
2020-02-02 05:43:38 +01:00
