CitadelStationBot
a94a8f9ab4
[MIRROR] Enables Dead OOC at round-end ( #2835 )
...
* Enables Dead OOC at round-end (#30716 )
* Enables Dead OOC at roundend
* proc
* proc #2
* Enables Dead OOC at round-end
2017-09-17 22:20:15 -05:00
CitadelStationBot
08083581c3
[MIRROR] (Hopefully) Lessens preferences and manifest injection lag ( #2796 )
...
* (Hopefully) Lessens preferences and manifest injection lag
* Update datacore.dm
* Update preferences_setup.dm
2017-09-17 11:59:40 -05:00
CitadelStationBot
1cca85a58e
[MIRROR] Fixes null modes being picked ( #2802 )
...
* Fixes null modes being picked
* Fixes null modes being picked
2017-09-17 11:58:33 -05:00
CitadelStationBot
d86060dcff
[MIRROR] Lobby music won't be the same as the last round ( #2727 )
...
* Merge pull request #30636 from Cyberboss/NoDupeMusic
Lobby music won't be the same as the last round
* Lobby music won't be the same as the last round
2017-09-14 07:51:34 -05:00
LetterJay
1471b6cac6
Merge branch 'master' into upstream-merge-30297
2017-09-13 06:41:37 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -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
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
LetterJay
92e055be97
Quick sync ( #2587 )
...
* sync since the mirror was down
* fucking byond
* can't forget these
2017-09-04 04:38:49 -05:00
kevinz000
93647d77ad
[DNM] Fixes the codebase ( #2556 )
...
* fixes stuff
* goddamnit flags
2017-08-30 00:08:40 -07: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
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
CitadelStationBot
0c957efee1
The station explosion cinematic now uses the old "far explosion" sound
2017-08-17 09:18:58 -05:00
LetterJay
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
CitadelStationBot
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
CitadelStationBot
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
CitadelStationBot
fcf09e06e0
Allows admins to set messages when they delay the round end ( #1965 )
2017-07-10 16:13:51 -07:00
TalkingCactus
cb5247d060
Fixes Gamemode Voting & Map Edits ( #1937 )
...
* fixes roundtype voting
* keg spawner
* maint bar to box and kinkmates to delta+meta
2017-07-07 17:54:53 -04:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
259d773cec
Round ID is now sent to IRC ( #1706 )
2017-06-30 21:16:44 -07:00
LetterJay
d04001c09d
another huge sync
2017-06-21 18:00:00 -05:00
LetterJay
47687a6d1a
cleanup
2017-06-10 09:42:08 -05:00
LetterJay
eac4854adf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-28165
2017-06-10 09:38:21 -05:00
CitadelStationBot
9e0488d2d9
Moves borer completion to gamemode
2017-06-09 09:01:03 -05:00
CitadelStationBot
1bdda132e7
Adds Medal Commendations!
2017-06-08 20:39:15 -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
CitadelStationBot
c5143880d2
Fixes logged out spawning new_players
2017-06-06 13:28:23 -05:00
CitadelStationBot
a70043afa2
[MIRROR] Reboot initiated by an admin will never be delayed ( #1272 )
...
* Reboot initiated by an admin will never be delayed
* Update ticker.dm
* Delete ticker.dm.rej
2017-06-02 22:01:39 -07:00
LetterJay
b19115e10f
Merge branch 'master' into upstream-merge-27454
2017-05-30 23:48:25 -05:00
LetterJay
872b0e61fd
rej cleanup, etc.
2017-05-30 23:43:14 -05:00
LetterJay
a821d90a37
commit
2017-05-30 15:54:42 -05:00
LetterJay
5fe7f7083a
woo
2017-05-29 01:59:49 -05:00
CitadelStationBot
83b4c1d8d4
Adds round table to replace tacking some data in feedback table
2017-05-26 15:18:16 -05:00
Poojawa
7a3fb9e62e
update ticker.dm
2017-05-21 01:05:10 -05:00
Poojawa
186ed2acbb
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268
2017-05-21 00:44:08 -05:00
CitadelStationBot
88ede32216
[MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition ( #994 )
...
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition
* Rej cleanup
* update mob.dmi
* Update living_defense.dm
2017-05-20 23:00:02 -05:00
CitadelStationBot
94b7e560ab
World.dm Refactor
2017-05-18 16:37:46 -05:00
CitadelStationBot
4463646952
[MIRROR] MC Runlevels ( #988 )
...
* MC Runlevels
* Update ticker.dm
* Delete ticker.dm.rej
2017-05-18 12:42:43 -05:00
LetterJay
91f3059be1
Merge pull request #693 from Citadel-Station-13/upstream-merge-26722
...
[MIRROR] Moves tips from config to strings tree
2017-05-05 09:33:45 -05:00
LetterJay
fd251eb56a
oops
2017-05-02 08:43:10 -05:00
LetterJay
f7fe20887a
manual merge
2017-05-02 08:40:10 -05:00
CitadelStationBot
529125d3dd
Moves tips from config to strings tree
2017-05-01 11:51:27 -05:00
CitadelStationBot
08a01aa11b
Refactors roundstart checks slightly
2017-04-26 17:06:29 -05:00
LetterJay
3d51a07243
world fix
2017-04-25 01:52:49 -05:00
CitadelStationBot
607868a5de
[s]Exploit whack-a-mole
2017-04-25 01:31:50 -05:00
CitadelStationBot
4baa357739
Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
2017-04-24 18:07:12 -05:00
