bd03d2a362
Merge pull request #11908 from Putnam3145/fix-tactical-destroy
...
Makes tactical component destroy() work properly.
2020-04-18 13:32:49 +02:00
6d50b5daf0
Merge pull request #11887 from Citadel-Station-13/kevinz000-patch-1
...
storage boxes now have clickdrag passthrough
2020-04-18 13:28:38 +02:00
9b981d0749
Merge pull request #11888 from Citadel-Station-13/kevinz000-patch-9
...
fixes closer extending too many rows up
2020-04-18 13:28:34 +02:00
bbd038bba6
Ghommies suggestion
2020-04-18 14:06:38 +03:00
f0823bc2b6
Combat looks better
2020-04-18 13:57:34 +03:00
edb7b1d61c
Fixes catstuffs
2020-04-18 13:52:27 +03:00
85c5548d1a
Ports https://github.com/tgstation/tgstation/pull/50521/
2020-04-18 13:49:06 +03:00
cc82f08ebc
weh
2020-04-18 18:28:35 +08:00
14a5985891
Adds more service stuff to lathes.
2020-04-17 23:00:05 -07:00
d361a8d6ae
Makes tactical destroy() work properly.
2020-04-17 22:33:11 -07:00
50ee5b9de5
Merge pull request #11885 from kappa-sama/patch-21
...
ports "Makes visible(based on sight) messages always appear to mobs in range of 1 despite in darkness"
2020-04-18 05:44:53 +02:00
d26ba86660
Update shields.dm
2020-04-17 23:30:58 -04:00
33039f9962
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization
2020-04-17 18:56:26 -07:00
2659459233
web-editor played me a good prank.
2020-04-18 03:48:57 +02:00
9c4d10a19c
Update code/datums/radiation_wave.dm
2020-04-18 03:48:03 +02:00
c8ce60c856
Added back some vore default modes.
2020-04-17 18:46:09 -07:00
96b64009d0
Oh, nullspace.
2020-04-18 03:44:49 +02:00
3188ef3475
Whops
2020-04-18 03:32:54 +02:00
cf505f900a
Update atoms.dm
2020-04-18 03:29:45 +02:00
cbc02a8f0b
fixes a divide-by-zero whoops
2020-04-17 18:28:15 -07:00
ac662a46c1
Extra support for bussed/lateloaded holodeck maps.
2020-04-18 03:15:05 +02:00
2676d663d6
Revert "Makes so turning in place updates riders when riding someone's back"
2020-04-18 03:09:49 +02:00
523672b6a5
fix for my relatively minuscule backend refactor for holodeck.
2020-04-18 02:32:10 +02:00
6da088f4ea
Merge pull request #11871 from kappa-sama/patch-20
...
minor nerf to aranesp's stamina regen
2020-04-18 02:07:28 +02:00
7756a80beb
Merge branch 'master' into shields!
2020-04-17 19:32:39 -04:00
7a47debe9e
Merge branch 'master' into Ghommie-patch-1
2020-04-18 01:27:00 +02:00
86d531890f
Merge pull request #11882 from Putnam3145/fix-deleting-objectives
...
Makes objectives clean theirselves up properly
2020-04-18 01:20:02 +02:00
7cc7d6884a
Merge pull request #11820 from kevinz000/shield_bashing
...
Shield bashing
2020-04-17 20:45:40 +00:00
87a6bd013c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-17 21:57:21 +02:00
3dab97b62f
I set amount instead of max_amount to INFINITY, that's why it hanged.
2020-04-17 21:52:08 +02:00
1608bd2548
Update shields.dm
2020-04-17 11:57:18 -07:00
6a0af190ea
I'm a bit busy handling multiple issues.
2020-04-17 20:47:02 +02:00
be0409a94a
Update toggles.dm
2020-04-17 19:58:57 +02:00
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
Ghom