shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • b7b9fc55f5 Update preferences_savefile.dm Ghom 2020-04-16 15:54:59 +02:00
  • e0248d6b97 Update sanitize_values.dm Ghom 2020-04-16 15:53:15 +02:00
  • fe43581d31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 Ghommie 2020-04-16 15:09:52 +02:00
  • c7b4715cff Automatic changelog generation for PR #11851 [ci skip] CitadelStationBot 2020-04-16 07:46:23 -05:00
  • ad6a2b4671 Merge pull request #11851 from Citadel-Station-13/kevinz000-patch-4 Ghom 2020-04-16 14:46:20 +02:00
  • 19108dc24c Automatic changelog generation for PR #11879 [ci skip] CitadelStationBot 2020-04-16 07:22:02 -05:00
  • 7cacdb9db7 Merge pull request #11879 from Seris02/magboooooooooooots Ghom 2020-04-16 14:21:58 +02:00
  • 9d6f013bde Makes Xenohybrids scream Xeno Anonymous 2020-04-16 14:23:16 +03:00
  • c0ff018bef fixes magboots Seris02 2020-04-16 16:23:55 +08:00
  • ab9c04ceb9 Automatic changelog generation for PR #11853 [ci skip] CitadelStationBot 2020-04-16 03:14:03 -05:00
  • 3dd395e95a Merge pull request #11853 from UristMcAstronaut/master kevinz000 2020-04-16 01:13:58 -07:00
  • 75dab9fa57 And some other fixes Artur 2020-04-16 10:51:17 +03:00
  • b023a0976b Makes zipties red again Artur 2020-04-16 10:10:39 +03:00
  • c7f7012eb2 adds more grounding rods (due to reported tesla issues), fixes emitter wire Detective Google 2020-04-16 01:03:12 -05:00
  • 6f82440107 fixes a bunch of junk Detective Google 2020-04-15 23:22:39 -05:00
  • 750acd7023 Update lighting.dm Ghom 2020-04-16 05:42:08 +02:00
  • 7193efa613 Fixing some doggie issues. Ghommie 2020-04-16 05:29:17 +02:00
  • e533103ed2 Merge branch 'master' into shield_bashing kevinz000 2020-04-15 19:34:08 -07:00
  • e588b504c1 work. Ghommie 2020-04-16 04:09:20 +02:00
  • 3533ceb4ed I'm tired. Ghommie 2020-04-16 03:55:53 +02:00
  • 586966ea51 General refactor for some snowflake bodyparts procs and taurs. Ghommie 2020-04-16 03:37:52 +02:00
  • fd4e895dd0 Automatic changelog compile [ci skip] Changelogs 2020-04-16 00:11:17 +00:00
  • a41b5d7fac better description kappa-sama 2020-04-15 15:41:30 -04:00
  • fc24574b52 minor nerfies kappa-sama 2020-04-15 15:37:57 -04:00
  • 93029c9596 le sigh Trilbyspaceclone 2020-04-15 14:48:22 -04:00
  • 742654b1d2 Update alcohol_reagents.dm Trilbyspaceclone 2020-04-15 10:44:51 -04:00
  • 61df831216 also makes martial artists spend stamina on disarm aaah necromanceranne 2020-04-15 20:07:01 +10:00
  • 4d1abaad3a fecc necromanceranne 2020-04-15 19:59:55 +10:00
  • 80ce9b70af hecc necromanceranne 2020-04-15 19:48:18 +10:00
  • b6672e8df4 yes Seris02 2020-04-15 17:44:39 +08:00
  • ddcfcb5cd8 Conflicts sure are !!FUN!! Artur 2020-04-15 12:33:59 +03:00
  • 2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge Artur 2020-04-15 12:19:37 +03:00
  • aecbce222a Comment because why the heck not Artur 2020-04-15 12:12:06 +03:00
  • 375c62175f Finishing touches, fixes icons Artur 2020-04-15 12:04:25 +03:00
  • d0d766efb5 Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts necromanceranne 2020-04-15 19:00:01 +10:00
  • ec452de0b2 Merge remote-tracking branch 'upstream/master' UristMcAstronaut 2020-04-15 08:41:17 +00:00
  • b69c0944c9 Update human.dm kevinz000 2020-04-14 21:54:23 -07:00
  • 20c3c648ce Update living.dm kevinz000 2020-04-14 21:50:39 -07:00
  • 68272ac91a Update flowers.dm Trilbyspaceclone 2020-04-14 23:14:10 -04:00
  • 3b79d6085b WHOOPS GOTTA UPDATE SAVEFILE VERSION Putnam 2020-04-14 20:10:32 -07:00
  • 8fed6552cd last fixes TrilbySpaceClone 2020-04-14 22:44:47 -04:00
  • 4419dc13f5 changes and additons TrilbySpaceClone 2020-04-14 22:17:53 -04:00
  • 988cec57b1 Automatic changelog compile [ci skip] Changelogs 2020-04-15 00:12:14 +00:00
  • db1ecff52f Merge pull request #11858 from Linzolle/tos-compliance Ghom 2020-04-15 02:10:59 +02:00
  • 3def6b861f Update drink_events.dm Trilbyspaceclone 2020-04-14 20:04:18 -04:00
  • 8410d6f35f Why are you like this coffee Trilbyspaceclone 2020-04-14 19:40:52 -04:00
  • c4f951b80b Tho it IS ment to be 6 not 10 Trilbyspaceclone 2020-04-14 19:35:23 -04:00
  • 2cbd6d20ea come on Linzolle 2020-04-14 18:28:11 -05:00
  • 299d37c64a huh TrilbySpaceClone 2020-04-14 19:24:41 -04:00
  • d49210fd48 Merge branch 'master' into race_drinks TrilbySpaceClone 2020-04-14 19:21:47 -04:00
  • a46a6227a9 Finally done... TrilbySpaceClone 2020-04-14 19:11:53 -04:00
  • a9db63ded7 Merge pull request #11856 from Linzolle/tos-compliance Putnam3145 2020-04-14 16:07:08 -07:00
  • d43cb78b8b one more Linzolle 2020-04-14 18:02:51 -05:00
  • de476249c7 Automatic changelog generation for PR #11799 [ci skip] CitadelStationBot 2020-04-14 18:02:45 -05:00
  • 7ddd44da22 Automatic changelog generation for PR #11855 [ci skip] CitadelStationBot 2020-04-14 18:02:39 -05:00
  • da54b844d0 Merge pull request #11855 from Linzolle/tos-compliance Ghom 2020-04-15 01:02:36 +02:00
  • 166370fb6c missed one Linzolle 2020-04-14 17:55:22 -05:00
  • 39e6541ccd remove bad words Linzolle 2020-04-14 17:54:07 -05:00
  • f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance Linzolle 2020-04-14 17:33:47 -05:00
  • d84ef22f22 I'm amazed this actually works fine. Ghommie 2020-04-14 21:58:37 +02:00
  • 6c977f347d Update game_options.dm Ghom 2020-04-14 20:40:59 +02:00
  • 79f41bc654 Merge pull request #11841 from Citadel-Station-13/Ghommie-patch-4 Lin 2020-04-14 18:37:31 +00:00
  • c774f18758 . Ghommie 2020-04-14 19:18:08 +02:00
  • 4703af111d actually let's just delete this file Putnam 2020-04-14 10:12:17 -07:00
  • 571584901c Custom skin tone preferences. Ghommie 2020-04-14 19:10:28 +02:00
  • b6bbe1738e Add files via upload UristMcAstronaut 2020-04-14 16:57:34 +00:00
  • 1eafcbeb1e Add files via upload UristMcAstronaut 2020-04-14 16:22:16 +00:00
  • ec734475cc Add files via upload UristMcAstronaut 2020-04-14 16:21:30 +00:00
  • c7b174676b Add files via upload UristMcAstronaut 2020-04-14 16:15:31 +00:00
  • 54ac62bf46 Merge pull request #5 from Citadel-Station-13/master UristMcAstronaut 2020-04-14 15:48:29 +00:00
  • 79a72a50d4 this is annoying, why is angel not defind as a race TrilbySpaceClone 2020-04-14 11:13:49 -04:00
  • 55402b1834 Merge branch 'master' into Ghommie-cit679 Ghom 2020-04-14 16:22:00 +02:00
  • 34397a5d17 Update lootdrop.dm Trilbyspaceclone 2020-04-14 10:13:23 -04:00
  • 2ebf23a32d Update utility_closets.dm Trilbyspaceclone 2020-04-14 10:12:27 -04:00
  • e7247c6a60 Update wallets.dm Trilbyspaceclone 2020-04-14 10:11:37 -04:00
  • 5833ed8029 Merge branch 'master' into tools_andstuff Trilbyspaceclone 2020-04-14 10:10:32 -04:00
  • a57828703e Update mobs.dm Ghom 2020-04-14 16:09:31 +02:00
  • 8f71aafde5 Automatic changelog generation for PR #11809 [ci skip] CitadelStationBot 2020-04-14 06:17:15 -05:00
  • 49e36e47ff Merge pull request #11809 from kevinz000/storage_rework Ghom 2020-04-14 13:17:11 +02:00
  • 6a4a937da5 Automatic changelog generation for PR #11618 [ci skip] CitadelStationBot 2020-04-14 05:38:37 -05:00
  • 5d01e05991 Merge pull request #11618 from Arturlang/Garlic Ghom 2020-04-14 12:38:34 +02:00
  • 3ec71612e7 Update uplink_bundles.dm kevinz000 2020-04-14 01:49:14 -07:00
  • d0b1a770be Automatic changelog generation for PR #11655 [ci skip] CitadelStationBot 2020-04-14 03:37:39 -05:00
  • b10c479d16 Merge pull request #11655 from Citadel-Station-13/Ghommie-patch-3 kevinz000 2020-04-14 01:37:36 -07:00
  • 3259d13925 Automatic changelog generation for PR #11826 [ci skip] CitadelStationBot 2020-04-14 03:35:49 -05:00
  • 7861b044ea Merge pull request #11826 from Ghommie/Ghommie-cit675 kevinz000 2020-04-14 01:35:46 -07:00
  • 4cd8f1b934 Automatic changelog generation for PR #11828 [ci skip] CitadelStationBot 2020-04-14 03:35:07 -05:00
  • 5baa5ebf55 Merge pull request #11828 from Citadel-Station-13/Ghommie-patch-2 kevinz000 2020-04-14 01:35:04 -07:00
  • fb82619bd3 Automatic changelog generation for PR #11829 [ci skip] CitadelStationBot 2020-04-14 03:34:48 -05:00
  • 1f900f0e9d Merge pull request #11829 from Citadel-Station-13/Ghommie-patch-5 kevinz000 2020-04-14 01:34:45 -07:00
  • ef2bfd74c2 Automatic changelog generation for PR #11830 [ci skip] CitadelStationBot 2020-04-14 03:34:22 -05:00
  • e271376c4e Merge pull request #11830 from Ghommie/Ghommie-cit676 kevinz000 2020-04-14 01:34:18 -07:00
  • ee3bd67756 Automatic changelog generation for PR #11831 [ci skip] CitadelStationBot 2020-04-14 03:34:01 -05:00
  • f460d0dab0 Merge pull request #11831 from Ghommie/Ghommie-cit677 kevinz000 2020-04-14 01:33:57 -07:00
  • 9c2a3fb4cc Automatic changelog generation for PR #11838 [ci skip] CitadelStationBot 2020-04-14 03:33:10 -05:00
  • 2961bf8698 Merge pull request #11838 from kappa-sama/gamingtime kevinz000 2020-04-14 01:33:06 -07:00
  • fb7dc7a54c Fucking icons Artur 2020-04-14 09:42:11 +03:00
  • 356f2913d7 Ghommies suggestions and renames a proc Artur 2020-04-14 09:30:14 +03:00
  • 2e2fc45632 Conflicting icon fix Artur 2020-04-14 09:28:43 +03:00
  • f910a0fd32 Conflict fixes Artur 2020-04-14 09:27:54 +03:00