Commit Graph

  • 9d8e12fa4a Automatic changelog generation for PR #10265 [ci skip] CitadelStationBot 2019-12-27 15:54:39 -06:00
  • 93248336ea Merge pull request #10265 from Trilbyspaceclone/map_redo Ghom 2019-12-27 22:54:35 +01:00
  • 1a886adc3d FIXEdD Commandersand 2019-12-27 13:01:14 -06:00
  • 60905cc09b loadout Commandersand 2019-12-27 12:44:08 -06:00
  • 815e57697d vending Commandersand 2019-12-27 12:29:39 -06:00
  • 6b6ef569c2 fix Commandersand 2019-12-27 12:14:46 -06:00
  • 45e6cca8b8 clothing add Commandersand 2019-12-27 11:53:57 -06:00
  • 21cfb2914b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 Ghommie 2019-12-27 17:49:59 +01:00
  • b4c0433d6d more work. Ghommie 2019-12-27 17:45:19 +01:00
  • aa04f87425 sprites Commandersand 2019-12-27 10:42:58 -06:00
  • 0b6242e25d let the adminbus commence Seris02 2019-12-28 00:40:55 +08:00
  • 21c6cdec42 Automatic changelog generation for PR #10296 [ci skip] CitadelStationBot 2019-12-27 09:30:16 -06:00
  • 13fc20c7c3 Merge pull request #10296 from Useroth/ghostcafe Ghom 2019-12-27 16:30:13 +01:00
  • 160e8c1ec5 stunglasses Seris02 2019-12-27 23:21:40 +08:00
  • ca18f283e2 Nerfs armor and antistun Arturlang 2019-12-27 16:18:05 +01:00
  • a3776fb966 Small touch-up. Useroth 2019-12-27 16:05:07 +01:00
  • c3298d525f Good idea, tbh. Useroth 2019-12-27 15:57:49 +01:00
  • 92c88f71c3 Automatic changelog generation for PR #10298 [ci skip] CitadelStationBot 2019-12-27 06:37:41 -06:00
  • afd22cf618 Merge pull request #10298 from kappa-sama/patch-12 Ghom 2019-12-27 13:37:38 +01:00
  • 56b9d3ef61 Automatic changelog generation for PR #10264 [ci skip] CitadelStationBot 2019-12-27 06:27:07 -06:00
  • 5873ee8ea8 Merge pull request #10264 from Seris02/wintercoatsagain Ghom 2019-12-27 13:27:04 +01:00
  • 4e1a9b83cf Pushing work for tonight. BlackMajor 2019-12-28 01:01:26 +13:00
  • b4b6e550e4 Merge branch 'wintercoatsagain' of https://github.com/Seris02/Citadel-Station-13 into wintercoatsagain Seris02 2019-12-27 18:10:51 +08:00
  • 8ed4fe9c05 changes Seris02 2019-12-27 18:09:30 +08:00
  • e0e521977a Start just to make the PR BlackMajor 2019-12-27 22:37:57 +13:00
  • 870a64515c Update tgstation.dme EmeraldSundisk 2019-12-26 21:44:41 -08:00
  • 6b6745b3a5 Merge pull request #11 from Citadel-Station-13/master EmeraldSundisk 2019-12-26 21:16:15 -08:00
  • d333a0225e Renamed "Classic" to "Random". Putnam 2019-12-26 18:08:10 -08:00
  • a4f12af2e6 Update engine_goggles.dm Trilbyspaceclone 2019-12-26 19:28:16 -05:00
  • f8557c8ae4 v o t e s a v i n g Putnam 2019-12-26 12:13:02 -08:00
  • e97ca5f924 yeah fair enough kappa-sama 2019-12-26 14:22:03 -05:00
  • 1dcee075e6 f kappa-sama 2019-12-26 14:20:43 -05:00
  • 35846c452a Applied suggestions and minor tweaks. Useroth 2019-12-26 20:03:43 +01:00
  • 05775ae5f6 Automatic changelog generation for PR #10250 [ci skip] CitadelStationBot 2019-12-26 09:11:57 -06:00
  • 05bde370ec Merge pull request #10250 from Michiyamenotehifunana/polyshorts-for-digis Ghom 2019-12-26 16:11:54 +01:00
  • 34c36161fc Automatic changelog generation for PR #10281 [ci skip] CitadelStationBot 2019-12-26 09:07:48 -06:00
  • 12d0a2ee4c Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head Ghom 2019-12-26 16:07:45 +01:00
  • 4c6673b651 Automatic changelog generation for PR #10283 [ci skip] CitadelStationBot 2019-12-26 09:07:21 -06:00
  • 12ca3a008e Merge pull request #10283 from Detective-Google/unfuckhair Ghom 2019-12-26 16:07:18 +01:00
  • 0e16f4052d Merge pull request #10292 from Citadel-Station-13/miku-fix Ghom 2019-12-26 16:06:19 +01:00
  • 3203441abe Nope, it didn't compile, Harold. Ghom 2019-12-26 15:48:46 +01:00
  • fac8f5dd84 Automatic changelog generation for PR #10128 [ci skip] CitadelStationBot 2019-12-26 06:58:48 -06:00
  • 512d046f18 Merge pull request #10128 from Seris02/clownheadset Ghom 2019-12-26 13:58:45 +01:00
  • e125dae871 yee Seris02 2019-12-26 16:36:01 +08:00
  • 4689d805a3 e kappa-sama 2019-12-26 02:54:38 -05:00
  • 940efc0c1c holy shit i hope this compiles Hatterhat 2019-12-26 01:46:04 -06:00
  • a471e26d9c WOW WHOOPS Putnam 2019-12-25 22:53:49 -08:00
  • cbff758d1a Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility. Useroth 2019-12-26 07:49:48 +01:00
  • 9f839ec274 e kappa-sama 2019-12-26 01:46:59 -05:00
  • 63112c2f49 while we're at it let's make it work for all of 'em Putnam 2019-12-25 18:30:25 -08:00
  • 5764ccef1b Allowed preventing dynamic storytellers if too common recently Putnam 2019-12-25 16:16:11 -08:00
  • 72cb63ae7e chaotic shouldn't have so many events Putnam 2019-12-25 14:23:47 -08:00
  • 7892d84f09 Automatic changelog generation for PR #10237 [ci skip] CitadelStationBot 2019-12-25 13:06:49 -06:00
  • 5670276c70 Merge pull request #10237 from Ghommie/Ghommie-cit479 Lin 2019-12-25 19:06:46 +00:00
  • 1320952cdf Automatic changelog generation for PR #10242 [ci skip] CitadelStationBot 2019-12-25 13:03:45 -06:00
  • 1931a2f715 Merge pull request #10242 from Ghommie/Ghommie-cit483 Lin 2019-12-25 19:03:42 +00:00
  • 27d8684d2d and a line break goes there Putnam 2019-12-25 00:26:24 -08:00
  • 02bfab6bf3 made it Taller Putnam 2019-12-25 00:25:59 -08:00
  • b33a167906 fixes bad sprite states Jay 2019-12-25 02:22:10 -06:00
  • 88222c0901 uh, actually did that Putnam 2019-12-24 23:58:22 -08:00
  • 0b1b249eba just makes alcohol toxic rather than drunk-inducing Putnam 2019-12-24 23:53:33 -08:00
  • 8dd67afb9c Update pai_defense.dm kevinz000 2019-12-24 23:43:16 -08:00
  • 95281ab590 Made ion storm not THE ONLY EVENT THAT WILL RUN ON STORY Putnam 2019-12-24 23:20:28 -08:00
  • c12c89e01d Added storyteller to dynamic game mode panel. Putnam 2019-12-24 23:20:18 -08:00
  • 1c34ab661d Update BoxStation.dmm TrilbySpaceClone 2019-12-25 02:07:33 -05:00
  • 5cd9edb37f also make weight adjustment round-to-round work, probs Putnam 2019-12-24 22:05:04 -08:00
  • f38d1ab218 better make that logging work Putnam 2019-12-24 22:04:43 -08:00
  • 6a5a917944 [s] fixes a little door assembly glass dupe exploit Ghommie 2019-12-25 07:00:53 +01:00
  • 57cecd2499 work Ghommie 2019-12-25 06:54:44 +01:00
  • 6058253dcf logging! Putnam 2019-12-24 20:20:27 -08:00
  • f3fed71e08 ah, the wonders of atomization Hatterhat 2019-12-24 21:28:32 -06:00
  • ffa013af6e Minor captains closet cleanup. Ghommie 2019-12-25 03:59:21 +01:00
  • 765832373d Automatic changelog generation for PR #10266 [ci skip] CitadelStationBot 2019-12-24 20:43:32 -06:00
  • e7cf680ca7 Merge pull request #10266 from shellspeed1/master Ghom 2019-12-25 03:43:29 +01:00
  • 60134ea8ae [s] Fixes singularity pulls duping rods out of engine floors. Ghommie 2019-12-25 03:34:42 +01:00
  • 124ea51c09 Revert "vote overhaul start" Putnam 2019-12-24 17:52:33 -08:00
  • cd6bf76803 f Ghommie 2019-12-25 01:41:35 +01:00
  • 53d142b4c0 more work. Ghommie 2019-12-25 01:34:33 +01:00
  • a480d00c94 unfucks short hair 80s so the left facing sprite doesnt make you look like a crackhead Detective Google 2019-12-24 17:05:07 -06:00
  • c50c1ee4df Automatic changelog generation for PR #10282 [ci skip] CitadelStationBot 2019-12-24 15:07:44 -06:00
  • c022325159 Merge pull request #10282 from Putnam3145/fix-config kevinz000 2019-12-24 13:07:40 -08:00
  • ca1f7839bb Updating dynamic config, some balancing Putnam 2019-12-24 10:10:24 -08:00
  • 713e69189f Merge pull request #6 from Citadel-Station-13/master r4d6 2019-12-24 12:33:31 -05:00
  • 51200db298 update (#5) r4d6 2019-12-24 12:22:43 -05:00
  • b48f18fbc6 Automatic changelog generation for PR #9751 [ci skip] CitadelStationBot 2019-12-24 09:57:13 -06:00
  • c38611afcd Merge pull request #9751 from Seris02/rising_bass Ghom 2019-12-24 16:57:10 +01:00
  • a106fde6cc a few fixes here and there and updating it Seris02 2019-12-24 23:38:27 +08:00
  • 85c5a5dfa1 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass Seris02 2019-12-24 22:29:46 +08:00
  • 9e6f0762b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass Seris02 2019-12-24 22:27:41 +08:00
  • d1c96237a6 the very shitty idea: "muh speedloader" Hatterhat 2019-12-24 04:16:33 -06:00
  • 681508482c magazine metal cost tweaks, speedloader in AIB Hatterhat 2019-12-24 04:15:25 -06:00
  • 6ed808f033 Merge branch 'master' into xantholne-christmas02 Unknown 2019-12-24 02:56:13 -07:00
  • f852f497bd Removed extra uniform icons Unknown 2019-12-24 02:47:46 -07:00
  • 232811dd18 vote overhaul start Putnam 2019-12-23 22:43:54 -08:00
  • ea85a3e521 Storytellers do more things now Putnam 2019-12-23 22:09:29 -08:00
  • 24e5bf0d18 reobfuscated dynamic vote Putnam 2019-12-23 20:16:43 -08:00
  • 976c725de2 ok fermis stays kevinz000 2019-12-23 18:32:08 -08:00
  • ceeab2db39 no longer carbon burning Trilbyspaceclone 2019-12-23 21:00:29 -05:00
  • ca387d2bdb Update others.dm Trilbyspaceclone 2019-12-23 20:51:37 -05:00
  • ab34faa41d fix taur Ghommie 2019-12-24 02:01:45 +01:00