916 Commits

Author SHA1 Message Date
AlManiak 00fb0f0fb2 Added most consuming procs for the collar
Added research and design for collar
2025-02-01 00:44:39 +01:00
AlManiak 6755a031e4 Initial commit
collar works with food and drinks
2025-01-31 12:15:56 +01:00
evilew 6be749e919 fixed a cake sprite, added gateway computers
- added gateway computers to all stations besides Meta
- fixed blackberry cake sprites to replace them with better ones
2025-01-24 16:16:53 +01:00
PatrickLeeJohnson aa4fbf6aac moar fixes 2025-01-19 16:50:45 +03:00
PatrickLeeJohnson a02ee487dd hope this works 2025-01-19 16:31:27 +03:00
evilew 1423402fc3 sprite tweaks - meatball 2024-12-01 14:47:28 +01:00
evilew 9d9f805d7b Merge branch 'master' into gatofication2 2024-11-21 22:11:24 +01:00
evilew 94355ba15e gato rebranding
- rebranding some more items, this time mostly the sprites
2024-11-21 04:20:54 +01:00
evilew 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
Metis b28c11d9f5 extra functionality :3 2024-11-15 01:12:29 -05:00
evilew 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
AlManiak e86c52cb2b Moved ported functionality to GS13 code when applicable 2024-10-28 16:50:08 +01:00
AlManiak 19f4c34381 Added Big Gulps
Fixed earshattering fryer sound overshadowing ding sound
2024-10-24 17:03:27 +02:00
AlManiak a90d5c8eff Added Big gulps 2024-10-24 14:27:48 +02:00
AlManiak b080beb42e Initial commit 2024-10-20 21:33:22 +02:00
Metis 77d4225990 you can now get fat! 2024-09-14 20:50:15 -04:00
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
deathride58 bbc977ee92 Merge pull request #16072 from SandPoot/mail
Adds mail to cargo
2024-04-12 20:42:29 -04:00
chel c7fe7a4274 Update drinkingglass.dm 2024-04-11 20:09:52 -03:00
SandPoot ca8ce67cd6 mail 2024-04-10 20:54:04 -03:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
deathride58 15e1858862 Merge pull request #16045 from Putnam3145/eggnog-fix
Adds non-alcoholic eggnog
2023-12-29 22:04:59 -05:00
Putnam3145 78982c2e6f typos and other such issues 2023-12-23 14:49:46 -08:00
Putnam3145 e65f386de9 Makes eggnog not alcoholic 2023-12-23 14:22:58 -08:00
SandPoot 7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
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