383014bad3
Merge branch 'master' into trek_tmp
...
# Conflicts Resolved:
# icons/mob/clothing/uniform.dmi
# icons/mob/clothing/uniform_digi.dmi
# icons/obj/clothing/uniforms.dmi
2020-04-17 19:40:17 +03:00
7581d1d5cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit686
2020-04-17 18:37:25 +02:00
6e8f58d945
Merge pull request #11893 from Citadel-Station-13/Ghommie-patch-3
...
Once upon a time, a based guardian anchored its name to others' minds.
2020-04-17 09:36:53 -07:00
c5c75c0870
Fixing some more mistakes I did to clothing.
2020-04-17 18:32:11 +02:00
761b3907e3
Makes vore noises, enlargement opt-in
2020-04-17 09:10:08 -07:00
0f7bc55755
le sigh
2020-04-17 10:25:48 -04:00
8d4782290c
Update shields.dm
2020-04-17 10:25:20 -04:00
cd25a7c145
Merge branch 'master' into food-quality
2020-04-17 15:03:44 +01:00
eafc69aa65
Reviewer suggestion, reduces paralyze
...
And ports that commit that ghommie said
2020-04-17 16:22:15 +03:00
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
5b86c334f9
Merge pull request #11863 from Trilbyspaceclone/patch-342
...
Honey Palm can be distill into mead
2020-04-17 05:51:47 -07:00
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
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
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
6a92c47d31
Merge pull request #11870 from Trilbyspaceclone/patch-343
...
Catnip is no longer a mime plant
2020-04-17 05:42:17 -07:00
4f02c6f3c5
Merge pull request #11875 from Ghommie/Ghommie-cit683
...
Fixing some dog tier issue.
2020-04-17 05:40:50 -07:00
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
e84e6bface
Merge pull request #11857 from Trilbyspaceclone/race_drinks
...
Race drinks!
2020-04-17 05:20:53 -07:00
61f833b953
Merge pull request #11852 from Ghommie/Ghommie-cit681
...
Custom skin tone preferences.
2020-04-17 05:16:04 -07:00
dcd112c379
Hm yes maybe no ratting out would be nice
...
What it says on the tin.
2020-04-17 13:34:34 +02:00
4f6e849af4
Fixes pre-tmp trek suit on-mob icons
...
Really speaks about nobody using trek loadout, huh?
2020-04-17 14:04:47 +03:00
e30bd1f8ea
FIXES IT FINALLY OHHHH MY FUCKING GOD WHY IT WAS SO SIMPLE BUT SO HIDDEN FUCK
2020-04-17 17:17:50 +08:00
d61c0dc155
KHAAAAAAAAAAN!!
...
Adds TMP enlist, trainee and service uniforms.
Also fixes inaccurate restricted description for existing trek loadout.
2020-04-17 10:53:43 +03:00
0fb1286042
Update guardian.dm
2020-04-17 08:47:05 +02:00
121b9f0d92
Update ui.dm
2020-04-16 22:57:27 -07:00
ad8c0c2687
Update storage.dm
2020-04-16 22:55:01 -07:00
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
4a38b2870a
fix youtool
2020-04-17 01:02:52 -04:00
21f7a6032d
this
2020-04-17 00:50:42 -04:00
a4cc54781f
implements isfood helper
2020-04-17 01:45:15 +01:00
aa6d6883e3
remove a random 'r'
2020-04-17 01:34:46 +01:00
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
6f4a3fc179
wine to jello
2020-04-16 17:51:03 -04:00
e511deabcf
Merge pull request #11844 from Arturlang/crafting_fixes
...
Its no longer possible to craft multiple things at a time
2020-04-16 19:08:09 +02:00
10bc1229f9
Merge pull request #11734 from Trilbyspaceclone/patch-329
...
Six new Sci based bounties!
2020-04-16 19:06:48 +02:00
19f79f8843
Merge pull request #11611 from monster860/patch-2
...
Makes so turning in place updates riders when riding someone's back
2020-04-16 19:06:10 +02:00
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
2200c690f7
configs
2020-04-16 18:44:05 +02:00
87dd2681ca
The locate isn't necessary
2020-04-16 08:30:55 -07:00
368d801940
Makes objectives clean theirselves up properly.
2020-04-16 08:17:48 -07:00
747672eb50
Update update_icons.dm
2020-04-16 16:44:07 +02:00
42b67d9240
PR is ready.
2020-04-16 16:33:04 +02:00
b7b9fc55f5
Update preferences_savefile.dm
2020-04-16 15:54:59 +02:00
e0248d6b97
Update sanitize_values.dm
2020-04-16 15:53:15 +02:00
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
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
7cacdb9db7
Merge pull request #11879 from Seris02/magboooooooooooots
...
fixes magboots
2020-04-16 14:21:58 +02:00
c0ff018bef
fixes magboots
2020-04-16 16:23:55 +08:00
75dab9fa57
And some other fixes
2020-04-16 10:51:17 +03:00
b023a0976b
Makes zipties red again
2020-04-16 10:10:39 +03:00
Anonymous