Winter Flare
dc6d1fb359
Sorted Frozen Foods
2020-02-17 05:56:02 -05:00
Winter Flare
c97111beda
Reorganise Food + Balance Tweaks
...
-Reorganised -ALL- foods in the crafting menu.
-Made a section for Eastern Dishes, Mexican Dishes, and Sweets
-Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized.
-Moved Easter Recipies to the food files, fixing it in the process.
-Capitalised a few things.
2020-02-17 05:32:03 -05:00
Cameron!
78fad64d56
this is no longer necessary
2020-02-16 15:54:41 -08:00
Cameron!
a4a5efbc11
ghommble's other changes
2020-02-16 15:48:22 -08:00
kevinz000
262b4d95fb
Update projectile.dm
2020-02-16 16:44:29 -07:00
Cameron!
3ecd1b75d4
ghommald's changes
2020-02-16 15:32:05 -08:00
Trilbyspaceclone
c5eaac62bd
Update materials.dm
2020-02-16 18:26:22 -05:00
Trilbyspaceclone
0315802330
Update armory.dm
2020-02-16 18:25:54 -05:00
Ghommie
aba636a44c
ok
2020-02-17 00:13:16 +01:00
Lin
794aeb81c2
Merge pull request #11060 from kevinz000/stuff
...
guns and cult blood magic now respect stamina softcrit
2020-02-16 13:20:56 -06:00
Trilbyspaceclone
0f7618b348
Update organic.dm
2020-02-16 14:07:00 -05:00
Lin
a37e1ab129
Merge pull request #11093 from Ghommie/Ghommie-cit580
...
Something about blood and species handle_chemicals()
2020-02-16 12:36:41 -06:00
Ghommie
1a0fba8a2a
Something about consistency and magnetic rifles.
2020-02-16 18:37:51 +01:00
Unknown
c0295156ff
Adds synthmeat reaction
2020-02-16 11:42:30 -05:00
Unknown
3286f43d90
Didnt know I could make it a subtype
2020-02-16 11:17:54 -05:00
Ghommie
23ae9996d2
Something more about runtime errors.
2020-02-16 15:24:15 +01:00
Unknown
313f544aee
Make it require some heating
2020-02-16 08:34:08 -05:00
Unknown
38f32d28b7
Mixable Synthblood
2020-02-16 08:06:22 -05:00
Unknown
f4734e44f0
o ye this should be something else
2020-02-16 07:52:34 -05:00
Unknown
f0b3021f5d
I miss my powergame
2020-02-16 07:41:26 -05:00
CameronWoof
206e546254
reordering these designs
2020-02-16 04:15:50 -08:00
kevinz000
379c914099
Merge pull request #10704 from Ghommie/Ghommie-cit529
...
More Runtimenator fixes.
2020-02-16 05:10:19 -07:00
CameronWoof
14e41e8d68
adds diethylamine and saltpetre to the biogenerator
2020-02-16 03:52:07 -08:00
necromanceranne
5c2e244ee0
Ports /tg/ pr #44529 , reverts #9092
2020-02-16 22:20:50 +11:00
Ghommie
1d9982d00a
Virology support for synthetic blood and some blood subtypes removal.
2020-02-16 10:36:16 +01:00
Trilbyspaceclone
3fde58434f
Merge branch 'master' into more_implants
2020-02-16 01:55:19 -05:00
Trilbyspaceclone
21e2a0892d
Update meat.dm ( #11028 )
2020-02-16 07:46:45 +01:00
Trilbyspaceclone
a8d45f8361
Update crab.dm ( #11105 )
2020-02-16 07:39:56 +01:00
kevinz000
14fdd90618
Nerfs public autolathes ( #10970 )
2020-02-16 07:37:24 +01:00
kevinz000
a5f06430e4
repulse armor sanity ( #10949 )
2020-02-16 07:36:50 +01:00
Seris02
c95bb9f8db
FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES hallucination ( #10857 )
...
* FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES????
* fix
* no more getflaticon dabdabdabdabdabdabdab
* tada
2020-02-16 07:31:30 +01:00
Ghom
abf7d2423a
Update death.dm
2020-02-16 07:17:53 +01:00
Persi
18feba7fdd
Defusal kits are now emag only and don't require a drop pod console.
2020-02-16 00:14:15 -05:00
Persi
23a9b9b438
Master got fixed while I was at work!
2020-02-16 00:07:24 -05:00
TrilbySpaceClone
cba6667332
it could work
2020-02-15 18:42:50 -05:00
keronshb
3b9f9d7a16
Requested changes
...
Requested changes
2020-02-15 18:15:41 -05:00
Trilbyspaceclone
470e786765
Update expressconsole.dm
2020-02-15 15:59:09 -05:00
kevinz000
36cebc733c
Merge pull request #11039 from Ghommie/Ghommie-cit572
...
Something about a couple runtimes.
2020-02-15 12:19:50 -07:00
kevinz000
7ee04aa608
Merge pull request #10998 from Ghommie/Ghommie-cit569
...
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
Persi
0c9244f669
Clarifies comments and locks defusal kits behind an emag
2020-02-15 14:17:22 -05:00
kevinz000
ee9b38017e
Merge pull request #10995 from Ghommie/Ghommie-cit568
...
Something about cryopods.
2020-02-15 12:17:02 -07:00
kevinz000
f79148d549
Merge pull request #10947 from Ghommie/Ghommie-cit563
...
Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -07:00
kevinz000
b9e8be5784
Merge pull request #10940 from Ghommie/Ghommie-cit560
...
First tweak to cargo reagents selling.
2020-02-15 12:15:50 -07:00
kevinz000
fc5eeeac00
Update gun.dm
2020-02-15 12:14:51 -07:00
kevinz000
eb33901046
Merge pull request #11002 from BlackMajor/walkerbois
...
Makes the Ash Walker camp a static spawn in lavaland.
2020-02-15 11:47:58 -07:00
kevinz000
e250fb0a57
Merge pull request #11071 from Citadel-Station-13/Ghommie-patch-1
...
Something about disposal bins and trash bags.
2020-02-15 11:46:56 -07:00
kevinz000
6e2e7e29d1
Merge pull request #11072 from Ghommie/Ghommie-cit576
...
Doubled halved flavor text max length and removed crappy code.
2020-02-15 11:46:00 -07:00
kevinz000
29c422a2e6
Merge pull request #11073 from Ghommie/Ghommie-cit577
...
Reduced tongue organ damage and tasting pH message spam.
2020-02-15 11:45:50 -07:00
kevinz000
24b977f655
Merge branch 'master' into stuff
2020-02-15 11:45:25 -07:00
kevinz000
fa015c93bf
Merge pull request #11047 from Trilbyspaceclone/patch-282
...
Buffs oats and makes meatwheat have rarity
2020-02-15 11:44:52 -07:00