Commit Graph

  • 3968213bde Increased the spawn area size of the City of Cogs BurgerLua 2019-04-22 12:04:21 -07:00
  • fe1692eef3 t a b Poojawa 2019-04-21 01:57:12 -05:00
  • b524c6741d double checking my work Poojawa 2019-04-21 01:56:45 -05:00
  • df057544f2 Merge branch 'master' into screaming Poojawa 2019-04-20 23:33:23 -05:00
  • ae7ce39f62 aaaAAAAaaaa Poojawa 2019-04-20 23:28:43 -05:00
  • 4190a00693 Update eutactic_blades.dm kevinz000 2019-04-20 19:37:54 -07:00
  • b5df78419a Update holy_weapons.dm kevinz000 2019-04-20 19:28:58 -07:00
  • b1d358ed79 Update eutactic_blades.dm kevinz000 2019-04-20 19:26:53 -07:00
  • 22f72c6431 Update eutactic_blades.dm kevinz000 2019-04-20 19:23:10 -07:00
  • 3d5d6e9212 Update podpeople.dm kevinz000 2019-04-20 16:44:55 -07:00
  • f38546b21a Merge pull request #8230 from Trilbyspaceclone/patch-97 kevinz000 2019-04-20 16:40:09 -07:00
  • 1ea8a432e2 Update game_options.dm kevinz000 2019-04-20 16:39:17 -07:00
  • 65d219ac40 Automatic changelog generation for PR #8182 [ci skip] CitadelStationBot 2019-04-20 18:38:22 -05:00
  • 939bbbe3e7 Merge pull request #8182 from deathride58/optimizeshearersinview kevinz000 2019-04-20 16:38:20 -07:00
  • 8c5db62542 Merge pull request #8244 from Poojawa/iv-dripper-punctures kevinz000 2019-04-20 16:37:13 -07:00
  • d4636ddeb8 Merge pull request #8249 from Poojawa/mask-checkers kevinz000 2019-04-20 16:36:26 -07:00
  • cd3edb22d0 Automatic changelog generation for PR #8258 [ci skip] CitadelStationBot 2019-04-20 18:36:03 -05:00
  • b35c366516 Merge pull request #8258 from BurgerLUA/VentClogTweak kevinz000 2019-04-20 16:36:01 -07:00
  • e521a5abd6 Merge pull request #8217 from Trilbyspaceclone/patch-95 kevinz000 2019-04-20 16:33:51 -07:00
  • 901e748675 Merge pull request #8254 from Poojawa/the-great-vore-escape kevinz000 2019-04-20 16:31:59 -07:00
  • 60bc278418 Merge pull request #8227 from Trilbyspaceclone/patch-96 kevinz000 2019-04-20 16:30:58 -07:00
  • 8e2353c058 Automatic changelog generation for PR #8259 [ci skip] CitadelStationBot 2019-04-20 18:29:37 -05:00
  • 6291185422 Merge pull request #8259 from deathride58/fuckpaicircuits kevinz000 2019-04-20 16:29:35 -07:00
  • 1bc4950fc3 Update game_options.dm kevinz000 2019-04-20 16:27:36 -07:00
  • 64a026ca11 Update shuttle.dm kevinz000 2019-04-20 16:26:48 -07:00
  • 7a3f8704a2 Update goliath.dm Trilbyspaceclone 2019-04-20 14:16:30 -04:00
  • 6dc8faf533 Update machine_vending.dm Trilbyspaceclone 2019-04-20 14:08:25 -04:00
  • 769102ed9c Update machine_vending.dm Trilbyspaceclone 2019-04-20 14:04:40 -04:00
  • e61b4f83d8 Update large_objects.dm Trilbyspaceclone 2019-04-20 00:37:45 -04:00
  • 5657fd8cde endless sadness and exhaustion Fermi 2019-04-20 03:40:40 +01:00
  • 5f2469df5e Automatic changelog generation for PR #8255 [ci skip] CitadelStationBot 2019-04-19 16:19:16 -05:00
  • c1c198f423 Merge pull request #8255 from BurgerLUA/LoadoutUITweaks kevinz000 2019-04-19 14:19:14 -07:00
  • cc7b5b524b Automatic changelog generation for PR #8252 [ci skip] CitadelStationBot 2019-04-19 16:18:49 -05:00
  • 5f63cfede7 Merge pull request #8252 from BurgerLUA/WhatHaveIFuckingDone kevinz000 2019-04-19 14:18:46 -07:00
  • 1a680b142f grammar Trilbyspaceclone 2019-04-19 14:06:02 -04:00
  • bb51b9e354 grammar Trilbyspaceclone 2019-04-19 14:04:03 -04:00
  • e8e7467a50 Update recipes_cake.dm Trilbyspaceclone 2019-04-19 13:50:02 -04:00
  • fe5e68710f Update snacks_cake.dm Trilbyspaceclone 2019-04-19 13:48:10 -04:00
  • 5d4917bf48 Add files via upload Trilbyspaceclone 2019-04-19 13:37:56 -04:00
  • 1a3e63dc8f fixes space pollution deathride58 2019-04-19 13:06:50 -04:00
  • 8f021d4143 Minor circuit balance tweaks - limits locomotion circuits to jogging speed and doubles the complexity of mmi/pai connector circuits deathride58 2019-04-18 21:44:43 -04:00
  • 97fb78d07e Reworked the Vent Clog event to shoot out smoke instead of foam; also made the foam shoot out one at a time over a long period of time to prevent lag. BurgerLua 2019-04-18 18:00:19 -07:00
  • 6698d9646b go away Travis Poojawa 2019-04-17 06:32:42 -05:00
  • 773a94dea6 I really dunno at this point, weh Poojawa 2019-04-17 06:28:07 -05:00
  • c65e551c07 makes travis shutup Poojawa 2019-04-17 06:01:59 -05:00
  • a0b7c15e0d whatever Travis, it isn't even enabled, fuck off Poojawa 2019-04-17 04:52:39 -05:00
  • fe6407d00c I need to do something else for a bit pending reviews Poojawa 2019-04-17 04:33:56 -05:00
  • 0f838e3e2b Improved the layout of the Loadout UI to be more fitting BurgerLua 2019-04-16 23:37:48 -07:00
  • 1f65b1ebdd clears blindness on vore OOC escape Poojawa 2019-04-17 01:27:08 -05:00
  • 73098574b7 what to do when footprints are being a bitch. Poojawa 2019-04-17 01:18:21 -05:00
  • 0e863d7daf Update special.dm kevinz000 2019-04-16 22:42:36 -07:00
  • 7ff2b6817b No more seperate whatever BurgerLua 2019-04-16 21:06:57 -07:00
  • 795558ee99 Fixes missing EVA helmet states Poojawa 2019-04-16 21:57:05 -05:00
  • ed608ac32c Bhijn... Trilbyspaceclone 2019-04-16 20:26:24 -04:00
  • fdd0eb4b17 Update modular_citadel/code/modules/integrated_electronics/subtypes/manipulation.dm deathride58 2019-04-16 15:40:55 -07:00
  • e1963f4ae5 fixes the bug where space isnt actually a vacuum deathride58 2019-04-16 18:36:39 -04:00
  • 390f9a635f Error message addition. Fermi 2019-04-16 23:03:24 +01:00
  • df880c6723 Update PDA.dm Trilbyspaceclone 2019-04-16 16:07:52 -04:00
  • 5a7a068b6e It compiles now. Useroth 2019-04-16 21:21:16 +02:00
  • e038ba40c7 Fixing errors, down to one last error!! Fermi 2019-04-16 20:18:14 +01:00
  • 2adc3c6069 Update shield.dm Trilbyspaceclone 2019-04-16 15:11:46 -04:00
  • d49178fd84 Removed debug code, made the arousal input just be a flat value. BurgerLua 2019-04-16 12:10:03 -07:00
  • 1b970e7ce0 Update PDA.dm Trilbyspaceclone 2019-04-16 15:08:45 -04:00
  • 2b57db57ab Update PDA.dm Trilbyspaceclone 2019-04-16 15:07:51 -04:00
  • dba2b6deaf Tweaks Electric Stimulator + Adds Bonermeter BurgerLua 2019-04-16 11:55:54 -07:00
  • 887aad3bf3 Quick merge!! aaaa Thalpy 2019-04-16 18:02:44 +01:00
  • f244d3fdca system's mostly working Poojawa 2019-04-16 11:30:36 -05:00
  • a57dc622ef holder.dm should be fixed!! Thalpy 2019-04-16 17:28:49 +01:00
  • 32661491ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 Cyprian 2019-04-16 18:21:03 +02:00
  • f58cc09aed Some slight fixes Poojawa 2019-04-16 08:53:19 -05:00
  • b3e894dcbb oh god oh fuck oh god it's snowballing Poojawa 2019-04-16 07:40:37 -05:00
  • a772f532c3 Synthetic and RNG blood Poojawa 2019-04-16 04:28:04 -05:00
  • 5c0c8aa4c9 Update PDA.dm Trilbyspaceclone 2019-04-15 23:43:36 -04:00
  • 499078fb10 Headgear is more aggressive in setting normal style stuff Poojawa 2019-04-15 22:04:37 -05:00
  • 875bd522d0 grammer Trilbyspaceclone 2019-04-15 22:45:08 -04:00
  • 05acb8c7a9 Merge pull request #8245 from Poojawa/npc-fix deathride58 2019-04-15 21:31:56 -04:00
  • f55b6ed18a Another round of unspaghettifying the code. A lot still to go. Useroth 2019-04-16 00:53:44 +02:00
  • 977462387c A couple of bugfixes. Also testing if I can even push to this repo. Useroth 2019-04-16 00:11:53 +02:00
  • b4d1b0e906 Midfix of chem side of fermichem Thalpy 2019-04-15 22:59:19 +01:00
  • 02da3c524e Fixed reaction mechanics - pre status edits Thalpy 2019-04-15 22:08:00 +01:00
  • 8862d63d0c Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-04-15 14:37:14 -05:00
  • ce7a42c5cd Custom Species Poojawa 2019-04-15 14:12:45 -05:00
  • e7bac925dc Update core.dm Trilbyspaceclone 2019-04-15 15:05:11 -04:00
  • 558a989d8a fixed Trilbyspaceclone 2019-04-15 15:03:03 -04:00
  • f767069dc2 Custom Species names Poojawa 2019-04-15 13:50:21 -05:00
  • 12d17f6f52 usr Poojawa 2019-04-15 11:28:42 -05:00
  • 8b6d0d0604 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into iv-dripper-punctures Poojawa 2019-04-15 10:10:05 -05:00
  • 838373cbba Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into npc-fix Poojawa 2019-04-15 10:09:08 -05:00
  • 530e021254 Merge pull request #8240 from Poojawa/human-taaaaaaaails deathride58 2019-04-15 10:01:45 -04:00
  • c6ef9da679 Merge pull request #8239 from Citadel-Station-13/kevinz000-patch-36 deathride58 2019-04-15 10:01:13 -04:00
  • 954b3f638d Automatic changelog generation for PR #8237 [ci skip] CitadelStationBot 2019-04-15 09:00:40 -05:00
  • aa2eb60b6c Merge pull request #8237 from Poojawa/muzzled-masks deathride58 2019-04-15 10:00:37 -04:00
  • 13e3c02e8f Merge pull request #8241 from Poojawa/travis-repairs deathride58 2019-04-15 09:33:09 -04:00
  • 295918d77c siiigh. tg NPC code is so bad Poojawa 2019-04-15 08:10:31 -05:00
  • 25d77bac91 Adds a can_inject check to IV Drips Poojawa 2019-04-15 01:01:16 -05:00
  • ad19f6fcae Shame to see it Trilbyspaceclone 2019-04-14 23:30:52 -04:00
  • 84b04d8752 Update misc_designs.dm Trilbyspaceclone 2019-04-14 23:22:17 -04:00
  • 1a0aca6a65 Update comp_board_designs.dm Trilbyspaceclone 2019-04-14 23:20:49 -04:00
  • cc06df001a Update all_nodes.dm Trilbyspaceclone 2019-04-14 23:20:09 -04:00
  • 1d966a688e Update shield.dm Trilbyspaceclone 2019-04-14 23:17:37 -04:00