shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,294 Commits 5 Branches 0 Tags
eef819c1cd995cf374fd2a4fc199351237ea728e
Commit Graph
684 Commits
Author SHA1 Message Date
CitadelStationBotandGitHub 6a796ac32a Merge pull request #3739 from Citadel-Station-13/upstream-merge-32274 
[MIRROR] Ark examine now uses DisplayTimeText
 2017-11-02 04:07:23 -05:00
MoreRobustThanYouandCitadelStationBot 6fbb326242 Makes it so non-admins cannot activate the Ark (#32272) 2017-11-01 21:38:43 -05:00
MoreRobustThanYouandCitadelStationBot ebc768e31b Ark examine now uses DisplayTimeText (#32274) 
* Ark examine now uses DisplayTimeText
 2017-11-01 21:36:54 -05:00
LetterJayandGitHub cec63d54f4 Merge pull request #3700 from Citadel-Station-13/upstream-merge-32191 
[MIRROR] Fixes latejoin/mulligan traitors.
 2017-10-31 03:00:36 -04:00
Jordan BrownandCitadelStationBot 3973e94e3f Merge pull request #32191 from AnturK/latetraitorfixup 
Fixes latejoin/mulligan traitors.
 2017-10-30 14:50:33 -05:00
Jordan BrownandCitadelStationBot a9d440c457 Merge pull request #32210 from kevinz000/patch-361 
fixes clockcults appearing as grey box on sechuds until they reequip their id
 2017-10-30 14:42:17 -05:00
vuonojenmustaturskaandCitadelStationBot d6d01ab630 Actually fixes meteors, again (#32162) 
* Actually fixes meteors, again

* unrelated typo fix for an admin debug verb
 2017-10-29 07:13:31 -05:00
LetterJayandGitHub d182acae7f Merge pull request #3659 from Citadel-Station-13/upstream-merge-31723 
[MIRROR] Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds
 2017-10-29 04:22:03 -04:00
LetterJayandGitHub 1a292c8457 Merge pull request #3653 from Citadel-Station-13/upstream-merge-32119 
[MIRROR] Fixes round conversion issues
 2017-10-29 03:46:57 -04:00
LetterJayandGitHub bea9365ea9 Merge branch 'master' into upstream-merge-32093 2017-10-29 02:27:52 -04:00
LetterJayandGitHub 0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
Ashe HiggsandCitadelStationBot 37bb75a645 Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds (#31723) 
* Cleans up clockcult code a little

* Another thing with servants_active

* Now it compiles
 2017-10-27 17:36:31 -05:00
Jordan BrownandCitadelStationBot ce4ccedd10 Merge pull request #32119 from AnturK/convertfix 
Fixes round conversion issues
 2017-10-27 17:32:30 -05:00
LetterJayandGitHub af96c29a0c Merge pull request #3635 from ktccd/Undo_Borer_HUDS 
Undoes Borer HUDs
 2017-10-27 02:49:03 -04:00
LetterJayandGitHub 31ee6947ee Merge pull request #3624 from Citadel-Station-13/upstream-merge-32039 
[MIRROR] Rebalances clockwork marauders
 2017-10-27 02:44:17 -04:00
LetterJayandGitHub 4cc0cf3ee7 Merge pull request #3606 from Citadel-Station-13/upstream-merge-31972 
[MIRROR] Greyscale cables
 2017-10-26 16:53:08 -04:00
LetterJayandGitHub 98ac9f27c8 Merge pull request #3604 from Citadel-Station-13/upstream-merge-32048 
[MIRROR] Adds cogscarab shells and marauder armor into the spawners menu, and tweaks their alerts
 2017-10-26 16:51:53 -04:00
ktccd ad911c2b1b Undoes Borer HUDs 
Critical flaw in antag-HUD system prevented proper use, since automatic
reverting of original PR is no longer possible, (Probably due to another
antag-hud being added afterwards), this is a manual one.
 2017-10-26 21:19:34 +02:00
KorPhaeronandCitadelStationBot ef9c27ef0a Roundstart species pref fixes/removes redundant species config 2017-10-26 12:00:56 -05:00
orangesandCitadelStationBot 60102f9b76 Merge pull request #32039 from Xhuis/marauders 
Rebalances clockwork marauders
 2017-10-26 05:03:59 -05:00
Emmett GainesandCitadelStationBot ae86a75362 Greyscale cables 2017-10-25 21:46:57 -05:00
Ashe HiggsandCitadelStationBot 773b44e799 Cogscarab shells/construct chassis on spawn menu (#32048) 2017-10-25 21:45:40 -05:00
Ashe HiggsandCitadelStationBot dc5f011c48 Fixes being able to stack stargazers on one tile (#32085) 2017-10-25 21:44:29 -05:00
CitadelStationBotandPoojawa deaec38579 [MIRROR] Fixes shades hearing heartbeats (#3599) 
* Merge pull request #32059 from ShizCalev/shade-heartbeat

Fixes shades hearing heartbeats

* Fixes shades hearing heartbeats
 2017-10-25 20:02:09 -05:00
LetterJayandGitHub bb6cbd8528 Merge pull request #3593 from Citadel-Station-13/revert-3584-revert-3580-upstream-merge-31560 
Revert "Revert "[MIRROR] Late join antagonists will try to target late join players""
 2017-10-24 21:30:11 -04:00
LetterJayandGitHub e20664dad3 Revert "Revert "[MIRROR] Late join antagonists will try to target late join players"" 2017-10-24 18:18:20 -05:00
KorPhaeronandCitadelStationBot 514533ddaf Ratvar summoning now ends the round/triggers mass proselytize (#31956) 
* Slight changes to ratvar ending

* Tick check

* T

* Why Xhuis?

* Lots of fire

* That src made sense 10 minutes ago but no longer

* More commits than line changes

* Check Tick
 2017-10-24 18:07:06 -05:00
LetterJayandGitHub aa420067ba Revert "[MIRROR] Late join antagonists will try to target late join players" 2017-10-24 00:09:11 -05:00
Jordan BrownandCitadelStationBot 94826620fa Late join antagonists will try to target late join players (#31560) 2017-10-23 20:08:43 -05:00
LetterJayandGitHub 4136be0361 Merge pull request #3558 from Citadel-Station-13/upstream-merge-31978 
[MIRROR] Cleans up datum traitor minimally.
 2017-10-23 14:50:05 -04:00
LetterJayandGitHub ce2f1cc672 Merge pull request #3554 from Citadel-Station-13/upstream-merge-31981 
[MIRROR] Removes mob.lastattacked and replaces lastattacker with a string
 2017-10-23 14:48:10 -04:00
LetterJayandGitHub 4dc2ac3d94 Merge branch 'master' into upstream-merge-31913 2017-10-23 01:25:35 -04:00
AnturKandCitadelStationBot 0faee43f95 Cleans up datum traitor minimally. (#31978) 
* Removes the /custom traitor subtype nonsense.
Fixes borged/ai'zed traitors getting law 0.

* Not needed anymore
 2017-10-22 17:44:55 -05:00
LetterJayandGitHub 5337b1fed2 Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780 
[MIRROR] Disentangles blob from blob mode/removes blob mode
 2017-10-22 16:39:35 -04:00
vuonojenmustaturskaandCitadelStationBot 1794018ae1 Removes mob.lastattacked and replaces lastattacker with a string 2017-10-22 11:29:35 -05:00
LetterJayandGitHub 000f1c89a3 Merge pull request #3543 from Citadel-Station-13/upstream-merge-31935 
[MIRROR] Fixes shades being sent back to the arrival shuttle when their stone is qdel'd
 2017-10-22 12:25:42 -04:00
LetterJayandGitHub dadc96ef98 Update overmind.dm 2017-10-22 10:50:58 -05:00
Jordan BrownandCitadelStationBot 17d2ff88c5 Merge pull request #31935 from ShizCalev/shade-qdel-fix 
Fixes shades being sent back to the arrival shuttle when their stone is qdel'd
 2017-10-21 18:53:50 -05:00
AnturKandCitadelStationBot ea4fc92dae Fixes wizard roundend with liches around 2017-10-21 16:21:39 -05:00
KorPhaeronandCitadelStationBot c42e1b17f4 Blob fixes 2017-10-21 14:08:10 -05:00
PoojawaandGitHub 62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -05:00
CitadelStationBotandPoojawa d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBotandPoojawa e827f02863 [MIRROR] Fixes various spelling and grammar errors. (#3436) 
* Fixes various spelling and grammar errors.

* Update crashedship.dm

* Update listeningstation.dm

* Update augments_chest.dm

* Update augments_chest.dm
 2017-10-21 07:10:23 -05:00
CitadelStationBotandPoojawa dd735fb2eb [MIRROR] Makes changelings vomitting acid on things actually leave a puddle of acid (#3522) 
* Changeling vomit (#31878)

* Makes changelings vomitting acid on things actually leave a puddle of acid
 2017-10-21 06:15:06 -05:00
CitadelStationBotandPoojawa adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
CitadelStationBotandPoojawa d511bc1fde [MIRROR] Fixes bombs on Reebe being an instant win (#3518) 
* Fixes bombs on Reebe being an instant win (#31503)

* Probably reduces Reebe bombcap

* wat

* TTV warning

* Less awkward wording

* Fixes bombs on Reebe being an instant win
 2017-10-21 03:47:07 -05:00
CitadelStationBotandPoojawa 0ad6e36727 [MIRROR] Apprentice fixes (#3533) 
* Apprentice fixes (#31880)

* Fixes apprentices summoning for non-wizards

* Fixes admin antaghud not showing for solo wizards

* Apprentice fixes
 2017-10-21 03:44:21 -05:00
LetterJayandGitHub b7c8330761 Update blob_report.dm 2017-10-20 09:33:39 -05:00
LetterJayandGitHub 02f0c1573a Merge pull request #3491 from Citadel-Station-13/upstream-merge-31851 
[MIRROR] Fixes liches not blocking roundend properly.
 2017-10-19 09:08:25 -04:00
KorPhaeronandCitadelStationBot 20b17eceec Disentangles blob from blob mode/removes blob mode 2017-10-18 20:55:42 -05:00