Commit Graph

  • 1a1e362e80 Merge pull request #11310 from Citadel-Station-13/Ghommie-patch-2 Lin 2020-03-04 13:29:13 -06:00
  • 36e37feae8 Removed some bad flavor objectives. Putnam 2020-03-04 11:23:53 -08:00
  • 1c310f6cee Update hardsuit.dm Trilbyspaceclone 2020-03-04 13:01:25 -05:00
  • 733cdd1c40 Automatic changelog generation for PR #11277 [ci skip] CitadelStationBot 2020-03-04 10:11:42 -06:00
  • 7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point Ghom 2020-03-04 17:11:39 +01:00
  • 0b777c5efc Automatic changelog generation for PR #11303 [ci skip] CitadelStationBot 2020-03-04 10:11:15 -06:00
  • 6dd27506e1 Merge pull request #11303 from Citadel-Station-13/kevinz000-patch-22 Ghom 2020-03-04 17:11:12 +01:00
  • a2fe9f0d23 Update toys.dm Ghom 2020-03-04 17:03:26 +01:00
  • 0b74bc9da3 Update twohanded.dm Ghom 2020-03-04 16:43:57 +01:00
  • 7c8b490cb3 Update energy.dm Ghom 2020-03-04 16:40:28 +01:00
  • 60c7268e37 Also fixing bloodsucker coffins. Ghommie 2020-03-04 16:29:09 +01:00
  • 0d312b8dff only way kevinz000 2020-03-04 08:02:28 -07:00
  • f2c8a7cd6f Porting a couple material datums code updates and fixes. Ghommie 2020-03-04 15:59:46 +01:00
  • f40af6014c Automatic changelog generation for PR #11314 [ci skip] CitadelStationBot 2020-03-04 08:40:05 -06:00
  • 976080d7b2 Merge pull request #11314 from KathrinBailey/Kat-Furniture Ghom 2020-03-04 15:40:01 +01:00
  • 8c6b5b49c5 Update contraband.dm Ghom 2020-03-04 15:39:23 +01:00
  • 11750b4fa9 removed redundant icon line KathrinBailey 2020-03-04 14:16:27 +00:00
  • c28a78de3d ok kevinz000 2020-03-04 06:41:53 -07:00
  • dfababf692 Automatic changelog generation for PR #11321 [ci skip] CitadelStationBot 2020-03-04 07:31:12 -06:00
  • df5b4ab56d Merge pull request #11321 from kevinz000/storage_components_are_bad Ghom 2020-03-04 14:31:09 +01:00
  • 1ae4ef16bc sigh kevinz000 2020-03-04 06:03:51 -07:00
  • f67fa08f0f Merge pull request #11274 from Citadel-Station-13/Ghommie-patch-5 kevinz000 2020-03-04 05:58:44 -07:00
  • edfe50579e ACTUALLY fixes null runtimes + double contracts Kraseo 2020-03-04 13:17:24 +01:00
  • 4ac2848282 fixes contract target blacklisting Kraseo 2020-03-04 12:35:36 +01:00
  • e243dc689b index kevinz000 2020-03-04 03:12:46 -07:00
  • ed304a8fdc whew! kevinz000 2020-03-04 02:42:24 -07:00
  • 8923b7e72d minimaps kevinz000 2020-03-04 01:21:16 -07:00
  • 43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. BlackMajor 2020-03-04 19:12:56 +13:00
  • 5e2414bd90 fix kevinz000 2020-03-03 22:25:35 -07:00
  • 18bdb753d3 bet kevinz000 2020-03-03 21:13:59 -07:00
  • 0cf7f2e882 Update energy.dm kevinz000 2020-03-03 21:07:24 -07:00
  • 2d02ae0077 oops kevinz000 2020-03-03 21:06:29 -07:00
  • cbf2355f19 Update code/datums/elements/sword_point.dm kevinz000 2020-03-03 21:06:05 -07:00
  • 6354b48659 fix kevinz000 2020-03-03 20:58:06 -07:00
  • 7291417244 fix kevinz000 2020-03-03 20:57:03 -07:00
  • b6431b0ef6 changes kevinz000 2020-03-03 20:54:53 -07:00
  • f8187d0fbf optimize move under living kevinz000 2020-03-03 20:51:50 -07:00
  • 334f1cc1cf linzolle kevinz000 2020-03-03 20:48:39 -07:00
  • b2be57d5fe macro recursion woops kevinz000 2020-03-03 20:43:54 -07:00
  • 1d198aca88 CHECK_MOBILITY kevinz000 2020-03-03 20:41:08 -07:00
  • 8b0b685fa7 CHECK_MOBILITY kevinz000 2020-03-03 20:40:33 -07:00
  • a883a1a7bf Automatic changelog generation for PR #11308 [ci skip] CitadelStationBot 2020-03-03 21:28:50 -06:00
  • 90188c51bf Merge pull request #11308 from Putnam3145/stop-lag kevinz000 2020-03-03 20:28:47 -07:00
  • 4c68baece9 Automatic changelog generation for PR #11320 [ci skip] CitadelStationBot 2020-03-03 21:18:06 -06:00
  • c97fd1e41e Merge pull request #11320 from Citadel-Station-13/Ghommie-patch-4 Putnam3145 2020-03-03 19:18:03 -08:00
  • 97733e464d ghommie change and armrest bug fix KathrinBailey 2020-03-04 01:35:00 +00:00
  • 3059e48278 Removed 30TC thing from martyr/hijack Putnam 2020-03-03 16:46:41 -08:00
  • 284ef326c7 Stops ninjas employed by syndies from receiving friendly flavor objectives. Ghom 2020-03-04 00:36:18 +01:00
  • 49ad376e5e Adds a very basic soft restriction system. There's definite room for improvement, but this is good enough for now. Am too hongry for this. deathride58 2020-03-03 17:44:10 -05:00
  • a452cfb31b ouch Ghommie 2020-03-03 22:26:56 +01:00
  • 9aa712d84b Fixes and improves RCL sprite update procs. Ghommie 2020-03-03 22:19:12 +01:00
  • 519de6a83d while im at it - Improves the appearance of the antenna synth antenna by slimming down the south-facing and north-facing side of the synth head sprite and moving the antennae closer together by one pixel deathride58 2020-03-03 16:12:33 -05:00
  • 560192c45a Does the thing - PORTS THE BEEPERS! also fixes a bug where body markings dont render if their name doesnt match the iconstate deathride58 2020-03-03 15:49:25 -05:00
  • 7a539d0a78 Automatic changelog generation for PR #11289 [ci skip] CitadelStationBot 2020-03-03 14:30:17 -06:00
  • 62eef87835 Merge pull request #11289 from Trilbyspaceclone/patch-301 Ghom 2020-03-03 21:30:14 +01:00
  • 0b5481f9b9 Merge pull request #11237 from kevinz000/reagent_logging_3 Ghom 2020-03-03 21:27:17 +01:00
  • 622a060857 use defines Lin 2020-03-03 20:22:57 +00:00
  • 6e4a22f4fe fix boop Lin 2020-03-03 20:18:08 +00:00
  • 9efdad1d6b Initial commit - lays out the foundation for a more robust limb icon override system. You're welcome. deathride58 2020-03-03 13:55:33 -05:00
  • d318525078 Update shuttle.dm Ghom 2020-03-03 15:43:10 +01:00
  • b7dda0080d Fixes cargo passive point gen (ergo making it 125 a minute and not 1000+) Ghom 2020-03-03 15:40:53 +01:00
  • 86790c69a5 credits accidently left out previously KathrinBailey 2020-03-03 14:38:16 +00:00
  • beef891789 Update area_copy.dm Ghom 2020-03-03 15:12:54 +01:00
  • 490ad4373d Update area_copy.dm Ghom 2020-03-03 15:12:06 +01:00
  • b378da2468 Update energy.dm Ghom 2020-03-03 15:06:42 +01:00
  • edc53770ea Update area_copy.dm Ghom 2020-03-03 15:05:32 +01:00
  • c0d4c30711 Update _lists.dm Ghom 2020-03-03 14:57:32 +01:00
  • 7e0abda3c1 fixing merge conflicts KathrinBailey 2020-03-03 13:56:01 +00:00
  • 83ec1e428c Merge remote-tracking branch 'upstream/master' into Kat-Furniture KathrinBailey 2020-03-03 13:48:18 +00:00
  • fe7742637f fixing merge conflicts aaahh KathrinBailey 2020-03-03 13:47:58 +00:00
  • d32b6ad7e9 ok Trilbyspaceclone 2020-03-03 08:47:17 -05:00
  • a240daaca2 Final changes KathrinBailey 2020-03-03 13:19:15 +00:00
  • 107a6434fd Merge pull request #11305 from Citadel-Station-13/kevinz000-patch-23 Ghom 2020-03-03 13:36:52 +01:00
  • 9027f04691 Automatic changelog generation for PR #11203 [ci skip] CitadelStationBot 2020-03-03 06:29:56 -06:00
  • f9a2326437 Merge pull request #11203 from Trilbyspaceclone/poster Ghom 2020-03-03 13:29:54 +01:00
  • 14c1057148 Automatic changelog generation for PR #11250 [ci skip] CitadelStationBot 2020-03-03 06:26:22 -06:00
  • 81bb6978de Merge pull request #11250 from Seris02/risingbassnerf Ghom 2020-03-03 13:26:19 +01:00
  • 6869f5526d Automatic changelog generation for PR #11299 [ci skip] CitadelStationBot 2020-03-03 06:24:35 -06:00
  • 6da3cf3bbb Merge pull request #11299 from Citadel-Station-13/Linzolle-patch-1 Ghom 2020-03-03 13:24:32 +01:00
  • d679dc662c Automatic changelog generation for PR #11300 [ci skip] CitadelStationBot 2020-03-03 06:24:18 -06:00
  • 294668d6e1 Merge pull request #11300 from kappa-sama/patch-11 Ghom 2020-03-03 13:24:15 +01:00
  • c7fe9d31e2 Merge pull request #11311 from Citadel-Station-13/kevinz000-patch-19 Ghom 2020-03-03 13:23:28 +01:00
  • 3a80d59330 Merge pull request #11312 from Citadel-Station-13/kevinz000-patch-24 Ghom 2020-03-03 13:23:12 +01:00
  • 0adaa514f0 Merge pull request #11313 from Citadel-Station-13/kevinz000-patch-25 Ghom 2020-03-03 13:22:55 +01:00
  • 8c4c2842d0 fixes and code improvements Seris02 2020-03-03 19:27:09 +08:00
  • 1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags kevinz000 2020-03-03 03:08:41 -07:00
  • c21bd60929 fix kevinz000 2020-03-03 03:04:23 -07:00
  • c3913a793a Update carbon_movement.dm kevinz000 2020-03-03 03:02:16 -07:00
  • 81f84f1bd1 Update garbage.dm kevinz000 2020-03-02 18:18:44 -07:00
  • 49939b0973 Update overmind.dm kevinz000 2020-03-02 18:15:18 -07:00
  • fde24492b9 Merge pull request #11294 from Ghommie/Ghommie-cit596 Lin 2020-03-02 18:31:25 -06:00
  • 4315a4d1b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties Kraseo 2020-03-02 23:06:29 +01:00
  • bee392257e Update monkey.dm Ghom 2020-03-02 23:02:16 +01:00
  • 99841c9447 Update pai_shell.dm Ghom 2020-03-02 23:00:41 +01:00
  • aa1f9a3695 Update _drone.dm Ghom 2020-03-02 22:59:00 +01:00
  • 15fed0386c Update lizard.dm Ghom 2020-03-02 22:56:15 +01:00
  • 2d931ab3b6 Automatic changelog generation for PR #11270 [ci skip] CitadelStationBot 2020-03-02 15:46:52 -06:00
  • c984cd7677 Merge pull request #11270 from ancientpower/paramedic-tweaks Ghom 2020-03-02 22:46:49 +01:00
  • 6f74d2a188 Update elite.dm Ghom 2020-03-02 22:34:29 +01:00
  • 3cba19dea7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stop-lag Putnam 2020-03-02 11:24:49 -08:00