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

Commit Graph

  • 84c3c104cd Pointed out that a message could be misinterpreted as lewd. Thalpy 2019-06-08 06:32:12 +01:00
  • 3051994c0e Merge pull request #8546 from Sishen1542/Plushies deathride58 2019-06-08 01:10:25 -04:00
  • 7fcb46e0f6 Merge pull request #8468 from Citadel-Station-13/kevinz000-patch-41 deathride58 2019-06-08 01:09:52 -04:00
  • 8bf5777844 Merge pull request #8474 from Citadel-Station-13/adrenal_nerf deathride58 2019-06-08 01:07:56 -04:00
  • 3bb1a8dd00 OOPS. Fermi 2019-06-08 02:19:39 +01:00
  • b6788cdd64 Updated projectile sprite. Fermi 2019-06-08 01:45:32 +01:00
  • 26e55a7a42 Swapped stacking to FALSE Fermi 2019-06-08 01:40:13 +01:00
  • 42d0ab4825 Comment cleanup. Fermi 2019-06-08 01:31:21 +01:00
  • 9fcbac0323 Lil flavour. Fermi 2019-06-08 01:23:57 +01:00
  • c6c98b539d Minor bug fix. Fermi 2019-06-08 01:22:43 +01:00
  • f44b9048af Added to vendors/tech. Fermi 2019-06-08 01:00:51 +01:00
  • 65b218d4c3 Spritework. Fermi 2019-06-08 00:31:14 +01:00
  • c0d1ac5bd3 Update originalcontent.dmm Trilbyspaceclone 2019-06-07 18:42:23 -04:00
  • 9f86249031 Add files via upload Trilbyspaceclone 2019-06-07 18:37:52 -04:00
  • 572ad788e8 Delete actions.dmi Trilbyspaceclone 2019-06-07 18:37:30 -04:00
  • 36cf06683b Add files via upload Trilbyspaceclone 2019-06-07 18:37:04 -04:00
  • 91a761460c Delete library.dmi Trilbyspaceclone 2019-06-07 18:36:40 -04:00
  • 022b648979 Update granters.dm Trilbyspaceclone 2019-06-07 18:35:52 -04:00
  • bc6b967fb2 Update paperplane.dm Trilbyspaceclone 2019-06-07 18:34:30 -04:00
  • 79a456a0ac Update carbon_defense.dm Trilbyspaceclone 2019-06-07 18:29:42 -04:00
  • eb3e196953 Update mam_ears.dmi dtfe3 2019-06-07 22:52:42 +02:00
  • 57246b5c4f No combat mode message if user is on help intent. Ghommie 2019-06-07 19:36:09 +02:00
  • 39775a08ac Update RPD.dm Arturlang 2019-06-07 19:56:31 +03:00
  • 5a9269db73 removed duplicate hides_bulges SkullyRoberts 2019-06-07 12:56:25 -04:00
  • 0fff042ea8 thonking. Ghommie 2019-06-07 18:50:22 +02:00
  • 6ff01f39f3 Automatic changelog generation for PR #8236 [ci skip] CitadelStationBot 2019-06-07 11:46:02 -05:00
  • 32c27be2b6 Merge pull request #8236 from deathride58/fuckatmos kevinz000 2019-06-07 09:45:59 -07:00
  • 1a5c487e22 Ported the nudity permit from RP and made it a loadout option SkullyRoberts 2019-06-07 12:37:37 -04:00
  • b467d144ef pridebois Sishen 2019-06-07 05:53:07 -04:00
  • aa53cc9ea9 Merge branch 'master' into fuckatmos deathride58 2019-06-07 04:38:47 -04:00
  • 4ff12eebd0 he bork and he woof AnalWerewolf 2019-06-07 18:10:22 +10:00
  • 56be73f7e0 Lord Travis Hath Spoken. Ghommie 2019-06-07 07:44:33 +02:00
  • 8475a60a6e 😳 Ghommie 2019-06-07 07:38:06 +02:00
  • 92e925f1f7 Stuff to fix, fools to blame. Ghommie 2019-06-07 07:14:24 +02:00
  • b6f35435ec Ports the get_area conversion to define. Ghommie 2019-06-07 06:50:26 +02:00
  • 4d5332346e Compiling was too slow. Ghommie 2019-06-07 06:37:03 +02:00
  • 7aac9e6280 Updates reagents a bit. Ghommie 2019-06-07 06:27:04 +02:00
  • 38dbdf1a48 Gives Ninjas back their Weeb speech modification Poojawa 2019-06-06 21:55:35 -05:00
  • f8903a871e Another episode of "fixing that stupid map edge bug again". Ghommie 2019-06-07 04:55:05 +02:00
  • c2cf8b28df KISS principal Poojawa 2019-06-06 21:35:50 -05:00
  • 455332a717 movin back to the core when selecting a new display. Ghommie 2019-06-07 04:20:15 +02:00
  • a6fcac55d4 Makes it compile. Ghommie 2019-06-07 04:05:27 +02:00
  • 0b53df47de Enough clowning around. Ghommie 2019-06-07 03:22:26 +02:00
  • 2e42656b6d Revert "lel" Poojawa 2019-06-06 19:40:08 -05:00
  • 6b82c985ae Revert "fuckit, I'm just gunna wholesale port from baycode I guess" Poojawa 2019-06-06 19:39:22 -05:00
  • 2606dd0cdd Revert "these too please thanks" Poojawa 2019-06-06 19:39:17 -05:00
  • c5f79c9da8 Fine i'll put it back in tools then, will that make you happy? BlackMajor 2019-06-07 12:30:34 +12:00
  • a90c364e77 Resolve conflict with gangs BlackMajor 2019-06-07 12:24:36 +12:00
  • 21fd11718a Bundled glue in with compression kit PR BlackMajor 2019-06-07 12:00:06 +12:00
  • 67eb76b360 clarifies a few things Poojawa 2019-06-06 18:56:26 -05:00
  • 5a69499927 Hol up, unrelated PR time, atomization. Ghommie 2019-06-07 01:32:15 +02:00
  • 000b930811 Added Medolier (needs sprite) Fermi 2019-06-07 00:19:28 +01:00
  • 2888e1b30b Dartgun functions as intended. Fermi 2019-06-07 00:12:11 +01:00
  • ef7fb47e17 port fixaloo. Ghommie 2019-06-07 00:41:19 +02:00
  • 1a42c017ac DEBUG Fermi 2019-06-06 23:23:53 +01:00
  • bdaab020f7 ports a fix. Ghommie 2019-06-07 00:20:04 +02:00
  • 05067463c5 Missed a comment. Fermi 2019-06-06 23:02:14 +01:00
  • 83666abfea Small text edits and tightening up of self MKU OD. Fermi 2019-06-06 22:56:59 +01:00
  • a7fe2ca0ff paper work icons Trilbyspaceclone 2019-06-06 16:03:24 -04:00
  • b9b219d561 adds redtail Sishen 2019-06-06 16:01:40 -04:00
  • 6fd83df81f Update recipes.dm Trilbyspaceclone 2019-06-06 16:00:02 -04:00
  • 7f35a15020 Update packs.dm Trilbyspaceclone 2019-06-06 15:58:13 -04:00
  • e2a3b855b8 Update order.dm Trilbyspaceclone 2019-06-06 15:56:27 -04:00
  • 4ef2b15c69 Update manifest.dm Trilbyspaceclone 2019-06-06 15:51:37 -04:00
  • 01e56cc00d garmmer Trilbyspaceclone 2019-06-06 14:52:52 -04:00
  • 0b1da3f025 Update uniform.dm dtfe3 2019-06-06 20:50:14 +02:00
  • d3d2b8d898 should be ready. Ghommie 2019-06-06 19:24:20 +02:00
  • 17febdd07c Automatic changelog generation for PR #8534 [ci skip] CitadelStationBot 2019-06-06 08:53:01 -05:00
  • 31a942a63a Merge pull request #8534 from dtfe3/dtfe3-pink-panties kevinz000 2019-06-06 06:52:57 -07:00
  • 44358e054a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29 Ghommie 2019-06-06 15:24:31 +02:00
  • 0e630680ba forgot to pull from upstream. One second. Ghommie 2019-06-06 15:20:27 +02:00
  • b7b2fbc843 Update plushes.dmi Sishen 2019-06-06 05:24:27 -04:00
  • eccfb8cc15 Update plushes.dmi Sishen 2019-06-06 05:22:41 -04:00
  • cf3002a392 slimeplush Sishen 2019-06-06 05:14:01 -04:00
  • 668dbfe873 Merge pull request #9 from Citadel-Station-13/master BlackMajor 2019-06-06 19:13:55 +12:00
  • 8d74a341ba Update human_face.dmi dtfe 2019-06-06 08:38:20 +02:00
  • 5e68db7836 local files have commas, but I forgot to save Trilbyspaceclone 2019-06-05 22:22:50 -04:00
  • 3e98ed9553 Update packs.dm Trilbyspaceclone 2019-06-05 20:41:59 -04:00
  • 1b463c18b3 Update snacks_sandwichtoast.dm Trilbyspaceclone 2019-06-05 20:14:48 -04:00
  • 874a2a1377 Update tgstation.dme Trilbyspaceclone 2019-06-05 20:13:07 -04:00
  • 9443f5bf71 Add files via upload Trilbyspaceclone 2019-06-05 20:11:54 -04:00
  • a9ded7a3eb Add files via upload Trilbyspaceclone 2019-06-05 20:10:07 -04:00
  • e5b538af71 Update recipes_frozen.dm Trilbyspaceclone 2019-06-05 20:09:21 -04:00
  • 762c509315 Update craft.dm Trilbyspaceclone 2019-06-05 20:07:25 -04:00
  • 7f8886f6e9 Update construction.dm Trilbyspaceclone 2019-06-05 20:06:37 -04:00
  • b7a759017d Add files via upload Trilbyspaceclone 2019-06-05 20:05:56 -04:00
  • 9b2991d0f2 Update recipes_misc.dm Trilbyspaceclone 2019-06-05 20:05:22 -04:00
  • e922a0cb18 Update recipes_sandwich.dm Trilbyspaceclone 2019-06-05 20:04:40 -04:00
  • b68565280e Update snacks_other.dm Trilbyspaceclone 2019-06-05 20:02:22 -04:00
  • 03132569a7 Update backpack.dm Trilbyspaceclone 2019-06-05 15:54:51 -04:00
  • a49692ba06 Thanks for the review. Ghommie 2019-06-05 21:25:18 +02:00
  • dbac1e135a Update human_face.dmi dtfe3 2019-06-05 21:08:10 +02:00
  • 8778349821 added BurgerLua 2019-06-05 11:43:28 -07:00
  • b9aebf69b1 Automatic changelog generation for PR #8525 [ci skip] CitadelStationBot 2019-06-05 13:35:25 -05:00
  • 7decce3808 Merge pull request #8525 from Trilbyspaceclone/patch-161 kevinz000 2019-06-05 11:35:22 -07:00
  • 3eb217b063 Automatic changelog generation for PR #8430 [ci skip] CitadelStationBot 2019-06-05 13:31:14 -05:00
  • 0d97361dea Merge pull request #8430 from Trilbyspaceclone/bad_idea kevinz000 2019-06-05 11:31:10 -07:00
  • 6e4a3c71f9 Merge pull request #8532 from Poojawa/WHYBYOND kevinz000 2019-06-05 11:30:09 -07:00
  • 3de6e2d71a twintails... dtfe3 2019-06-05 19:41:23 +02:00
  • af2598035a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 Ghommie 2019-06-05 19:32:17 +02:00