Commit Graph

  • 28a1afa626 Properly adds NOGENITALS to species that wouldn't Poojawa 2019-05-18 01:37:37 -05:00
  • 20bbc0888d Ling hivemind no longer turns apostrophes into ' BlackMajor 2019-05-18 17:42:17 +12:00
  • 00356ce980 Cream pie smite BlackMajor 2019-05-18 17:09:26 +12:00
  • 8b127387c6 Merge pull request #8344 from Trilbyspaceclone/patch-119 kevinz000 2019-05-17 21:28:59 -07:00
  • 4087dafeb6 Automatic changelog generation for PR #8362 [ci skip] CitadelStationBot 2019-05-17 23:27:57 -05:00
  • 20b27ea92c Merge pull request #8362 from dtfe3/jetpack-stuff kevinz000 2019-05-17 21:27:55 -07:00
  • 675c72d276 Automatic changelog generation for PR #8303 [ci skip] CitadelStationBot 2019-05-17 23:27:35 -05:00
  • 50b6a610e9 Merge pull request #8303 from BurgerLUA/Vent-Clog-Fixes-And-Additions kevinz000 2019-05-17 21:27:32 -07:00
  • 0b564e7e87 Fix Fermi 2019-05-18 04:09:33 +01:00
  • 4ef1355933 Made "heyo" a phase 2 Fermi 2019-05-18 03:32:58 +01:00
  • 0700e0c080 Near completion - missing Neko's pH paper and reaction vars. Fermi 2019-05-18 03:02:14 +01:00
  • cbdb98988c fix footsteps for naga/tentacle Nero1024 2019-05-17 20:42:54 -05:00
  • 2f75f861ce Explode proc set up Fermi 2019-05-18 01:19:04 +01:00
  • 752f368ed2 Ports additional footsteps Nero1024 2019-05-17 19:12:22 -05:00
  • 2a4a656a4d Port new footsteps from tg Nero1024 2019-05-17 18:10:03 -05:00
  • b3668a32d0 Fixes color of elf ears CalamaBanana 2019-05-17 20:29:43 +02:00
  • f1b27427b4 SEENGING PAIPZE Poojawa 2019-05-17 11:03:32 -05:00
  • cabf490134 Fixed compiling errors for Neko. Fermi 2019-05-17 16:57:42 +01:00
  • d4eba1f12a Automatic changelog generation for PR #8348 [ci skip] CitadelStationBot 2019-05-17 10:36:22 -05:00
  • 844fb13467 Merge pull request #8348 from Trilbyspaceclone/patch-123 kevinz000 2019-05-17 08:36:20 -07:00
  • fac9f2a3d3 Merge pull request #8364 from Poojawa/Vent-and-scrubbers kevinz000 2019-05-17 08:35:50 -07:00
  • 77232cc4bb Merge pull request #8365 from Poojawa/salt-inducer kevinz000 2019-05-17 08:34:36 -07:00
  • fa5531285a Push for Neko, probably doesn't compile atm. Fermi 2019-05-17 16:23:34 +01:00
  • d2f7b961d9 Touch-up Useroth 2019-05-17 17:16:43 +02:00
  • 0f54bf7471 Might as well format it a little more. Useroth 2019-05-17 17:09:10 +02:00
  • 73c3e94946 A fixed oopsie. Useroth 2019-05-17 17:07:45 +02:00
  • 4d75eca582 Well, that was surely an interesting thing to code. Useroth 2019-05-17 16:22:17 +02:00
  • aeac0134ec Improves Recycler code by making it respect indestructable resistance Poojawa 2019-05-17 07:33:24 -05:00
  • 601b9d9c65 Ports Oracle's cloning tube Poojawa 2019-05-17 06:58:36 -05:00
  • 022e8710f9 port TG#43799 for signallers Poojawa 2019-05-17 06:21:26 -05:00
  • f95da1aae5 Heart Attacks will murder you now Poojawa 2019-05-17 05:59:28 -05:00
  • 0d02956144 Fixes simple mob vore toggle Poojawa 2019-05-17 05:28:54 -05:00
  • eb717645bd M.emote("scream") Poojawa 2019-05-17 05:16:53 -05:00
  • 4f75f68a5d make hostile mobs gurgle people Poojawa 2019-05-17 05:13:30 -05:00
  • 751166cfbe Unfucks borg defibs Poojawa 2019-05-17 04:59:53 -05:00
  • b95bc24def mission accomplished Poojawa 2019-05-17 04:24:23 -05:00
  • 267661e078 Tail Wagging Sishen 2019-05-17 01:56:44 -04:00
  • 276a6e9896 Merge pull request #8307 from Citadel-Station-13/kevinz000-patch-49 deathride58 2019-05-17 00:54:17 -04:00
  • 02eb7f9e61 Merge pull request #8268 from Citadel-Station-13/kevinz000-patch-38 deathride58 2019-05-17 00:34:17 -04:00
  • c8eb4ba8cb Automatic changelog generation for PR #8311 [ci skip] CitadelStationBot 2019-05-16 23:33:14 -05:00
  • aa1fdd9fb7 Merge pull request #8311 from Trilbyspaceclone/patch-114 deathride58 2019-05-17 00:33:12 -04:00
  • 50bdbcc46f Merge branch 'master' into kevinz000-patch-41 deathride58 2019-05-17 00:29:31 -04:00
  • ba125a2648 Merge pull request #8270 from Citadel-Station-13/kevinz000-patch-40 deathride58 2019-05-17 00:14:36 -04:00
  • cbac4b1daf Merge pull request #8330 from Scorpion-117/master deathride58 2019-05-17 00:13:35 -04:00
  • d855a7eb0d Merge pull request #8332 from Useroth/collars-n-shit deathride58 2019-05-17 00:10:41 -04:00
  • e7d50f6e57 Merge pull request #8355 from CalamaBanana/Circuit-Colors deathride58 2019-05-16 23:30:00 -04:00
  • 7712b51fd0 Tweaks n' shit. Useroth 2019-05-17 04:49:39 +02:00
  • 06681790cd ... Useroth 2019-05-17 04:24:38 +02:00
  • 0e9717845e Update podpeople.dm kevinz000 2019-05-16 19:03:32 -07:00
  • c69d9a38d7 Update podpeople.dm kevinz000 2019-05-16 18:50:09 -07:00
  • f6ce2b25bb Update mime.txt Trilbyspaceclone 2019-05-16 20:37:53 -04:00
  • b5b54c9f9f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 Ghommie 2019-05-17 02:17:18 +02:00
  • 88a41f7783 Update cult_items.dm Trilbyspaceclone 2019-05-16 19:54:08 -04:00
  • 381a4869bb Update cult_items.dm Trilbyspaceclone 2019-05-16 19:40:09 -04:00
  • a9eca3c143 Update clothesmate.dm Trilbyspaceclone 2019-05-16 15:51:46 -04:00
  • 65dfca1c18 Update wardrobes.dm Trilbyspaceclone 2019-05-16 15:44:59 -04:00
  • e4ba220eb7 oh god, oh fuck. why Poojawa 2019-05-16 14:10:31 -05:00
  • 2f4e19bb87 Cryopod mapping fixes Poojawa 2019-05-16 11:19:49 -05:00
  • 0b46794ce9 Increases salt 100 fold Poojawa 2019-05-16 09:43:03 -05:00
  • 5f1e600155 vent and scrubbers icon port Poojawa 2019-05-16 09:24:44 -05:00
  • ac04e23e31 Nympho Traiting & Arousal! Sishen 2019-05-16 10:17:16 -04:00
  • 3ece75eb76 Makes the jetpack easier to craft dtfe3 2019-05-16 15:30:46 +02:00
  • 0f6677b956 Blood colors happens to footprints now. Poojawa 2019-05-16 08:23:53 -05:00
  • ee6588e562 Merge pull request #2 from dtfe3/dtfe3-patch-1 dtfe3 2019-05-16 15:20:46 +02:00
  • d228334cd5 Fix for the improvised jetpack dtfe3 2019-05-16 15:19:59 +02:00
  • 538c6e98ac On-mob_life proc doesn't work for some reason. Fix it/badger helpers. Fermi 2019-05-16 01:26:46 +01:00
  • 246a344fed Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain) Fermi 2019-05-16 00:58:30 +01:00
  • 1e7b537166 Update code/modules/integrated_electronics/core/detailer.dm CalamaBanana 2019-05-16 00:42:05 +02:00
  • c18756dec4 Well, that's it. Useroth 2019-05-15 23:24:12 +02:00
  • 9e00562e68 Added custom option CalamaBanana 2019-05-15 13:13:17 +02:00
  • 8229b4529f So sleepy Fermi 2019-05-15 05:39:07 +01:00
  • 6dba14eafd Final fix. Fermi 2019-05-15 05:34:16 +01:00
  • aa289b67dc Quick fix Fermi 2019-05-15 05:28:41 +01:00
  • 2218956a09 Gearing up for PR Fermi 2019-05-15 05:27:09 +01:00
  • 689cb34347 Update wildwest.dmm Poojawa 2019-05-14 20:19:55 -05:00
  • 701b01dfa6 Just another commit to make travis fucking recompile it Useroth 2019-05-15 02:30:47 +02:00
  • 8500e69088 Merge branch 'collars-n-shit' of github.com:Useroth/Citadel-Station-13 into collars-n-shit Useroth 2019-05-15 02:09:41 +02:00
  • 3f64128513 Apply suggestions from code review Useroth 2019-05-15 02:08:43 +02:00
  • 6a29a0744b Applied suggested changes. Useroth 2019-05-15 02:07:16 +02:00
  • f910eea9f8 Update code/modules/clothing/neck/_neck.dm Useroth 2019-05-15 01:41:18 +02:00
  • 7cd74e6601 Adds pink to the circuit coloring tool CalamaBanana 2019-05-15 00:07:53 +02:00
  • 6478c21731 , Poojawa 2019-05-14 16:00:00 -05:00
  • fcc8212b72 Automatic changelog generation for PR #8336 [ci skip] CitadelStationBot 2019-05-14 15:48:56 -05:00
  • a3114d830a Merge pull request #8336 from BurgerLUA/Integrated-Circuit-Fixes-and-Additions kevinz000 2019-05-14 13:48:54 -07:00
  • 0d907db516 Almost done. Just need to update reagent vars. Fermi 2019-05-14 21:20:38 +01:00
  • 76aec5a5ed Holder fixes Fermi 2019-05-14 16:51:03 +01:00
  • afaf15bc59 Booty Calls! Sishen 2019-05-14 10:29:04 -04:00
  • b03a84e4d6 do we even use this shitty away mission Poojawa 2019-05-14 03:42:14 -05:00
  • 45e912cc6c map editing is nicer with notepad ++ at least Poojawa 2019-05-14 03:30:00 -05:00
  • 657e6316c6 port tg 42691 for component transfer enforcement Poojawa 2019-05-14 02:49:38 -05:00
  • 77abf6a179 just need the stupid component to work properly now Poojawa 2019-05-14 02:36:23 -05:00
  • f16b5eca88 Automatic changelog generation for PR #8352 [ci skip] CitadelStationBot 2019-05-13 21:30:28 -05:00
  • a4b6037e9c Merge pull request #8352 from deathride58/isweartofuckinggodtgedition kevinz000 2019-05-13 19:30:24 -07:00
  • 06ea7de46b [S] Fixes a fairly huge vector for server crashes deathride58 2019-05-13 21:49:33 -04:00
  • 3229e4bf3a Reverted holder, (sorry Kev) Fermi 2019-05-14 02:48:12 +01:00
  • be27417633 Stuff and things Fermi 2019-05-13 18:07:51 +01:00
  • 050906bfe8 I know how to code I sware Trilbyspaceclone 2019-05-12 22:22:09 -04:00
  • e9a18f156f Update engineering.dm Trilbyspaceclone 2019-05-12 22:03:21 -04:00
  • 41400ff94a Update recipes.dm Trilbyspaceclone 2019-05-12 21:54:18 -04:00
  • c9f6b02a0e Update briefcase.dm Trilbyspaceclone 2019-05-12 21:23:40 -04:00