shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,481 Commits 5 Branches 0 Tags
31dfd7e8fb9fa089926fd08fdca960e746526b60
Commit Graph

696 Commits

Author SHA1 Message Date
LetterJay
c0293df7e0 Merge pull request #3794 from Citadel-Station-13/upstream-merge-32339 
[MIRROR] You can no longer disturb the floor with visions of madness
 2017-11-04 22:48:50 -05:00
LetterJay
c472b92fd1 Merge pull request #3780 from Citadel-Station-13/upstream-merge-32356 
[MIRROR] Redtexting as a traitor now gets you some depressing music played to you
 2017-11-04 22:41:30 -05:00
LetterJay
f6d9f3411c Merge pull request #3779 from Citadel-Station-13/upstream-merge-32355 
[MIRROR] Prints out cultist names at round end
 2017-11-04 22:40:58 -05:00
LetterJay
a748a0dabd Merge pull request #3744 from Citadel-Station-13/upstream-merge-32257 
[MIRROR] Abscond and rifts return servants directly to the Ark
 2017-11-04 22:30:57 -05:00
MoreRobustThanYou
4e6435e4b7 You can no longer disturb the floor with visions of madness (#32339) 
* You can no longer disturb the floor with visions of madness

* Add failure message

* Deletes uneeded line
 2017-11-03 18:54:49 -05:00
Qustinnus
d100d044e1 you failed loser try again (#32356) 2017-11-03 15:53:51 -05:00
KorPhaeron
7b46801c35 Prints out cultist names at round end (#32355) 2017-11-03 15:53:42 -05:00
LetterJay
9b61dabb67 Merge pull request #3759 from Citadel-Station-13/upstream-merge-32303 
[MIRROR] Spamming runes / battlecries / etc will no longer trigger spam prevention
 2017-11-03 00:12:12 -05:00
LetterJay
05e71b2987 Merge pull request #3748 from Citadel-Station-13/upstream-merge-32273 
[MIRROR] [s] Adds admin logging to clockwork ark activation
 2017-11-02 23:51:39 -05:00
MoreRobustThanYou
41893fc147 Spamming runes / battlecries / etc will no longer trigger spam prevention (#32303) 
* Update say.dm

* Update runes.dm

* Update standard.dm

* Update ratvarian_language.dm
 2017-11-02 04:13:18 -05:00
CitadelStationBot
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
MoreRobustThanYou
6fbb326242 Makes it so non-admins cannot activate the Ark (#32272) 2017-11-01 21:38:43 -05:00
kevinz000
fea6b185b0 Adds admin logging to clockwork ark activation (#32273) 2017-11-01 21:38:14 -05:00
Ashe Higgs
cd13cfcfe7 Abscond and rifts return servants directly to the Ark (#32257) 
🆑 Xhuis
tweak: Abscond and Reebe rifts now place servants directly at the Ark instead of below the "base" area.
/🆑

A few times, I've seen players unwittingly build defenses on top of the spawn points for themselves! While that's not too much of a problem in of itself, I feel that this way makes more sense and lets servants have a consistent area they know they will emerge from.
 2017-11-01 21:37:43 -05:00
MoreRobustThanYou
ebc768e31b Ark examine now uses DisplayTimeText (#32274) 
* Ark examine now uses DisplayTimeText
 2017-11-01 21:36:54 -05:00
LetterJay
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 Brown
3973e94e3f Merge pull request #32191 from AnturK/latetraitorfixup 
Fixes latejoin/mulligan traitors.
 2017-10-30 14:50:33 -05:00
Jordan Brown
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
vuonojenmustaturska
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
LetterJay
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
LetterJay
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
LetterJay
bea9365ea9 Merge branch 'master' into upstream-merge-32093 2017-10-29 02:27:52 -04:00
LetterJay
0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
Ashe Higgs
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 Brown
ce4ccedd10 Merge pull request #32119 from AnturK/convertfix 
Fixes round conversion issues
 2017-10-27 17:32:30 -05:00
LetterJay
af96c29a0c Merge pull request #3635 from ktccd/Undo_Borer_HUDS 
Undoes Borer HUDs
 2017-10-27 02:49:03 -04:00
LetterJay
31ee6947ee Merge pull request #3624 from Citadel-Station-13/upstream-merge-32039 
[MIRROR] Rebalances clockwork marauders
 2017-10-27 02:44:17 -04:00
LetterJay
4cc0cf3ee7 Merge pull request #3606 from Citadel-Station-13/upstream-merge-31972 
[MIRROR] Greyscale cables
 2017-10-26 16:53:08 -04:00
LetterJay
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
KorPhaeron
ef9c27ef0a Roundstart species pref fixes/removes redundant species config 2017-10-26 12:00:56 -05:00
oranges
60102f9b76 Merge pull request #32039 from Xhuis/marauders 
Rebalances clockwork marauders
 2017-10-26 05:03:59 -05:00
Emmett Gaines
ae86a75362 Greyscale cables 2017-10-25 21:46:57 -05:00
Ashe Higgs
773b44e799 Cogscarab shells/construct chassis on spawn menu (#32048) 2017-10-25 21:45:40 -05:00
Ashe Higgs
dc5f011c48 Fixes being able to stack stargazers on one tile (#32085) 2017-10-25 21:44:29 -05:00
CitadelStationBot
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
LetterJay
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
LetterJay
e20664dad3 Revert "Revert "[MIRROR] Late join antagonists will try to target late join players"" 2017-10-24 18:18:20 -05:00
KorPhaeron
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
LetterJay
aa420067ba Revert "[MIRROR] Late join antagonists will try to target late join players" 2017-10-24 00:09:11 -05:00
Jordan Brown
94826620fa Late join antagonists will try to target late join players (#31560) 2017-10-23 20:08:43 -05:00
LetterJay
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
LetterJay
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
LetterJay
4dc2ac3d94 Merge branch 'master' into upstream-merge-31913 2017-10-23 01:25:35 -04:00
AnturK
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
LetterJay
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
vuonojenmustaturska
1794018ae1 Removes mob.lastattacked and replaces lastattacker with a string 2017-10-22 11:29:35 -05:00
LetterJay
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
LetterJay
dadc96ef98 Update overmind.dm 2017-10-22 10:50:58 -05:00
Jordan Brown
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