Commit Graph

65 Commits

Author SHA1 Message Date
CitadelStationBot 9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
CitadelStationBot 60292af57f [MIRROR] Disentangles Command Reports from Metagame (#5294)
* Disentangles Command Reports from Metagame (#35192)

* False report fix

* Less Accurate Command Report

* Disentangles Command Reports from Metagame
2018-02-04 23:11:32 -06:00
Poojawa aa04e62b29 cult lol xd 2018-01-31 08:07:22 -06:00
LetterJay 00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJay 92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJay 5bd61908a3 Update game_mode.dm 2017-12-19 23:53:36 -06:00
LetterJay 4d5c32ae56 Update game_mode.dm 2017-12-19 22:11:04 -06:00
LetterJay 992984388b Update game_mode.dm 2017-12-19 19:29:04 -06:00
LetterJay 61c7080c34 Update game_mode.dm 2017-12-19 15:34:59 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
AnturK 6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
deathride58 eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
Jordie b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
vuonojenmustaturska 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
LetterJay 0d65074f44 Merge pull request #3899 from Citadel-Station-13/upstream-merge-32635
[MIRROR] Fixes fleeing the station message accuracy
2017-11-13 11:44:16 -06:00
Leo 8814c55bfb Merge pull request #32635 from AnturK/cowardsallofthem
Fixes fleeing the station message accuracy
2017-11-12 11:40:57 -06:00
Jordan Brown 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
Jordan Brown ce4ccedd10 Merge pull request #32119 from AnturK/convertfix
Fixes round conversion issues
2017-10-27 17:32:30 -05:00
AnturK ea4fc92dae Fixes wizard roundend with liches around 2017-10-21 16:21:39 -05:00
AnturK 2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05:00
AnturK f6f114af12 Removes unused list (#31662) 2017-10-14 00:50:35 -05:00
Jordan Brown e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
AnturK fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05:00
oranges 6278d49662 Href tokens 2017-09-24 17:34:37 -05:00
CitadelStationBot accd92a676 [MIRROR] Fixes mode conversion runtime (#2855)
* Fixes mode conversion runtime (#30857)

* Fixes mode conversion runtime
2017-09-20 01:40:52 -05:00
CitadelStationBot 9a4f84da5e [MIRROR] Refactors roundstart centcom threat report. (#2739)
* Refactors roundstart centcom threat report.

* Update blob.dm

* Update changeling.dm

* Update traitor_chan.dm

* Update sandbox.dm

* Update traitor.dm
2017-09-13 22:50:01 -05:00
LetterJay 240c5bdaad Update game_mode.dm 2017-09-11 15:55:27 -05:00
LetterJay e767e20574 Update game_mode.dm 2017-09-11 15:49:54 -05:00
KorPhaeron d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
kevinz000 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458)
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
CitadelStationBot e986657b16 Makes mulligan antag check for gamemode required players 2017-08-14 06:25:03 -05:00
CitadelStationBot 40a8449f11 GM completion check and mulligan now check to see if players are logged out 2017-08-07 12:26:20 -05:00
CitadelStationBot ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00
CitadelStationBot 55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
ktccd 608737376b Borer admin refactor (#2209)
* Refactors and clarifications

Refactors borers to use objective datums instead of relying entirely on
hardcoded snowflake bullshit.
Also adds some FEEDBACK to the punishments, so the host isn't completely
confused why they suddenly keep getting stunlocked and blinded.
Also refactors syndi-borers to display their objectives along the other
borers instead of as an antag, since they TECHNICALLY count as a borer
for their escape objective, enabling them to cooperate.
Refactors borers weakness-chemical to be a variable instead of
hardcoded, allowing admin var-editing to work.
Borers now inherit the objectives of their parent-borer. Normally makes
no difference, but if admins were to give custom objectives to one
borer, then all its children will injerit it.

* Removed a line

Removed a piece of text that was redundant at best and incorrect at
worst. Syndicate borers makes it show up as the default 10 needed when
no other borers existed and normal borers already state their own
objective individually.
2017-07-31 21:45:32 -07:00
LetterJay feeb6cdd8b Update game_mode.dm 2017-07-30 23:24:59 -05:00
ktccd 6d3123f63c Readds borers (#1999)
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
2017-07-14 19:28:52 -07:00
Poojawa b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
LetterJay 79794685c3 Merge branch 'master' into upstream-merge-27890 2017-06-10 08:02:27 -05:00
CitadelStationBot 9e0488d2d9 Moves borer completion to gamemode 2017-06-09 09:01:03 -05:00
LetterJay 78d0ec662c cleanup 2017-06-08 03:48:22 -05:00
CitadelStationBot 7eedaa87c5 Moves station's starting state to ticker post setup, instead of gamemode's 2017-06-07 20:54:37 -05:00
LetterJay b36e3065e0 Merge branch 'master' into upstream-merge-27712 2017-06-05 22:46:25 -05:00
LetterJay b19115e10f Merge branch 'master' into upstream-merge-27454 2017-05-30 23:48:25 -05:00
CitadelStationBot 29c15fe9fd Centcomm is on Z1 2017-05-27 20:57:26 -05:00
CitadelStationBot f6306ea406 Fixes revision stat tracking 2017-05-27 20:46:40 -05:00