shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,256 Commits 5 Branches 0 Tags
3418fe154170dfce243bee7eda4912de085471b6
Commit Graph

14192 Commits

Author SHA1 Message Date
Ghom
6679d13509 Merge pull request #11939 from Owai-Seek/weight-class-4-19-20 
Reduces weight classes of several items.
 2020-04-20 23:53:07 +02:00
Ghom
0dc489e8de Merge pull request #11798 from timothyteakettle/food-quality 
adds a new feature to cooking: food quality
 2020-04-20 23:48:35 +02:00
Ghom
a40f213325 Merge pull request #11951 from Putnam3145/fix-liver-runtime 
Fixes a runtime in livers.
 2020-04-20 23:11:31 +02:00
Ghom
c7780bde9e Merge pull request #11865 from Citadel-Station-13/kevinz000-patch-5 
Shuffles resist embed higher up on the resist chain
 2020-04-20 22:34:03 +02:00
Timothy Teakettle
c5b8c45bf0 Merge branch 'master' into food-quality 2020-04-20 19:53:39 +01:00
kevinz000
a984fc5e3d Update living.dm 2020-04-20 11:45:22 -07:00
kevinz000
096a182a84 Update living.dm 2020-04-20 11:44:59 -07:00
kevinz000
62418d3fb8 Merge pull request #11909 from Putnam3145/owai-broom-mop 
Adds more service stuff to lathes.
 2020-04-20 11:43:30 -07:00
kevinz000
893f57cb63 Merge pull request #11919 from Ghommie/Ghommie-cit690 
Nerfing the bonus reagents from higher tier microwaves.
 2020-04-20 11:34:53 -07:00
kevinz000
33cfb9a566 Merge pull request #11920 from Ghommie/Ghommie-cit691 
Removing troublesome and filler uplink items.
 2020-04-20 11:34:44 -07:00
Putnam
5df4287c8d Fixes a runtime in livers. 2020-04-20 11:10:43 -07:00
Ghom
af620582b1 Merge pull request #11924 from Trilbyspaceclone/patch-346 
Moves barkeeps cryo fluid to emag only in the Soda Dispender
 2020-04-20 19:35:31 +02:00
Ghom
2cf8dad8ae Merge pull request #11928 from Putnam3145/traitor-class-reroll 
Made traitor classes rerollable, reassignable by admins
 2020-04-20 02:30:33 +02:00
Ghom
850c08cb0e Merge pull request #11894 from NopemanMcHalt/trek_tmp 
Adds not-so-great TMP-era trek utility uniform, also fixes loadout restriction descs
 2020-04-20 02:21:24 +02:00
kevinz000
ae27bf90e4 Merge pull request #11846 from Putnam3145/vore-optimization 
Optimizing vore + commenting out simplemob vore (sorry)
 2020-04-19 16:45:44 -07:00
Winter Flare
8e3f48a761 Reduces (or gives) weight classes to several items. 2020-04-19 17:13:19 -04:00
Lin
d75e3f79bd Merge pull request #11917 from Ghommie/Ghommie-cit688 
Makes warm donk pockets cooling after 7 minutes canon again.
 2020-04-19 16:52:33 +00:00
Anonymous
043950a3ee Merge branch 'master' into trek_tmp 
# Conflicts Resolved:
#	icons/obj/clothing/uniforms.dmi
 2020-04-19 09:51:21 +03:00
kevinz000
24370db5eb Merge pull request #11930 from Ghommie/Ghommie-cit693 
More ToS Compliance.
 2020-04-18 19:33:10 -07:00
kevinz000
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
kevinz000
5fd862e19d Merge pull request #11860 from Trilbyspaceclone/shields! 
Adds more shields and tweaks a few!
 2020-04-18 19:32:09 -07:00
Ghom
6e62f7a2a3 Merge pull request #11878 from Arturlang/fixes_zipties_being_red 
Makes zipties white again
 2020-04-19 02:45:31 +02:00
Ghommie
39aef14924 More ToS Compliance. 2020-04-19 02:40:58 +02:00
Lin
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
Putnam
9976fab42b Made traitor classes rerollable, reassignable by admins 2020-04-18 14:40:41 -07:00
kappa-sama
2654352d0c tg surgery fixes time 2020-04-18 17:37:19 -04:00
Trilbyspaceclone
a5b7f506f9 Update chem_dispenser.dm 2020-04-18 16:42:46 -04:00
Ghom
957e92ed8f Update microwave.dm 2020-04-18 19:53:31 +02:00
Ghommie
811f65e48b Removing troublesome and filler uplink items. 2020-04-18 19:51:09 +02:00
Ghommie
cc16027d1a Nerfing the bonus reagents from upgraded microwaves. 2020-04-18 19:30:14 +02:00
Ghommie
8d4a67fedc Makes warm donk pockets cooling after 7 minutes canon again. 2020-04-18 15:40:18 +02:00
Anonymous
64116857cf Merge branch 'master' into trek_tmp 2020-04-18 16:34:21 +03:00
Artur
bbd038bba6 Ghommies suggestion 2020-04-18 14:06:38 +03:00
Putnam
14a5985891 Adds more service stuff to lathes. 2020-04-17 23:00:05 -07:00
Ghom
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
Putnam
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
Putnam
c8ce60c856 Added back some vore default modes. 2020-04-17 18:46:09 -07:00
Ghommie
523672b6a5 fix for my relatively minuscule backend refactor for holodeck. 2020-04-18 02:32:10 +02:00
Ghom
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
Trilbyspaceclone
7756a80beb Merge branch 'master' into shields! 2020-04-17 19:32:39 -04:00
Lin
7cc7d6884a Merge pull request #11820 from kevinz000/shield_bashing 
Shield bashing
 2020-04-17 20:45:40 +00:00
Ghom
6a0af190ea I'm a bit busy handling multiple issues. 2020-04-17 20:47:02 +02:00
Ghom
be0409a94a Update toggles.dm 2020-04-17 19:58:57 +02:00
Anonymous
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
Ghommie
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
Putnam3145
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
Ghommie
c5c75c0870 Fixing some more mistakes I did to clothing. 2020-04-17 18:32:11 +02:00
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