Commit Graph

  • 70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport keronshb 2021-05-31 22:21:34 -04:00
  • 84db564e0f Prettier? code Arturlang 2021-06-01 02:25:06 +03:00
  • 4b541d3dac phonecode Arturlang 2021-06-01 02:21:33 +03:00
  • cb52be5dd9 fixes linter warnings (#14778) silicons 2021-05-31 09:19:20 -06:00
  • 8687312935 Makes orbit menu show antags if DNR Artur 2021-05-31 18:14:06 +03:00
  • e69729beb4 So he doesn't need sodium thiopental after all. WanderingFox95 2021-05-31 12:15:16 +02:00
  • dd6452ad5b Fixes the file? Please? WanderingFox95 2021-05-31 10:11:12 +02:00
  • b3851a4647 Adds the event to the game so it actually loads, oops WanderingFox95 2021-05-31 10:01:13 +02:00
  • 249d23a6cc Fixed something with the event WanderingFox95 2021-05-31 09:52:31 +02:00
  • f70d6b9ea5 dir = 1 and adds a forgotten fire alarm. bunny232 2021-05-31 01:52:43 -04:00
  • ff379e41b6 Think map preview think! bunny232 2021-05-31 01:47:49 -04:00
  • 2ef7516bee Automatic changelog compile [ci skip] Changelogs 2021-05-31 01:05:48 +00:00
  • 398491b584 It's on the nose but here's a sound for the spawn. WanderingFox95 2021-05-31 00:42:33 +02:00
  • 2516afbbba Cat Surgeon Event WanderingFox95 2021-05-31 00:41:59 +02:00
  • ae2970f318 Adds a special Catranq Dart WanderingFox95 2021-05-30 21:17:03 +02:00
  • df0e1057d1 Imagine this crazy person became a threat suddenly WanderingFox95 2021-05-30 21:15:44 +02:00
  • 5563ed1492 Bump ws from 7.4.3 to 7.4.6 in /tgui dependabot[bot] 2021-05-30 17:06:12 +00:00
  • 0dc1163a29 adds a sorely needed line break Putnam 2021-05-30 00:44:02 -07:00
  • 6d2c60b7ad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 Putnam 2021-05-30 00:40:08 -07:00
  • 9040c08698 whoops i forgot the var Putnam 2021-05-30 00:38:07 -07:00
  • 2ab05d1247 makes sniper zooming work Putnam 2021-05-30 00:31:20 -07:00
  • 1c17570ea8 works but leaks Putnam 2021-05-30 00:28:51 -07:00
  • 4ca4d02fd8 Automatic changelog compile [ci skip] Changelogs 2021-05-30 00:58:43 +00:00
  • ef7a611baa Merge pull request #14769 from Citadel-Station-13/silicons-patch-34 Lin 2021-05-29 17:36:54 -05:00
  • 25fe97e8fe Lets Disposal pipes work on the cargo shuttle again keronshb 2021-05-29 13:21:23 -04:00
  • 71db9298a1 Update world_topic.dm silicons 2021-05-28 18:21:46 -07:00
  • 687466c5aa Automatic changelog compile [ci skip] Changelogs 2021-05-29 00:54:02 +00:00
  • c1a9f9cfe9 GLOW ANIMATION keronshb 2021-05-28 17:40:43 -04:00
  • 86a825bb9f Space Adapt outline keronshb 2021-05-28 15:57:16 -04:00
  • 8b9763a6a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-05-28 15:42:58 -04:00
  • 9aeb71c296 Merge pull request #14761 from silicons/getflaticon Lin 2021-05-28 12:37:09 -05:00
  • caa2dbeefd Update slaughter.dm silicons 2021-05-28 05:51:21 -07:00
  • 396bd8d302 Automatic changelog generation for PR #14757 [ci skip] CitadelStationBot 2021-05-28 07:50:22 -05:00
  • 7c1b8ee07d Merge pull request #14757 from Kraseo/no-bloodcrawlies silicons 2021-05-28 06:50:19 -06:00
  • b1b931a7c4 Update _bodyparts.dm silicons 2021-05-27 22:48:24 -07:00
  • 33097a9d82 Merge pull request #14758 from MrJWhit/pubby-atmos-fix silicons 2021-05-27 21:27:20 -06:00
  • 354d2f57ad Automatic changelog generation for PR #14751 [ci skip] CitadelStationBot 2021-05-27 22:27:17 -05:00
  • 42e382bb45 Merge pull request #14751 from keronshb/clownnades silicons 2021-05-27 21:27:15 -06:00
  • 0849b5bbf4 Automatic changelog generation for PR #14755 [ci skip] CitadelStationBot 2021-05-27 22:27:02 -05:00
  • e686270b4d Merge pull request #14755 from Linzolle/brand silicons 2021-05-27 21:26:59 -06:00
  • c9d03cb315 Automatic changelog generation for PR #14750 [ci skip] CitadelStationBot 2021-05-27 22:26:54 -05:00
  • e1efdb7937 Merge pull request #14750 from keronshb/swagoutfitport silicons 2021-05-27 21:26:52 -06:00
  • 702d7acbf3 Automatic changelog generation for PR #14756 [ci skip] CitadelStationBot 2021-05-27 22:26:46 -05:00
  • a4e20d8164 Merge pull request #14756 from zeroisthebiggay/toomuch silicons 2021-05-27 21:26:43 -06:00
  • ed86a6628a THIS SHOULD REALLY BE THE OTHER WAY AROUND Linzolle 2021-05-27 19:53:55 -05:00
  • 0cf7c5070d parentheses Linzolle 2021-05-27 19:45:12 -05:00
  • 1811310993 Automatic changelog compile [ci skip] Changelogs 2021-05-28 00:43:54 +00:00
  • 46833abf0b add cult_permitted area flag Linzolle 2021-05-27 19:34:00 -05:00
  • 0f0ad31aab Update BoxStation.dmm MrJWhit 2021-05-27 17:58:21 -04:00
  • 7dea33f6c2 doge zerothebigboy 2021-05-27 16:08:28 -04:00
  • f7ca7d7afe Merge remote-tracking branch 'upstream/master' keronshb 2021-05-27 13:29:08 -04:00
  • e0a1e50927 Fixes the linter keronshb 2021-05-27 13:25:27 -04:00
  • 482b679937 Should fix the linter? keronshb 2021-05-27 12:24:16 -04:00
  • 2eeb6ede1e lowers cat meteor threat and makes them use the cat meteor sprite DrPainis 2021-05-27 12:20:54 -04:00
  • 903ff69621 adds a sprite for cat meteors (it's just a copy of the space cat sprite) DrPainis 2021-05-27 12:19:51 -04:00
  • d42fb1ae90 makes cat meteors significantly rarer than meaty ores DrPainis 2021-05-27 12:17:41 -04:00
  • 8f1db2d5ec Fixes some stuff keronshb 2021-05-27 12:16:54 -04:00
  • 1ce8ffba11 fixes the typepath for cat meteors DrPainis 2021-05-27 11:48:09 -04:00
  • 11a6cfd99c Delta station ce office, now with less microwave slaughter. bunny232 2021-05-27 03:27:10 -04:00
  • 1b8ef53014 maybe makes this compile DrPainis 2021-05-27 00:55:41 -04:00
  • cbb7673e79 Adds the actual event. DrPainis 2021-05-27 00:30:29 -04:00
  • 98d5499712 adds the cat wave_type DrPainis 2021-05-27 00:25:55 -04:00
  • d199f0585a adds cat meteors DrPainis 2021-05-27 00:23:24 -04:00
  • 7dbab19597 Fixes the linters and adds a proper async keronshb 2021-05-27 00:14:43 -04:00
  • 3c42247870 fix silicons 2021-05-26 20:19:47 -07:00
  • 78db6bd5c2 Ports Floor Cluwnes keronshb 2021-05-26 21:58:35 -04:00
  • bff21669e3 Automatic changelog compile [ci skip] Changelogs 2021-05-27 00:38:53 +00:00
  • 7a8d3148e0 i made it work again Putnam 2021-05-26 14:42:02 -07:00
  • 9e55d9e2d9 quick hack to fix corruption Putnam 2021-05-26 09:23:56 -07:00
  • 71a8c08e22 A lil more Arturlang 2021-05-26 18:40:59 +03:00
  • 673a322cbb changes cost of two uplink items Artur 2021-05-26 18:29:18 +03:00
  • 6aba9269f6 these are atmos machines. learn to program Putnam 2021-05-26 08:10:26 -07:00
  • f7c44918b2 I forgot to use the latest DLL, whoops. Putnam 2021-05-26 06:14:19 -07:00
  • 61d0e3fed6 A minor thread optimization. Putnam 2021-05-26 06:13:50 -07:00
  • 9b445427b4 Automatic changelog compile [ci skip] Changelogs 2021-05-26 00:36:51 +00:00
  • c3bfbac89a this time for real Kraseo 2021-05-26 01:43:45 +02:00
  • 7b152f2046 Update PubbyStation.dmm MrJWhit 2021-05-25 19:01:38 -04:00
  • 7262f3845f Update PubbyStation.dmm MrJWhit 2021-05-25 18:41:30 -04:00
  • 7173bfade5 this is why i don't do webedits Kraseo 2021-05-26 00:35:49 +02:00
  • 50bdfd521e i hate continuous integration i hate continuous integration Kraseo 2021-05-26 00:35:05 +02:00
  • 3b5f391843 Merge branch 'master' into no-bloodcrawlies Kraseo 2021-05-26 00:29:20 +02:00
  • 7e2e608784 fixes slamming people into walls and such while bloodcrawled Kraseo 2021-05-26 00:23:11 +02:00
  • 287dd8da4f Automatic changelog generation for PR #14748 [ci skip] CitadelStationBot 2021-05-25 11:54:21 -05:00
  • 9679f79513 Merge pull request #14748 from bunny232/Meta-mapping-fix-captain Lin 2021-05-25 11:54:19 -05:00
  • bdd7ae54d4 Update miscellaneous.dm zeroisthebiggay 2021-05-24 23:10:07 -04:00
  • 9e3c1ff860 adds floor cluwnes from yog keronshb 2021-05-24 22:46:59 -04:00
  • fc3c898cd4 tab zerothebigboy 2021-05-24 21:49:36 -04:00
  • 36fe3fef76 abuse zerothebigboy 2021-05-24 21:40:15 -04:00
  • 1ed6c2d30c Automatic changelog compile [ci skip] Changelogs 2021-05-25 00:30:36 +00:00
  • 1bb911441c fix brand intelligence runtime Linzolle 2021-05-24 17:53:05 -05:00
  • 13b589507d Clown Spawner keronshb 2021-05-24 15:13:41 -04:00
  • d7ae90eb13 Digitigrade vers keronshb 2021-05-24 13:33:12 -04:00
  • 77d302f8f6 Ports Swag Outfit keronshb 2021-05-24 12:47:55 -04:00
  • 7dab80cbb7 fuck DrPainis 2021-05-23 23:42:16 -04:00
  • 51911e1f27 adds the recipe for goliath calamari DrPainis 2021-05-23 23:36:11 -04:00
  • a7add64905 adds a lazily made sprite for goliath calamari DrPainis 2021-05-23 23:29:25 -04:00
  • ce1b170b46 adds goliath calamari DrPainis 2021-05-23 23:27:48 -04:00
  • 45a7a70665 Automatic changelog compile [ci skip] Changelogs 2021-05-24 00:30:01 +00:00
  • bd186d25cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-05-23 15:29:20 -04:00
  • 8d9571b863 Merge pull request #14735 from IgiariValkyr/IgiariDonatorFix Lin 2021-05-23 14:16:59 -05:00