043950a3ee
Merge branch 'master' into trek_tmp
...
# Conflicts Resolved:
# icons/obj/clothing/uniforms.dmi
2020-04-19 09:51:21 +03:00
24370db5eb
Merge pull request #11930 from Ghommie/Ghommie-cit693
...
More ToS Compliance.
2020-04-18 19:33:10 -07:00
ab01d91971
Merge pull request #11903 from Ghommie/Ghommie-cit687
...
fix for my relatively minuscule backend refactor for holodeck.
2020-04-18 19:32:50 -07:00
5fd862e19d
Merge pull request #11860 from Trilbyspaceclone/shields!
...
Adds more shields and tweaks a few!
2020-04-18 19:32:09 -07:00
42b81fee3d
Update drink_reagents.dm
2020-04-18 21:57:36 -04:00
98081aa56b
Some mispelled filepaths.
2020-04-19 03:15:51 +02:00
6e62f7a2a3
Merge pull request #11878 from Arturlang/fixes_zipties_being_red
...
Makes zipties white again
2020-04-19 02:45:31 +02:00
39aef14924
More ToS Compliance.
2020-04-19 02:40:58 +02:00
8d8a0b0f45
Merge pull request #11899 from Ghommie/Ghommie-cit686
...
Fixing some more mistakes I did to clothing.
2020-04-19 00:24:29 +00:00
9c8f6cd00f
peeves.
2020-04-19 02:03:05 +02:00
e3fb978465
Shielded element.
2020-04-19 01:48:51 +02:00
9976fab42b
Made traitor classes rerollable, reassignable by admins
2020-04-18 14:40:41 -07:00
2654352d0c
tg surgery fixes time
2020-04-18 17:37:19 -04:00
a5b7f506f9
Update chem_dispenser.dm
2020-04-18 16:42:46 -04:00
63524b47c3
Why is ice and water so filling?
2020-04-18 16:28:51 -04:00
26facfa37a
honey changes + complie
2020-04-18 16:24:05 -04:00
54cce75679
Update food_reagents.dm
2020-04-18 16:15:40 -04:00
957e92ed8f
Update microwave.dm
2020-04-18 19:53:31 +02:00
811f65e48b
Removing troublesome and filler uplink items.
2020-04-18 19:51:09 +02:00
cc16027d1a
Nerfing the bonus reagents from upgraded microwaves.
2020-04-18 19:30:14 +02:00
59f2b66fd9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit689
2020-04-18 18:44:46 +02:00
0663a3f01c
ceiling to avoid infinity ez nutriment.
2020-04-18 18:18:22 +02:00
08b0a2460e
Comment.
2020-04-18 17:55:34 +02:00
beb34321e7
nerf to biogenerator upgrades and purge of inorganic glass bottles designs.
2020-04-18 17:53:00 +02:00
8d4a67fedc
Makes warm donk pockets cooling after 7 minutes canon again.
2020-04-18 15:40:18 +02:00
64116857cf
Merge branch 'master' into trek_tmp
2020-04-18 16:34:21 +03:00
344c8b1334
Hmm
2020-04-18 08:28:14 -04:00
bbd038bba6
Ghommies suggestion
2020-04-18 14:06:38 +03:00
f0823bc2b6
Combat looks better
2020-04-18 13:57:34 +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
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
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
c8ce60c856
Added back some vore default modes.
2020-04-17 18:46:09 -07: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
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
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
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
Anonymous