6dd674dae4
Porting
2021-01-22 20:47:45 -05:00
fba17abaf4
god damn it Trilby
2021-01-16 08:23:08 +00:00
251bd3e06b
logging
2020-12-31 12:33:05 -08:00
385bd57940
reworks family heirlooms, adds heirlooms that can be based off your species ( #13444 )
...
* corgi tracker
* better heirloom system
* typo
2020-10-10 12:15:39 +02:00
f2e4b7eacc
grammer
2020-08-04 10:07:04 -04:00
0f29235e6a
Tea Party
2020-08-04 09:15:44 -04:00
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
2f11fb6a8b
ok
2020-07-21 11:59:39 -07:00
184e3992f3
fixes
2020-07-21 11:56:23 -07:00
76b5557e1e
bunch of grammar corrections
2020-06-27 02:12:44 +01:00
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
beb34321e7
nerf to biogenerator upgrades and purge of inorganic glass bottles designs.
2020-04-18 17:53:00 +02:00
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
0effeb6ed5
Ports Hyper Drinks
...
Ports Drinks from Hyper
https://github.com/quotefox/Hyper-Station-13/pull/121
https://github.com/quotefox/Hyper-Station-13/pull/192
2020-03-22 19:33:50 -04:00
cd3f8f5df5
Porting More Stuff
...
Ports Moana Lou
https://github.com/tgstation/tgstation/pull/46539
Ports Moscow Mule, Sol Dry
https://github.com/tgstation/tgstation/pull/48466
Ports Hivemind Eraser
https://github.com/tgstation/tgstation/pull/49325
2020-03-22 15:13:00 -04:00
5c3037b5d0
Fixed Several Foods, Strawberry Juice
...
Add Strawberry Juice
Port Salami
https://github.com/tgstation/tgstation/pull/48817
https://github.com/tgstation/tgstation/pull/49228
Ports some TG Drinks
https://github.com/tgstation/tgstation/pull/48783
Made lizards like:
Egg Wrap
Tweaked Soda Dispenser
Moved Egg Wraps
Tweaked Strawberry Tea and Strawberry Milk recipies.
2020-03-22 00:19:28 -04:00
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07:00
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
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
ac55d1d25d
Merge branch 'master' into tinytweaks-2-9-20
2020-02-13 03:34:44 -05:00
f32affdb1c
Made Mugs Colorful
2020-02-13 03:26:35 -05:00
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
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
0703c6eea6
First tweak to cargo reagents selling.
2020-02-06 22:34:54 +01:00
dd521ef009
i swear it compiled locally
2020-02-04 17:18:13 -06:00
5fb82a2e6b
fixes for the requested changes' fixes
2020-02-04 17:10:02 -06:00
335c28ff25
fixes for the requested changes
2020-02-04 17:02:13 -06:00
a85f05a628
requested changes
2020-02-04 16:58:24 -06:00
0d6ffbc432
fixed it for real this time
2020-02-04 16:38:20 -06:00
6342116168
forgot to remove this bit
2020-02-04 16:13:28 -06:00
9dd411f11b
fixes the restoration for reals
2020-02-04 16:11:12 -06:00
524836c2b2
restores drink flinging
2020-02-04 15:48:03 -06:00
937f6356ab
vgstation drink sliding
2020-02-02 13:26:16 -06:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
f85527ab4b
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 16:18:12 -07:00
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
7378d91684
([\W\.])Knockdown\(
2020-01-06 03:39:20 -08:00
592422ee70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-05 22:53:00 +01:00
ca8d93ad17
Merge branch 'master' into alcohol-intolerance
2020-01-04 23:17:55 +01:00
37441437d1
a
2019-12-28 23:02:28 +01:00
b4c0433d6d
more work.
2019-12-27 17:45:19 +01:00
57cecd2499
work
2019-12-25 06:54:44 +01:00
53d142b4c0
more work.
2019-12-25 01:34:33 +01:00
d571bbd292
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-24 00:07:32 +01:00
d88f50ac15
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-23 05:02:31 +01:00
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
MrJWhit