shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,204 Commits 5 Branches 0 Tags
9df0982da39b564b2397d2c90bb9e96e287d4586
Commit Graph

14155 Commits

Author SHA1 Message Date
Ghom
4cf80cb277 Update preferences_savefile.dm 2020-04-20 17:56:48 +02:00
Ghom
e870830a72 Update preferences.dm 2020-04-20 17:52:10 +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
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
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
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
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
Anonymous
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
Anonymous
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
Ghom
0fb1286042 Update guardian.dm 2020-04-17 08:47:05 +02:00
kappa-sama
21f7a6032d this 2020-04-17 00:50:42 -04: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