Commit Graph

  • e20206a6cb Merge pull request #8450 from Trilbyspaceclone/patch-145 kevinz000 2019-05-27 03:23:33 -07:00
  • d6ffe6385b Copypaste from pooj's dupe cause Kev didn't reply Ghommie 2019-05-27 11:40:17 +02:00
  • 689077a54d grammar Trilbyspaceclone 2019-05-27 04:57:10 -04:00
  • 6633ff4533 grammar Trilbyspaceclone 2019-05-27 04:47:56 -04:00
  • 7f82314eb0 Add files via upload Trilbyspaceclone 2019-05-27 04:42:21 -04:00
  • 35505e1d8d Delete items_and_weapons.dmi Trilbyspaceclone 2019-05-27 04:41:15 -04:00
  • f2ee85371d Update shields.dm Trilbyspaceclone 2019-05-27 04:40:47 -04:00
  • a244bf33f7 Update recipes.dm Trilbyspaceclone 2019-05-27 04:39:06 -04:00
  • 1b48db693f Update shotgun.dm Trilbyspaceclone 2019-05-27 02:42:46 -04:00
  • 4607a2b6c3 Compile safe. Today's fixes. Fermi 2019-05-27 05:39:52 +01:00
  • 962c5c7a17 Update uplink_items.dm Trilbyspaceclone 2019-05-26 22:53:00 -04:00
  • 6b05ccbda8 Update uplink_items.dm Trilbyspaceclone 2019-05-26 22:51:22 -04:00
  • 21ade7bb2c Update uplink_items.dm Trilbyspaceclone 2019-05-26 22:49:07 -04:00
  • 254e84e46b Update uplink_items.dm Trilbyspaceclone 2019-05-26 22:44:17 -04:00
  • b28e374640 Update uplink_items.dm Trilbyspaceclone 2019-05-26 22:35:12 -04:00
  • ea6b538d0b Update uplink_items.dm Trilbyspaceclone 2019-05-26 22:32:10 -04:00
  • 4138748616 Update uplink_items.dm Trilbyspaceclone 2019-05-26 22:29:55 -04:00
  • a633d3202a It was Trilbyspaceclone 2019-05-26 22:22:31 -04:00
  • fa4e1f44ff Merge pull request #8438 from BurgerLUA/AssFix kevinz000 2019-05-26 19:19:13 -07:00
  • 2dde7e8451 Update uplink_items.dm Trilbyspaceclone 2019-05-26 22:18:56 -04:00
  • 7bc3aa4cf1 Update uplink_items.dm Trilbyspaceclone 2019-05-26 22:11:36 -04:00
  • 5a0c7df824 Update uplink_items.dm Trilbyspaceclone 2019-05-26 21:59:01 -04:00
  • a628c81474 Update uplink_items.dm Trilbyspaceclone 2019-05-26 21:56:37 -04:00
  • 06bacf3436 Update uplink_items.dm Trilbyspaceclone 2019-05-26 21:52:28 -04:00
  • 37aa491fa5 removes emp downtime, Kev's request. Ghommie 2019-05-27 02:30:03 +02:00
  • 33d40c0e94 Automatic changelog generation for PR #8435 [ci skip] CitadelStationBot 2019-05-26 19:23:07 -05:00
  • d4026d70ff Merge pull request #8435 from Ghommie/Ghommie-cit17 kevinz000 2019-05-26 17:23:05 -07:00
  • 81da063fa8 Automatic changelog generation for PR #8419 [ci skip] CitadelStationBot 2019-05-26 19:22:46 -05:00
  • e204cdc84e Merge pull request #8419 from UntoldTactics/Cult-Changes kevinz000 2019-05-26 17:22:43 -07:00
  • f56960ff88 Fract said max 35 dtfe3 2019-05-27 00:39:48 +02:00
  • 38a6c1f917 Decreased the increase from 45 to 40 dtfe3 2019-05-27 00:22:50 +02:00
  • 745df721ba CWC player requirement increase dtfe3 2019-05-26 23:20:27 +02:00
  • 375965d731 Item stripping no longer gets interrupted by changes in your actively held item deathride58 2019-05-26 16:22:15 -04:00
  • 7e10b4bed9 Update code/game/objects/items/stunbaton.dm Ghom 2019-05-26 22:03:38 +02:00
  • 057fd54d92 Update packs.dm Trilbyspaceclone 2019-05-26 15:25:04 -04:00
  • 4cb697d2ec Final changes before checks. Fermi 2019-05-26 17:37:20 +01:00
  • 352b07d5b1 Goddamnit, TABS, not spaces. Arturlang 2019-05-26 17:49:48 +03:00
  • 3f7f8a3560 Update mixer.dm Arturlang 2019-05-26 17:34:48 +03:00
  • 3eff474300 Update filter.dm Arturlang 2019-05-26 17:33:25 +03:00
  • b494e21ef6 Update volume_pump.dm Arturlang 2019-05-26 17:31:23 +03:00
  • ac066c3425 Logging Arturlang 2019-05-26 17:27:21 +03:00
  • 9f80896280 eh, was going somewhere with this Poojawa 2019-05-26 05:36:33 -05:00
  • 84aafb87f9 Lizard tails are actually marked Poojawa 2019-05-26 04:52:44 -05:00
  • 2aa86157e1 Fixes rendering issues. Adds balls to be rendered Poojawa 2019-05-26 04:52:31 -05:00
  • 5b549f030d huh... Trilbyspaceclone 2019-05-26 04:50:19 -04:00
  • e3aaff68b7 Added BurgerLua 2019-05-26 00:34:37 -07:00
  • b77e0a0943 buff kevinz000 2019-05-25 22:33:10 -07:00
  • b5c699cea8 adjustments kevinz000 2019-05-25 21:57:25 -07:00
  • a47a7b31ba more leniency. Ghommie 2019-05-26 06:56:02 +02:00
  • cfa53d53f1 updating old teleprods. Ghommie 2019-05-26 06:49:58 +02:00
  • 288f97dd13 further tweaking. Ghommie 2019-05-26 06:38:04 +02:00
  • bd85095590 Prebed tweaks Fermi 2019-05-26 05:34:28 +01:00
  • 7289d8a999 tweaking. Ghommie 2019-05-26 06:31:25 +02:00
  • 125db4c6b4 Added BurgerLua 2019-05-25 21:21:52 -07:00
  • 9b2ab8fc2a 21 minutes sounds, I don't really wanna overly punish. Ghommie 2019-05-26 05:21:17 +02:00
  • e61942cba9 it will approx take 18-19 minutes now. Ghommie 2019-05-26 05:18:07 +02:00
  • 28c435134b stunbaton emp & status tweaks Ghommie 2019-05-26 04:52:05 +02:00
  • 49351fe909 Update code/modules/antagonists/cult/runes.dm UntoldTactics 2019-05-26 12:23:35 +10:00
  • b2eea5e3f4 Sorry, web edit because I didn't commit the ?. Ghom 2019-05-26 04:11:52 +02:00
  • 2fe1431db6 Applying suggestion, ?. so no theorical runtime. Ghommie 2019-05-26 03:40:48 +02:00
  • 91f10442cf Merge branch 'pr/12' Fermi 2019-05-26 02:05:48 +01:00
  • 87deaf07c5 Update breasts.dm Fermi 2019-05-26 01:55:59 +01:00
  • a0073295e1 Updating from Cit, pre PR. Fermi 2019-05-26 01:49:58 +01:00
  • 869fac49a7 Apply suggestions from code review Arturlang 2019-05-26 03:29:27 +03:00
  • a29aed136b Update misc_designs.dm Trilbyspaceclone 2019-05-25 18:25:01 -04:00
  • df236fbda5 Update comp_board_designs.dm Trilbyspaceclone 2019-05-25 18:24:33 -04:00
  • 7b4ddd8965 Update comp_board_designs.dm Trilbyspaceclone 2019-05-25 18:24:19 -04:00
  • 070e43ca64 Update sheet_types.dm Trilbyspaceclone 2019-05-25 17:58:33 -04:00
  • b6590cd9e9 Update boxes.dm Trilbyspaceclone 2019-05-25 17:54:57 -04:00
  • 011be481ca Add files via upload Trilbyspaceclone 2019-05-25 17:39:03 -04:00
  • 97a795dc0a Delete storage.dmi Trilbyspaceclone 2019-05-25 17:38:06 -04:00
  • ed974bdcde Update sheet_types.dm Trilbyspaceclone 2019-05-25 17:18:40 -04:00
  • c8734cebdc Update biogenerator_designs.dm Trilbyspaceclone 2019-05-25 16:35:50 -04:00
  • 7592c8b4af Merge pull request #41 from Citadel-Station-13/master Trilbyspaceclone 2019-05-25 16:18:25 -04:00
  • 0665cf5c99 Update jetpack.dm Trilbyspaceclone 2019-05-25 16:13:45 -04:00
  • a2f825d45b Merge branch 'master' into patch-135 Trilbyspaceclone 2019-05-25 16:12:37 -04:00
  • 12994f7a59 Update jetpack.dm Trilbyspaceclone 2019-05-25 16:11:33 -04:00
  • 915e41e5e6 Update jetpack.dm Trilbyspaceclone 2019-05-25 16:08:19 -04:00
  • 4fc31f6322 Merge branch 'master' into fuckatmos deathride58 2019-05-25 15:34:06 -04:00
  • fc5b617ca0 Input-check for the color CalamaBanana 2019-05-25 21:18:17 +02:00
  • 851072ff23 Automatic changelog generation for PR #8325 [ci skip] CitadelStationBot 2019-05-25 13:51:21 -05:00
  • 0dba89c4e7 Merge pull request #8325 from Trilbyspaceclone/patch-118 kevinz000 2019-05-25 11:51:17 -07:00
  • b6abfeb1fc Automatic changelog generation for PR #8417 [ci skip] CitadelStationBot 2019-05-25 13:34:59 -05:00
  • 90a3199315 Merge pull request #8417 from Trilbyspaceclone/patch-136 kevinz000 2019-05-25 11:34:55 -07:00
  • bc8b4485e0 Automatic changelog generation for PR #8413 [ci skip] CitadelStationBot 2019-05-25 13:32:26 -05:00
  • d0f61c5f41 Merge pull request #8413 from Useroth/hotel-dorms kevinz000 2019-05-25 11:32:23 -07:00
  • 34bc572dd6 Automatic changelog generation for PR #8296 [ci skip] CitadelStationBot 2019-05-25 13:31:33 -05:00
  • a4b2aa0420 Merge pull request #8296 from Trilbyspaceclone/patch-112 kevinz000 2019-05-25 11:31:30 -07:00
  • 38304ca471 Automatic changelog generation for PR #8384 [ci skip] CitadelStationBot 2019-05-25 13:31:00 -05:00
  • d0819246bc Merge pull request #8384 from nero1024/footstepB kevinz000 2019-05-25 11:30:57 -07:00
  • d1cdf35007 Automatic changelog generation for PR #8397 [ci skip] CitadelStationBot 2019-05-25 13:30:21 -05:00
  • e434b9ceb5 Merge pull request #8397 from WhiteHusky/arousal-related-styling-fixes kevinz000 2019-05-25 11:30:18 -07:00
  • dd2259c11c Automatic changelog generation for PR #8399 [ci skip] CitadelStationBot 2019-05-25 13:29:24 -05:00
  • aeace88306 Merge pull request #8399 from Poojawa/doctor-chemistry kevinz000 2019-05-25 11:29:20 -07:00
  • e4b9fe7359 Automatic changelog generation for PR #8398 [ci skip] CitadelStationBot 2019-05-25 13:28:43 -05:00
  • deffcb3226 Merge pull request #8398 from BurgerLUA/AntiAssSlap kevinz000 2019-05-25 11:28:39 -07:00
  • 83f65f248d Automatic changelog generation for PR #8407 [ci skip] CitadelStationBot 2019-05-25 13:20:26 -05:00
  • aab5a4ae0a Merge pull request #8407 from Poojawa/sprite-fixing kevinz000 2019-05-25 11:20:23 -07:00
  • e8742a4937 Merge pull request #8402 from CdrCross/AdvDefibProofread kevinz000 2019-05-25 11:17:34 -07:00
  • 2bc0caa7fe Automatic changelog generation for PR #8409 [ci skip] CitadelStationBot 2019-05-25 13:13:58 -05:00