3ea98d3096
Merge branch 'master' into WanderingFox95-TheUnrollingPin
2021-04-29 10:54:00 +02:00
8d8f1173ab
Adds the unflattening functionality
2021-04-26 18:44:02 +02:00
a329188f95
moves list_reagents back to where it was
...
fuck
2021-04-17 02:56:46 -04:00
ea585233a2
makes goliath meat have reagents again
...
sorry, I lost my brain cells for a second
2021-04-17 02:56:06 -04:00
c69233c731
adds ash drake meat
...
yes, it's unnecessary
no, I don't care
let me eat drakes
2021-04-17 02:52:21 -04:00
4a49f6eebe
barked on
2021-03-19 01:38:17 -04:00
3693eb1f16
Merge pull request #14374 from SandPoot/don't-litter-please
...
Makes it so you don't drop cans upon crushing them
2021-03-09 00:20:43 -07:00
de6f1401bb
final fix
2021-03-08 13:24:28 +08:00
80cb870311
upload drinks.dm
2021-03-07 21:39:10 -03:00
754c24748e
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-03-03 17:09:01 +08:00
b214d70383
Merge pull request #14268 from Citadel-Station-13/silicons-patch-16
...
alternatively, replaces the cube sentinel spawn with an actual simplemob sentinel that drops a carbon sentinel body on death so you still get to run this to the ground without being able to be a literal alien queen
2021-02-23 13:01:27 +01:00
5304029dd9
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-23 11:01:42 +08:00
e792d8d61f
Update snacks_meat.dm
2021-02-18 17:35:34 -07:00
123de14009
upload files
2021-02-18 15:05:39 -03:00
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
3f40e353aa
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-16 19:41:53 +08:00
de67720a0a
icons should exist
2021-02-14 11:39:56 +08:00
61ab2a5a53
logging fixes
2021-02-13 19:47:17 -07:00
8a0c932d55
oops! All Refactors!
2021-02-12 11:07:58 +08:00
04aaa7aeda
Merge pull request #14129 from MrJWhit/cursed-name
...
Porting a cursed name about drinking
2021-01-24 13:24:19 -06:00
6dd674dae4
Porting
2021-01-22 20:47:45 -05:00
d9f2cccd84
Hehoo maybe I should actually see what happens when I compile
2021-01-22 13:33:18 -05:00
5fe6772c58
Update microwave.dm
2021-01-22 13:23:10 -05:00
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
fba17abaf4
god damn it Trilby
2021-01-16 08:23:08 +00:00
2bf5a0e91e
Merge pull request #14008 from TheSpaghetti/patch-5
...
Removes double punctuation in the tumor bread description.
2021-01-09 15:37:19 -07:00
5e08df700f
Merge pull request #13939 from silicons/reagentlogs
...
low level reagent logging additions
2021-01-09 16:24:40 +00:00
b52e8bf447
double punctuation bad
...
no
2021-01-09 00:18:15 -05:00
a375448a54
fixes
2021-01-05 23:18:52 +00:00
535dede85b
i teleported bread
2021-01-05 22:20:41 +00:00
251bd3e06b
logging
2020-12-31 12:33:05 -08:00
fcd8d35c76
thank
2020-12-27 02:23:57 +00:00
c3e9cdd9a5
finale
2020-12-26 23:09:19 +00:00
f5b99b83f8
Fully functional
2020-12-13 02:29:29 -05:00
f7034818a4
Merge pull request #13672 from Citadel-Station-13/silicons-patch-4
...
chief sub
2020-11-18 17:50:50 -08:00
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
cbb6febfe2
Update snacks_sandwichtoast.dm
2020-11-11 13:56:18 -07:00
792080ca3f
Merge pull request #13533 from shellspeed1/jambalya-
...
Face hugger jambalaya. Should be ready.
2020-10-10 22:02:46 -07: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
2c59a5b9f8
more spelling
2020-10-06 17:36:57 -07:00
3f634743e1
spelling
2020-10-06 16:27:12 -07:00
2ffcdb4862
Soups on
2020-10-06 16:07:29 -07:00
7f028899fa
Forgot valid salid - also included ambrosia deus, white cannabis, and lime fruit
2020-09-09 22:18:17 -07:00
1b77e69fb4
Slimepeople diet changes
2020-09-09 18:11:25 -07:00
8699ce2174
fixes a bunch of broken clickdelays ( #13218 )
...
* fixes
* fix
2020-08-25 20:58:20 +02:00
c1d8d1d439
Merge pull request #13090 from lolzalolka/lean
...
Added Burek to Space
2020-08-11 01:42:58 -07:00
e8ac70696f
new food idk?
2020-08-09 18:58:32 +02:00
76293ee032
My balls are raw. Meatballs, that is. ( #13075 )
...
* Food Processor produces Raw Meatball
* No nutrition loss from slabs.
2020-08-09 16:01:52 +02:00
f20f01cc6b
Merge pull request #12853 from LetterN/TGUI-4
...
TGUI4 port
2020-08-09 05:46:21 -07:00
WanderingFox95