Commit Graph

Select branches

Hide Pull Requests

gh-pages

master

tgs-dmapi-update

tweaks-and-fixes

up-to-date

Mono Color

• c4a81b4388 Missed one keronshb 2021-11-21 10:57:38 -05:00
• a8f6f409f8 Another round of reverts for unintended changes keronshb 2021-11-21 10:55:53 -05:00
• 5498d7ed13 Reverts unintended area changes to other maps keronshb 2021-11-21 10:50:22 -05:00
• 31a0de04d5 Fixes chem nades too, since fixing grenades as a whole broke them changing timer Chayse Ramsay 2021-11-21 06:24:55 +00:00
• 9545b180c6 Update grenade.dm Chayse Ramsay 2021-11-21 06:08:20 +00:00
• ef37f4b3b8 more area fixes keronshb 2021-11-21 00:42:19 -05:00
• 05a7e25ced Fixes the area names keronshb 2021-11-21 00:27:34 -05:00
• e91928b0a4 Area change test keronshb 2021-11-21 00:12:08 -05:00
• 146ada0d3d Removes anchored from jacq keronshb 2021-11-20 23:54:16 -05:00
• bcf3376ae6 Fixes up the last runtimes keronshb 2021-11-20 22:31:07 -05:00
• 8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch LetterN 2021-11-21 10:34:14 +08:00
• f6ff310849 Automatic changelog compile [ci skip] Changelogs 2021-11-21 00:28:42 +00:00
• c52a411938 Fixes some area/apc runtimes. keronshb 2021-11-20 18:29:56 -05:00
• df90a71acb Update PubbyStation.dmm TripleShades 2021-11-20 18:24:55 -05:00
• 9a22ab202c Update PubbyStation.dmm TripleShades 2021-11-20 18:19:48 -05:00
• 29a257c71c Update PubbyStation.dmm TripleShades 2021-11-20 18:16:14 -05:00
• dfc74c2d52 Automatic changelog generation for PR #15308 [ci skip] CitadelStationBot 2021-11-20 11:57:55 -06:00
• 84fb6213a2 Adds search box on cwc slab (#15308) Letter N 2021-11-21 01:57:52 +08:00
• af83fb9611 FestiveMap 2021 keronshb 2021-11-20 12:04:35 -05:00
• 1ec9041ce1 Automatic changelog generation for PR #15377 [ci skip] CitadelStationBot 2021-11-20 01:06:40 -06:00
• 25cfe1ff25 Merge pull request #15377 from TripleShades/pubby Lin 2021-11-20 07:06:38 +00:00
• 0e0c49d461 Automatic changelog generation for PR #15381 [ci skip] CitadelStationBot 2021-11-20 01:04:17 -06:00
• 5b0fe8d392 Merge pull request #15381 from DeltaFire15/battery-supply Lin 2021-11-20 07:04:15 +00:00
• 78bad3402a Automatic changelog generation for PR #15382 [ci skip] CitadelStationBot 2021-11-20 01:03:35 -06:00
• 22d297abe8 Merge pull request #15382 from keronshb/clockworkupdates Lin 2021-11-20 07:03:32 +00:00
• 1de965a90e Merge pull request #15385 from buffyuwu/crayons.dm Lin 2021-11-20 03:36:38 +00:00
• 76c39bc6a4 Automatic changelog generation for PR #15383 [ci skip] CitadelStationBot 2021-11-19 21:35:59 -06:00
• d395824007 Merge pull request #15383 from MrJWhit/thinnining-trash Lin 2021-11-20 03:35:56 +00:00
• 07567dba89 Automatic changelog compile [ci skip] Changelogs 2021-11-20 00:26:56 +00:00
• ac365f374b Update PubbyStation.dmm TripleShades 2021-11-19 18:07:02 -05:00
• 2eb3c3326b Update PubbyStation.dmm TripleShades 2021-11-19 18:06:06 -05:00
• 52814b8d36 Update PubbyStation.dmm TripleShades 2021-11-19 18:02:53 -05:00
• 438d965180 Automatic changelog generation for PR #15384 [ci skip] CitadelStationBot 2021-11-19 17:02:52 -06:00
• 43e4c71d04 Merge pull request #15384 from SandPoot/acid-bgone Lin 2021-11-19 23:02:49 +00:00
• 99dedb54ed Merge remote-tracking branch 'upstream/master' into admin_mapsave Artur 2021-11-20 00:16:56 +02:00
• 4ec0de352c Merge remote-tracking branch 'upstream/master' keronshb 2021-11-19 11:33:57 -05:00
• cf4cc39a3b Merge pull request #15222 from raspy-on-osu/apcfix Putnam3145 2021-11-18 20:18:11 -08:00
• 612087f7e5 Update crayons.dm buffyuwu 2021-11-18 20:44:01 -05:00
• 856caa4d26 Automatic changelog compile [ci skip] Changelogs 2021-11-19 00:27:25 +00:00
• 9d3857c94e Upload files SandPoot 2021-11-18 14:57:19 -03:00
• fb9e8c8179 Automatic changelog generation for PR #15320 [ci skip] CitadelStationBot 2021-11-17 19:09:26 -06:00
• 1e01852b93 Merge pull request #15320 from shellspeed1/working-on-new-fancy-syringe-guns Putnam3145 2021-11-17 17:09:23 -08:00
• 6ad399f6fd Automatic changelog compile [ci skip] Changelogs 2021-11-18 00:27:56 +00:00
• 47cf0c153a Update loot_pile.dm MrJWhit 2021-11-17 18:36:49 -05:00
• 08d23486b3 Automatic changelog generation for PR #15360 [ci skip] CitadelStationBot 2021-11-17 10:35:19 -06:00
• b10e9def21 Merge pull request #15360 from SandPoot/tgui_emergency Lin 2021-11-17 16:35:16 +00:00
• 384a93fe75 Automatic changelog generation for PR #15275 [ci skip] CitadelStationBot 2021-11-17 10:26:10 -06:00
• efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021 Lin 2021-11-17 16:26:07 +00:00
• 79025fbeb1 Automatic changelog generation for PR #15371 [ci skip] CitadelStationBot 2021-11-17 10:19:26 -06:00
• 4e407ffeb6 Merge pull request #15371 from DeltaFire15/unintended-devastation Lin 2021-11-17 16:19:23 +00:00
• 291e8fd077 Automatic changelog generation for PR #15373 [ci skip] CitadelStationBot 2021-11-17 10:15:10 -06:00
• ce1a400617 Merge pull request #15373 from DeltaFire15/reebe-testing Lin 2021-11-17 16:15:06 +00:00
• 57ac28084f Automatic changelog generation for PR #15379 [ci skip] CitadelStationBot 2021-11-17 10:14:52 -06:00
• 97ae65c00f Merge pull request #15379 from Putnam3145/fix-regal-rat Lin 2021-11-17 16:14:49 +00:00
• 7b195c3973 Cogscarabs keronshb 2021-11-16 22:41:08 -05:00
• 855df65ba2 cord cell charge DeltaFire 2021-11-16 22:56:31 +01:00
• ef9c90d512 embeds, unarmed and wounds DeltaFire 2021-11-16 20:26:38 +01:00
• fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) LetterN 2021-11-16 16:10:12 +08:00
• 2cdc3a9d30 makes regal rat require not being dead to use abilities Putnam3145 2021-11-15 21:02:52 -08:00
• cf767252f6 effect multipler DeltaFire 2021-11-16 02:57:00 +01:00
• 0e93bd84f8 no funky relay decon and wackyness DeltaFire 2021-11-16 02:22:12 +01:00
• cca584b2df should finally fix dragging other people into cryo LetterN 2021-11-16 08:37:48 +08:00
• c7ae228bda unnecessary var Putnam3145 2021-11-15 16:32:55 -08:00
• 1da28b8ec6 Chem gas tweaks, + toxins rebalance Putnam3145 2021-11-15 16:29:30 -08:00
• e0b603f8bb Automatic changelog compile [ci skip] Changelogs 2021-11-16 00:27:02 +00:00
• ca3eaca314 update bedsheet_bin.dm SandPoot 2021-11-15 20:48:11 -03:00
• 98d619b5b5 Update PubbyStation.dmm TripleShades 2021-11-15 18:23:46 -05:00
• 5af44d985f Automatic changelog generation for PR #15366 [ci skip] CitadelStationBot 2021-11-15 15:28:55 -06:00
• 1f7f0ea35e Update PubbyStation.dmm (#15366) TripleShades 2021-11-15 16:28:51 -05:00
• fbd13f5380 Automatic changelog generation for PR #15368 [ci skip] CitadelStationBot 2021-11-15 13:13:19 -06:00
• 7b50194fd9 Merge pull request #15368 from Citadel-Station-13/webedit-ashwalker-fix Lin 2021-11-15 19:13:15 +00:00
• cf777da85f success if already loaded DeltaFire 2021-11-15 17:54:32 +01:00
• 5b85c260a7 Upload files SandPoot 2021-11-15 01:34:30 -03:00
• 01ebc25f7f fixes vending BSOD and reverts cryopod regressio LetterN 2021-11-15 10:37:10 +08:00
• 9ae59be10e lies DeltaFire 2021-11-14 22:47:35 +01:00
• 3f9ad6a954 should do this instead DeltaFire 2021-11-14 22:44:43 +01:00
• 314a3a049f lets just return true instead DeltaFire 2021-11-14 22:38:48 +01:00
• 50c7d4914f reebe loading (woo) DeltaFire 2021-11-14 22:25:39 +01:00
• 88789e1bbe one DeltaFire 2021-11-14 22:06:52 +01:00
• 451c3cc2f8 Merge pull request #15372 from Citadel-Station-13/donatorclown Lin 2021-11-14 20:59:08 +00:00
• 6224da71a3 contents_explosion DeltaFire 2021-11-14 21:41:42 +01:00
• 6aa906395c not a gaius reference DeltaFire 2021-11-14 21:34:59 +01:00
• b7a34085a0 adds item for donator - t2 Jay 2021-11-14 13:59:10 -06:00
• b91fb21234 Merge branch 'chem-gases' into genericized-plasma-trit Putnam3145 2021-11-14 11:51:22 -08:00
• 7d2ff194d1 this WILL fail CI DeltaFire 2021-11-14 20:48:41 +01:00
• b9f5b70dd3 Reaction unit test shouldn't do disabled ones Putnam3145 2021-11-14 10:17:50 -08:00
• 60e61ecbb0 Fire overhaul Putnam3145 2021-11-13 22:43:54 -08:00
• 90b6ba4b8d oh LetterN 2021-11-14 10:21:56 +08:00
• eb98848a9f wires this code to the PROPER prefs LetterN 2021-11-14 09:23:08 +08:00
• dacaa637ec Automatic changelog compile [ci skip] Changelogs 2021-11-14 00:28:22 +00:00
• 5f6a692a08 Makes ashwalkers not freeze to death on lavaland Putnam3145 2021-11-13 15:52:09 -08:00
• 66a5e660b9 Update PubbyStation.dmm TripleShades 2021-11-13 17:50:17 -05:00
• dc5128446a Automatic changelog generation for PR #15330 [ci skip] CitadelStationBot 2021-11-12 22:50:45 -06:00
• 91adaf84b6 Merge pull request #15330 from keronshb/dynamiclog Lin 2021-11-13 04:50:43 +00:00
• 70be87ed0e Automatic changelog generation for PR #15353 [ci skip] CitadelStationBot 2021-11-12 22:46:47 -06:00
• ac4bb92cec Merge pull request #15353 from TripleShades/pubby Lin 2021-11-13 04:46:45 +00:00
• 9f443c9285 Merge pull request #15362 from Putnam3145/teg-fix Lin 2021-11-13 04:42:53 +00:00
• dbee2f0a8a Merge pull request #15363 from Putnam3145/fix-freezer-math Lin 2021-11-13 04:41:53 +00:00
• 8ab281dfd6 make hot swap work properly shellspeed1 2021-11-12 19:21:45 -08:00
• e3407c5b39 unfucks a few things post comments. shellspeed1 2021-11-12 19:00:17 -08:00