00fb0f0fb2
Added most consuming procs for the collar
...
Added research and design for collar
2025-02-01 00:44:39 +01:00
6755a031e4
Initial commit
...
collar works with food and drinks
2025-01-31 12:15:56 +01:00
10ef9e374a
Nanotrasen to GATO - comments
...
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
edea3ae8e0
nanotrasen to gato
...
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01:00
e86c52cb2b
Moved ported functionality to GS13 code when applicable
2024-10-28 16:50:08 +01:00
19f4c34381
Added Big Gulps
...
Fixed earshattering fryer sound overshadowing ding sound
2024-10-24 17:03:27 +02:00
a90d5c8eff
Added Big gulps
2024-10-24 14:27:48 +02:00
b080beb42e
Initial commit
2024-10-20 21:33:22 +02:00
c7fe7a4274
Update drinkingglass.dm
2024-04-11 20:09:52 -03:00
676cb864b1
missed proc refs
2024-03-12 22:17:30 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
33889870c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-05-17 13:22:40 -07:00
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
6199aa4d60
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-03-30 12:35:12 -07:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
186b552103
merge
2021-10-29 21:50:58 -07:00
34422662b1
Nerfed the Capacities.
2021-08-18 21:00:56 +02:00
4691397d03
Adds UNIQUE_RENAME to the bottles.
...
Thanks Teak!
2021-08-17 16:41:27 +02:00
95b63a823b
Bottles!
2021-08-17 14:21:11 +02:00
37873d6750
gommit
2021-05-15 08:52:24 -04:00
80cb870311
upload drinks.dm
2021-03-07 21:39:10 -03:00
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
AlManiak