Commit Graph

  • 99e1852493 Can be toned down JUUUUUUUST a smidge. Let's see how this new value works in practice deathride58 2018-08-11 20:45:17 -04:00
  • 761f2f931b tweaks Unknown 2018-08-09 10:16:15 +02:00
  • 7bd8907b9b Revert "adds secpod" nik707 2018-08-08 20:05:54 -05:00
  • 376e2665c0 Update doppler_array.dm kevinz000 2018-08-08 12:20:33 -07:00
  • d6e6d0f70b Ports the lovely vending machine UI by Andrew Montagne from Oracle Unknown 2018-08-08 15:07:00 +02:00
  • 054be386de readded defines; tweaked size Unknown 2018-08-08 12:39:19 +02:00
  • 9ca7e38f7a Blurry eyes just got blurrier Unknown 2018-08-08 11:24:21 +02:00
  • 64e0a494cb Merge pull request #7438 from Citadel-Station-13/donatorfix3 LetterJay 2018-08-07 09:15:00 -05:00
  • 0657990182 Update puzzle.dm kevinz000 2018-08-07 04:46:41 -07:00
  • 4ff02b5a8b Sliding Puzzle kevinz000 2018-08-07 04:43:35 -07:00
  • 070448f68f fix LetterJay 2018-08-06 11:35:58 -05:00
  • cdd37e268f adds secpod nik707 2018-08-06 01:36:32 -05:00
  • fbf1774bc9 fix for command greytide nik707 2018-08-06 00:30:09 -05:00
  • 626c5a018e Update __donator.dm LetterJay 2018-08-05 20:14:52 -05:00
  • f5419862d2 Automatic changelog generation for PR #7386 [ci skip] CitadelStationBot 2018-08-03 23:22:09 -05:00
  • 26a11df5c5 Merge pull request #7386 from Citadel-Station-13/photography_update deathride58 2018-08-04 00:22:07 -04:00
  • d79712cbbf Merge pull request #7404 from Citadel-Station-13/hairstyles deathride58 2018-08-04 00:21:56 -04:00
  • 438daa7acf Merge pull request #7411 from Citadel-Station-13/kevinz000-patch-3 deathride58 2018-08-04 00:21:44 -04:00
  • caeb298d82 Merge pull request #7415 from Poojawa/patch-1 deathride58 2018-08-04 00:21:33 -04:00
  • 2808425e7f Merge branch 'master' into kevinz000-patch-2 deathride58 2018-08-04 00:10:09 -04:00
  • 2840a3f933 Merge pull request #7416 from Citadel-Station-13/kevinz000-patch-5 deathride58 2018-08-04 00:09:05 -04:00
  • d9c751114b Merge pull request #7417 from Citadel-Station-13/kevinz000-patch-6 deathride58 2018-08-04 00:08:56 -04:00
  • c4c7e162a1 Merge pull request #7433 from Citadel-Station-13/kevinz000-patch-11 deathride58 2018-08-04 00:08:34 -04:00
  • bbb5c1f6d5 Merge pull request #7432 from Citadel-Station-13/quickfix002 deathride58 2018-08-04 00:08:00 -04:00
  • 5faf02a4b2 Merge pull request #7419 from Citadel-Station-13/kevinz000-patch-1 deathride58 2018-08-04 00:05:33 -04:00
  • d23f0b23a3 Hopefully working re-merge of #7391 with some other minor tweaks (#7401) nik707 2018-08-03 21:32:19 -05:00
  • 94c992c065 Update .gitignore kevinz000 2018-08-03 19:31:50 -07:00
  • f343814a15 Automatic changelog generation for PR #7360 [ci skip] CitadelStationBot 2018-08-03 21:30:11 -05:00
  • 72231976a7 Replaces plasma in execution syringes with amatoxin (#7360) Hatterhat 2018-08-03 21:30:10 -05:00
  • 047d757bfd Automatic changelog generation for PR #7405 [ci skip] CitadelStationBot 2018-08-03 21:29:46 -05:00
  • 42083d7206 Removes combat rework training wheels, and nerfs myself by increasing the minimum stamloss required to throw a knockout punch with boxing gloves (#7405) deathride58 2018-08-03 22:29:44 -04:00
  • b8529c098f Automatic changelog generation for PR #7368 [ci skip] CitadelStationBot 2018-08-03 21:29:21 -05:00
  • 4208d6ea5f Adds boombox donor item for Raiq/chefferz (#7368) deathride58 2018-08-03 22:29:19 -04:00
  • 6353b26822 Update client_procs.dm kevinz000 2018-08-03 19:26:41 -07:00
  • a56220634a i have no idea LetterJay 2018-08-03 19:47:21 -05:00
  • 0ee8542677 Update toolbox.dm kevinz000 2018-08-01 21:27:43 -07:00
  • ff8f5046f9 Update misc.dm kevinz000 2018-08-01 21:24:03 -07:00
  • abd40802aa fixes medbay disposals nik707 2018-08-01 19:45:56 -05:00
  • 850eb21df9 Update robot_modules.dm kevinz000 2018-08-01 16:43:47 -07:00
  • 3d734421d4 Merge pull request #7422 from Citadel-Station-13/m41 LetterJay 2018-08-01 12:30:58 -05:00
  • 166e6b66de Update toys.dm LetterJay 2018-08-01 08:41:10 -05:00
  • 77b3c46dbf moves some stuff around LetterJay 2018-08-01 08:07:56 -05:00
  • ce4da89cf1 Update custom_items.dm LetterJay 2018-08-01 07:32:16 -05:00
  • 7293bf85b5 Update custom_items.dm LetterJay 2018-08-01 07:22:41 -05:00
  • 70fc9ce348 fucking missed a disposal pipe kill me <3 nik707 2018-07-31 14:32:32 -05:00
  • e475970385 donate LetterJay 2018-07-30 09:23:12 -05:00
  • 17f06747ac Automatic changelog generation for PR #7409 [ci skip] CitadelStationBot 2018-07-30 01:29:27 -05:00
  • 6337fb77ec ports 3 new borg sprites from rp's codebase to main's. (#7409) slate 2018-07-30 00:29:25 -06:00
  • 7147d23c00 Update hypovial.dm kevinz000 2018-07-29 17:10:33 -07:00
  • 8b7fa2396b Update shuttles.dm kevinz000 2018-07-29 17:04:55 -07:00
  • afa8003451 extremely critical addition of a jukebox to pubby bar nik707 2018-07-29 12:20:10 -05:00
  • 4eec300170 Merge pull request #7413 from Citadel-Station-13/zozzle deathride58 2018-07-28 09:20:24 -04:00
  • 6b88d1843d Merge pull request #7385 from Citadel-Station-13/kevinz000-patch-1 deathride58 2018-07-28 09:18:06 -04:00
  • f637425108 Merge pull request #7387 from Citadel-Station-13/wormhole_update deathride58 2018-07-28 09:17:00 -04:00
  • abd4ca17b2 Merge pull request #7410 from Citadel-Station-13/kevinz000-patch-2 deathride58 2018-07-28 09:13:34 -04:00
  • 349eb64e53 Update hypovial.dm kevinz000 2018-07-28 03:11:01 -07:00
  • b35ea6b472 Update hypospraymkii.dm kevinz000 2018-07-28 03:09:58 -07:00
  • d156b50331 Makes carp edible Poojawa 2018-07-28 01:53:37 -05:00
  • 6722d9a20f yea LetterJay 2018-07-27 09:03:03 -05:00
  • 9325319da1 Update special.dm kevinz000 2018-07-26 16:44:08 -07:00
  • 60ed121a58 adds missing camera nik707 2018-07-26 14:19:14 -05:00
  • 5b76760b29 Ports virgo hairstyles kevinz000 2018-07-25 00:28:04 -07:00
  • 03843f1b20 Update asset_cache.dm kevinz000 2018-07-26 00:43:52 -07:00
  • 44f8c3b0fb Merge pull request #7408 from Citadel-Station-13/NoMoreW LetterJay 2018-07-25 23:56:32 -05:00
  • fc21ee9f36 REMOVE LetterJay 2018-07-25 22:12:34 -05:00
  • 698727e18a adds a seemingly missing light to a dark corner in engineering nik707 2018-07-25 19:38:18 -05:00
  • d41dd29a0d Revert "readds missing light in engineering" nik707 2018-07-25 19:32:54 -05:00
  • 6b7a0f5eab readds missing light in engineering nik707 2018-07-25 19:31:48 -05:00
  • 3c6b63f899 Merge pull request #7406 from Citadel-Station-13/anotherfix LetterJay 2018-07-25 07:08:45 -05:00
  • 42cb534ad0 sprite/desc change LetterJay 2018-07-25 06:38:54 -05:00
  • 00473c4b75 Merge pull request #7382 from Citadel-Station-13/kevinz000-patch-2 deathride58 2018-07-24 10:31:36 -04:00
  • bc9cc90fb4 Merge pull request #7403 from Citadel-Station-13/quickfix deathride58 2018-07-24 10:29:17 -04:00
  • 5ccda57266 Update wormhole.dm kevinz000 2018-07-24 01:01:15 -07:00
  • db7465910e another small fix nik707 2018-07-23 18:44:44 -05:00
  • ae6d1b623a pubby changes 2: electric boogaloo. nik707 2018-07-23 14:39:09 -05:00
  • dbe376d751 bad names/var LetterJay 2018-07-23 07:52:13 -05:00
  • d7780aa300 Merge pull request #7398 from Citadel-Station-13/luckyjack LetterJay 2018-07-22 21:33:21 -05:00
  • 70bdea81ec Update world.dm kevinz000 2018-07-22 16:46:52 -07:00
  • 31424150a6 [s] Hopefully working re-merge of #7391 nik707 2018-07-22 16:36:30 -05:00
  • 82027db961 thing LetterJay 2018-07-22 00:07:22 -05:00
  • c5ea93cb08 Merge pull request #7396 from Cw3040/revert-7391-nicc's-map-changes deathride58 2018-07-22 00:25:24 -04:00
  • 051735f245 Revert "reopens corridor between chem and rnd (#7391)" Cw 3040 2018-07-21 23:53:00 -04:00
  • 45ce574513 reopens corridor between chem and rnd (#7391) nik707 2018-07-21 20:32:26 -05:00
  • 22069cd841 Update album.dm kevinz000 2018-07-21 13:23:02 -07:00
  • dfb5837784 dhonk: not a conflict edition (#7389) Letter N 2018-07-22 03:57:09 +08:00
  • e29016b257 Update wormhole.dm kevinz000 2018-07-21 02:17:54 -07:00
  • 6e03770b93 Wormhole Update kevinz000 2018-07-21 01:07:21 -07:00
  • 2a6e4fce59 Photography Update kevinz000 2018-07-20 15:22:00 -07:00
  • 141edb25e8 Automatic changelog generation for PR #7359 [ci skip] CitadelStationBot 2018-07-20 05:42:32 -05:00
  • d0cb979b0a Experimental - reduces space ruin z-level count to 1 (#7359) deathride58 2018-07-20 06:42:30 -04:00
  • d155ec693c Automatic changelog generation for PR #7372 [ci skip] CitadelStationBot 2018-07-20 05:42:13 -05:00
  • fea27b5613 Adds citadel snowflake features as UE blocks (#7372) deathride58 2018-07-20 06:42:11 -04:00
  • 1c7fb0f12f Automatic changelog generation for PR #7361 [ci skip] CitadelStationBot 2018-07-20 05:41:36 -05:00
  • 6670284b62 fixes items spawning on top of closets rather than inside closets (#7361) deathride58 2018-07-20 06:41:34 -04:00
  • 13a091f9a9 Automatic changelog generation for PR #7378 [ci skip] CitadelStationBot 2018-07-20 05:41:13 -05:00
  • 6cef81d979 It's a feature now - makes it plausible to use custom say verbs in place of emotes (allows proper non-buggy emotes over radio) (#7378) deathride58 2018-07-20 06:41:12 -04:00
  • ae2cd49de0 Automatic changelog generation for PR #7362 [ci skip] CitadelStationBot 2018-07-20 05:40:41 -05:00
  • f1739cb482 Upstream fix mirror spree (#7362) deathride58 2018-07-20 06:40:39 -04:00
  • c82e341278 Automatic changelog generation for PR #7147 [ci skip] CitadelStationBot 2018-07-20 05:39:55 -05:00
  • 77c2970b49 buffs the syndicate mask, makes it cost 2 tc (#7147) deathride58 2018-07-20 06:39:54 -04:00