62d1a1f734
cook now gets to choose their ingredient box + sushi ingredient box ( #11590 )
...
* Update miscellaneous.dm
* Update cook.dm
* fixes some bugs
* i broke something again and now fix it
* fixes remote, edits ingredient box contents
* even more wildcard items
who doesn't love eggs, grapes and various kinds of human meat? (skeleton meat is a thing for some reason, and thus it goes. IN THE LIST.)
* removes a random newline
* adds a newline to the end of the file i accidentally removed
* why was there a newline here too
2020-03-24 20:39:46 +01:00
82396c33cf
i made an oops ( #11591 )
2020-03-24 20:34:01 +01:00
54cdae148d
Removes uncompiled flightsuit code leftovers and bad hooks.
2020-03-24 20:28:13 +01:00
b789cd246a
frying changes with bad chems ( #11580 )
...
* Update toxin_reagents.dm
* Update snacks_bread.dm
* Update toxin_reagents.dm
2020-03-24 20:03:49 +01:00
a2b2e08e31
Fixes crafting hud icon overlapping the second pocket on 1:1 screen mode.
2020-03-24 17:53:53 +01:00
9bb7529a49
Progress
2020-03-24 16:55:46 +02:00
f8147e5a85
Ports over Mortars and Pestles ( #11546 )
...
* 2 ports for the commit of 1!
ports -[ready]ghetto grinder
#43600
ports - Mortar and Pestle Fixes #48086
Links -
https://github.com/tgstation/tgstation/pull/43600
https://github.com/tgstation/tgstation/pull/48086
* what if we didnt have that...
* Apply suggestions from code review
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-24 14:03:31 +01:00
c6a8515297
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-24 12:36:21 +02:00
fd70734eee
[Balance Pass] - Stunbaton (Because no one wants to do a single line change to make this not shit)
...
I'm putting it at 35 as Kevinz suggest, rather it be 49 but w/e.
The "Intuitive" system will be staying, but now it won't suck ass to actually be used as a stamina draining weapon.
2020-03-23 23:16:37 -05:00
d139234c6d
my smooth brain hurts
2020-03-23 16:06:40 -07:00
fa9c1dfd6c
start
2020-03-23 16:05:22 -07:00
bf0970d8c3
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-23 15:34:04 -07:00
d4c6148a11
Merge remote-tracking branch 'citadel/master' into typing_indicators
2020-03-23 15:33:22 -07:00
97ad47f3fd
Fixing an inconsistency with nuclear bombs exploding on station level space.
2020-03-23 22:40:02 +01:00
d336bcf259
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit632
2020-03-23 21:02:47 +01:00
e59e809556
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit601
2020-03-23 19:01:25 +01:00
ea7c1058b5
Merge pull request #11524 from Ghommie/Ghommie-cit627
...
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
cc80d463b7
Merge pull request #11536 from Trilbyspaceclone/patch-316
...
Water and Unholy water tweaks
2020-03-23 10:40:19 -07:00
33317e20fe
Merge pull request #11570 from zeroisthebiggay/contractorrandomitemspowergaming
...
moves sneaksuit to bundles, removes useless contractor items, adds sneaksuit to contractor pool of random items
2020-03-23 10:38:22 -07:00
3990b1f4c9
Merge pull request #11571 from Ghommie/Ghommie-cit635
...
Size preferences made configurable.
2020-03-23 10:37:54 -07:00
ddd00b1981
Merge pull request #11572 from DeltaFire15/clockies-vanguardstam
...
Clockie Vanguard Spell - rebalance for stamcombat
2020-03-23 10:37:42 -07:00
fbe77495e8
Merge pull request #11576 from Owai-Seek/strawberryjuice3-21-2020
...
Porting Juices, Drinks, and Salami [READY]
2020-03-23 10:36:44 -07:00
dfec544d71
Merge pull request #11578 from Ghommie/Ghommie-cit636
...
Fixing owner not being set in mutation/on_aquiring.
2020-03-23 10:36:17 -07:00
57429493c6
Merge pull request #11581 from Ghommie/Ghommie-cit637
...
M/F body preferences.
2020-03-23 10:34:02 -07:00
9be09df036
Merge pull request #11582 from keronshb/ReverseRNGMiningBase
...
Reverses Random Mining Base Placement
2020-03-23 10:28:14 -07:00
fd9985fb27
Made votes obfuscation settings more robust.
2020-03-23 18:12:12 +01:00
1d2264849e
meh ( #11584 )
2020-03-23 15:50:53 +01:00
f5a96241ab
sneaksuits are not fireproof ( #11573 )
...
* and i wanna die
* i decide to revert
* a a a a
2020-03-23 15:47:41 +01:00
a5224b0b8b
Merge pull request #11568 from Ghommie/Ghommie-cit634
...
Two runtimes, one fix.
2020-03-23 00:03:23 -07:00
29576ee6a7
Travis Please
2020-03-22 20:34:38 -04: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
a6ca854e5c
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-22 15:07:41 -07:00
c798b31d6f
bodyparts cache aaaaa.
2020-03-22 22:20:26 +01:00
830f646383
Revert "Merge pull request #11225 from r4d6/Random-Mining"
...
This reverts commit ea5774e713
2020-03-22 15:55:08 -04:00
9d9720ed21
QoL Vendor Reorganisation
...
Moves Bowls and Glasses to top of vendors.
2020-03-22 15:30:29 -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
76ff0d4931
M/F body preferences.
2020-03-22 19:47:48 +01:00
3c2cb76792
Fixing owner not being set in mutation/on_aquiring.
2020-03-22 15:23:05 +01:00
82cf7e584b
Update SDQL_2_wrappers.dm ( #11552 )
2020-03-22 13:40:31 +01:00
0b71b51360
Update stunbaton.dm ( #11559 )
2020-03-22 13:37:16 +01:00
71fc6bc693
Fixes bumbles resting ( #11564 )
...
* Fixes bumbles resting
* Update code/modules/mob/living/simple_animal/friendly/bumbles.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update bumbles.dm
* Update bumbles.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-22 13:12:14 +01:00
368d47aa69
Adds ghost role eligibility to various ghost roles. ( #11549 )
...
* Added ghost role eligibility to CTF, possession, random animal
* Also added possessed blade to it.
* Also removed some extraneous dead/observer things.
* ahaha whoops
2020-03-22 13:02:23 +01:00
5147536eb3
yeah whoops that should go ( #11561 )
2020-03-22 13:01:51 +01:00
ab1274c832
Massive optimization for sink objective. ( #11563 )
2020-03-22 13:01:36 +01: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
b43f7c10be
Savefiles vs admin shenanigeans...
2020-03-22 04:30:45 +01:00
ebfa9d6b84
Very tentative attempt at figuring out what's wrong.
2020-03-22 04:21:00 +01:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
46d80cd784
i forgot a comma
2020-03-21 20:18:44 -04:00
6d4433dd77
Size preferences made configurable.
2020-03-22 01:07:51 +01:00
Timothy Teakettle