Timothy Teakettle
cd25a7c145
Merge branch 'master' into food-quality
2020-04-17 15:03:44 +01:00
Timothy Teakettle
9d312d7fef
small refactor to some stuff
...
quality_increase no longer passed to microwave_act because it's defined in obj/machinery/microwave
deepfryer code uses adjust_food_quality in a place where it didn't before
2020-04-17 13:59:48 +01:00
kevinz000
5b86c334f9
Merge pull request #11863 from Trilbyspaceclone/patch-342
...
Honey Palm can be distill into mead
2020-04-17 05:51:47 -07:00
kevinz000
7756682362
Merge pull request #11774 from Trilbyspaceclone/tools_andstuff
...
More mapping Loot tables and code improvements + Maints/Locker loot changes
2020-04-17 05:51:26 -07:00
kevinz000
09f459a369
Merge pull request #11730 from Ghommie/Ghommie-cit667
...
Minor snowflakes clothing variations refactor. Removal of copypasted states.
2020-04-17 05:49:09 -07:00
kevinz000
3c4c67b6c5
Merge pull request #11869 from necromanceranne/pawnch_updaties
...
Pawnch Update 2.5: I swear this will be the last one for a while. + some slight fixes
2020-04-17 05:43:49 -07:00
kevinz000
6a92c47d31
Merge pull request #11870 from Trilbyspaceclone/patch-343
...
Catnip is no longer a mime plant
2020-04-17 05:42:17 -07:00
kevinz000
4f02c6f3c5
Merge pull request #11875 from Ghommie/Ghommie-cit683
...
Fixing some dog tier issue.
2020-04-17 05:40:50 -07:00
kevinz000
359790f5af
Merge pull request #11876 from Citadel-Station-13/Ghommie-patch-2
...
Made light bulb/tubes actually use vis_overlays instead of overlays.
2020-04-17 05:40:32 -07:00
kevinz000
e84e6bface
Merge pull request #11857 from Trilbyspaceclone/race_drinks
...
Race drinks!
2020-04-17 05:20:53 -07:00
kevinz000
61f833b953
Merge pull request #11852 from Ghommie/Ghommie-cit681
...
Custom skin tone preferences.
2020-04-17 05:16:04 -07:00
timothyteakettle
a4cc54781f
implements isfood helper
2020-04-17 01:45:15 +01:00
Timothy Teakettle
aa6d6883e3
remove a random 'r'
2020-04-17 01:34:46 +01:00
Timothy Teakettle
f821d33f44
change clamp to CLAMP
...
requested change, and i don't plan on subtypes with different effects based on food quality
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-04-17 01:32:42 +01:00
Trilbyspaceclone
6f4a3fc179
wine to jello
2020-04-16 17:51:03 -04:00
Ghom
10bc1229f9
Merge pull request #11734 from Trilbyspaceclone/patch-329
...
Six new Sci based bounties!
2020-04-16 19:06:48 +02:00
Ghom
bceca18626
Merge pull request #11839 from Citadel-Station-13/kevinz000-patch-1
...
you can no longer knock out xenomorphs by punching them in the face i guess
2020-04-16 19:04:16 +02:00
Ghommie
2200c690f7
configs
2020-04-16 18:44:05 +02:00
Ghom
747672eb50
Update update_icons.dm
2020-04-16 16:44:07 +02:00
Ghommie
42b67d9240
PR is ready.
2020-04-16 16:33:04 +02:00
Ghommie
fe43581d31
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
2020-04-16 15:09:52 +02:00
Ghom
ad6a2b4671
Merge pull request #11851 from Citadel-Station-13/kevinz000-patch-4
...
Contractor kits are now poplocked to 30.
2020-04-16 14:46:20 +02:00
Ghom
7cacdb9db7
Merge pull request #11879 from Seris02/magboooooooooooots
...
fixes magboots
2020-04-16 14:21:58 +02:00
Seris02
c0ff018bef
fixes magboots
2020-04-16 16:23:55 +08:00
Ghom
750acd7023
Update lighting.dm
2020-04-16 05:42:08 +02:00
Ghommie
7193efa613
Fixing some doggie issues.
2020-04-16 05:29:17 +02:00
Trilbyspaceclone
93029c9596
le sigh
2020-04-15 14:48:22 -04:00
Trilbyspaceclone
742654b1d2
Update alcohol_reagents.dm
2020-04-15 10:44:51 -04:00
necromanceranne
61df831216
also makes martial artists spend stamina on disarm aaah
2020-04-15 20:07:01 +10:00
necromanceranne
d0d766efb5
Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts
2020-04-15 19:00:01 +10:00
UristMcAstronaut
ec452de0b2
Merge remote-tracking branch 'upstream/master'
2020-04-15 08:41:17 +00:00
Trilbyspaceclone
68272ac91a
Update flowers.dm
2020-04-14 23:14:10 -04:00
Trilbyspaceclone
8410d6f35f
Why are you like this coffee
2020-04-14 19:40:52 -04:00
TrilbySpaceClone
d49210fd48
Merge branch 'master' into race_drinks
2020-04-14 19:21:47 -04:00
TrilbySpaceClone
a46a6227a9
Finally done...
2020-04-14 19:11:53 -04:00
Linzolle
d43cb78b8b
one more
2020-04-14 18:02:51 -05:00
Linzolle
166370fb6c
missed one
2020-04-14 17:55:22 -05:00
Linzolle
39e6541ccd
remove bad words
2020-04-14 17:54:07 -05:00
Linzolle
f828f4c4b7
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
2020-04-14 17:33:47 -05:00
Ghommie
d84ef22f22
I'm amazed this actually works fine.
2020-04-14 21:58:37 +02:00
Lin
79f41bc654
Merge pull request #11841 from Citadel-Station-13/Ghommie-patch-4
...
Hardsuit helmet peeve.
2020-04-14 18:37:31 +00:00
Ghommie
571584901c
Custom skin tone preferences.
2020-04-14 19:10:28 +02:00
UristMcAstronaut
ec734475cc
Add files via upload
2020-04-14 16:21:30 +00:00
TrilbySpaceClone
79a72a50d4
this is annoying, why is angel not defind as a race
2020-04-14 11:13:49 -04:00
Trilbyspaceclone
5833ed8029
Merge branch 'master' into tools_andstuff
2020-04-14 10:10:32 -04:00
Ghom
49e36e47ff
Merge pull request #11809 from kevinz000/storage_rework
...
Adds baystation-style volumetric space storage support
2020-04-14 13:17:11 +02:00
Ghom
5d01e05991
Merge pull request #11618 from Arturlang/Garlic
...
Adds garlic, and tweaks bloodsuckers a bunch.
2020-04-14 12:38:34 +02:00
kevinz000
3ec71612e7
Update uplink_bundles.dm
2020-04-14 01:49:14 -07:00
kevinz000
b10c479d16
Merge pull request #11655 from Citadel-Station-13/Ghommie-patch-3
...
Gives a cooldown to the crusher's vortex talisman trophy.
2020-04-14 01:37:36 -07:00
kevinz000
7861b044ea
Merge pull request #11826 from Ghommie/Ghommie-cit675
...
Body size preferences! Oh no!
2020-04-14 01:35:46 -07:00
