shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,577 Commits 5 Branches 0 Tags
231fd0edea87fbc115714df98ccbb3832e19f4e7
Commit Graph

14372 Commits

Author SHA1 Message Date
Seris02
cc82f08ebc weh 2020-04-18 18:28:35 +08: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
Ghom
7a47debe9e Merge branch 'master' into Ghommie-patch-1 2020-04-18 01:27:00 +02: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
Artur
eafc69aa65 Reviewer suggestion, reduces paralyze 
And ports that commit that ghommie said
 2020-04-17 16:22:15 +03: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
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
timothyteakettle
a4cc54781f implements isfood helper 2020-04-17 01:45:15 +01:00
Timothy Teakettle
aa6d6883e3 remove a random 'r' 2020-04-17 01:34:46 +01:00
Timothy Teakettle
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
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
Ghom
b7b9fc55f5 Update preferences_savefile.dm 2020-04-16 15:54:59 +02:00
Ghommie
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
Ghom
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
Ghom
7cacdb9db7 Merge pull request #11879 from Seris02/magboooooooooooots 
fixes magboots
 2020-04-16 14:21:58 +02:00
Seris02
c0ff018bef fixes magboots 2020-04-16 16:23:55 +08:00
Artur
75dab9fa57 And some other fixes 2020-04-16 10:51:17 +03:00
Ghom
750acd7023 Update lighting.dm 2020-04-16 05:42:08 +02:00
Ghommie
7193efa613 Fixing some doggie issues. 2020-04-16 05:29:17 +02:00
kevinz000
e533103ed2 Merge branch 'master' into shield_bashing 2020-04-15 19:34:08 -07:00