Commit Graph

888 Commits

Author SHA1 Message Date
Hatterhat
35b8108edb brain freeze head cheese 2022-10-10 21:44:25 -05:00
Putnam3145
b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Cognition
70dbad7055 Tea dispensing fix 2022-07-22 12:19:54 -06:00
deathride58
d2f8f34857 nerfs cooldown down to 3 seconds for the sake of not feeling entirely awful to use 2022-05-28 11:21:14 -04:00
deathride58
9bd070b1a7 cooldown defines! 2022-05-28 00:01:37 -04:00
deathride58
6a17a044c4 rate limits pizza to prevent an edge case exploit 2022-05-27 23:48:04 -04:00
Putnam3145
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
SandPoot
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
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145
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
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
Putnam3145
629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
LetterN
1fc778f70a soundloop fix. also it gets deleted (woo) 2021-10-30 13:16:31 +08:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
silicons
47568e50bf Merge pull request #15062 from zeroisthebiggay/patch-18
bread is no longer equipped on the head; instead you actually hold it in your mouth
2021-09-12 21:10:50 -07:00
Timothy Teakettle
ccebece42e icecream 2021-09-08 18:18:27 +01:00
zeroisthebiggay
f2becdcf8a Update snacks_bread.dm 2021-09-02 02:14:14 -04:00
WanderingFox95
34422662b1 Nerfed the Capacities. 2021-08-18 21:00:56 +02:00
WanderingFox95
4691397d03 Adds UNIQUE_RENAME to the bottles.
Thanks Teak!
2021-08-17 16:41:27 +02:00
WanderingFox95
95b63a823b Bottles! 2021-08-17 14:21:11 +02:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
Putnam3145
f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -07:00
silicons
b188a6ea0f why 2021-06-11 16:15:31 -07:00
DrPainis
7dab80cbb7 fuck 2021-05-23 23:42:16 -04:00
DrPainis
51911e1f27 adds the recipe for goliath calamari 2021-05-23 23:36:11 -04:00
DrPainis
a7add64905 adds a lazily made sprite for goliath calamari
I suck at spriting so this is the best I could do.
2021-05-23 23:29:25 -04:00
DrPainis
ce1b170b46 adds goliath calamari 2021-05-23 23:27:48 -04:00
silicons
898d1d2c7f Merge pull request #14731 from WanderingFox95/WanderingFox95-Efink
The E-Fink (Yes, really)
2021-05-18 17:08:58 -06:00
silicons
58df45ee3f Merge pull request #14727 from zeroisthebiggay/patch-10
more drink mixture flavortext
2021-05-18 16:44:35 -06:00
WanderingFox95
57d22c6962 Typo 2021-05-17 12:36:12 +02:00
WanderingFox95
a947ec1322 Recipes 2021-05-17 12:30:01 +02:00
zeroisthebiggay
a0b83950ae Update drinks_recipes.dm 2021-05-15 12:03:04 -04:00
zeroisthebiggay
03c2f752fa Update drinks_recipes.dm 2021-05-15 11:51:43 -04:00
zeroisthebiggay
2bc5edede0 Update drinks_recipes.dm 2021-05-15 09:51:48 -04:00
zeroisthebiggay
8166167a45 Update drinks_recipes.dm 2021-05-15 09:44:21 -04:00
zeroisthebiggay
1ff27aa732 Update drinks_recipes.dm 2021-05-15 09:43:55 -04:00
zeroisthebiggay
90f9c3cb79 Update drinks_recipes.dm 2021-05-15 09:39:56 -04:00
zerothebigboy
37873d6750 gommit 2021-05-15 08:52:24 -04:00
silicons
625488891e Merge pull request #14650 from WanderingFox95/WanderingFox95-LavalandWine
Lavaland Wine: Pinot Mort (Ready)
2021-05-12 04:43:11 -06:00
WanderingFox95
25fc57cbef Merge branch 'master' into WanderingFox95-LavalandWine 2021-04-29 10:54:18 +02:00
WanderingFox95
3ea98d3096 Merge branch 'master' into WanderingFox95-TheUnrollingPin 2021-04-29 10:54:00 +02:00
WanderingFox95
8d8f1173ab Adds the unflattening functionality 2021-04-26 18:44:02 +02:00
WanderingFox95
b8292f7f56 Small adjustment to quantity
Oops, it only made 3 instead of 4
2021-04-21 15:15:07 +02:00
WanderingFox95
57938e7b15 Adds the Recipe
2 Ash
1 Lizard Wine
1 Vitrium Froth
2021-04-20 19:36:30 +02:00