deathride58
9bdc80ba82
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-09-27 23:44:22 -04:00
CitadelStationBot
3aafe338af
[MIRROR] Fixes adjust config ( #2723 )
...
* Fixes adjust config
* Update configuration.dm
* Update game_options.txt
* fixes persistance
2017-09-22 23:02:09 -05:00
LetterJay
8c6c57ff32
Merge pull request #2885 from Citadel-Station-13/upstream-merge-30896
...
[MIRROR] Removes old debug text
2017-09-22 00:03:30 -04:00
oranges
41277ff110
Removes old debug text
2017-09-21 06:30:11 -05:00
oranges
9ee60af5e8
Merge pull request #30768 from Cyberboss/BringingSexyBack
...
Adds back required arrivals undockedness with a config
2017-09-20 03:55:14 -05:00
deathride58
e0837a45b6
basic config stuff
2017-09-19 20:29:03 -04:00
pubby
a01f3213f5
Traitorbro gamemode
2017-09-17 18:03:12 -05:00
CitadelStationBot
3a7640d436
[MIRROR] Fixes random gamemode instantiation ( #2803 )
...
* Fixes random gamemode instantiation
* Fixes random gamemode instantiation
2017-09-17 12:01:33 -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
f60d57520b
Merge branch 'master' into upstream-merge-29839
2017-09-11 23:22:39 -05:00
LetterJay
c3ef612490
Ports MSO's fading note system
2017-09-11 23:07:30 -05:00
LetterJay
935ae98f4a
Merge branch 'master' into upstream-merge-29839
2017-09-11 18:03:51 -05:00
Jordan Brown
92b78d3298
[s] Adds a security token to all admin hrefs
2017-09-08 21:16:02 -05:00
JJRcop
00dd2f283b
Adds Internet admin midi ( #30457 )
...
* Adds Internet admin midi
* Moves global regex into proc (shell_url_scrub)
* Moves shelleo to world
Adds quotes around the command in shelleo, to encapsulate it
* Admins can stop playing web sounds
* Revised internet midi extension order
Moved m4a to least preferred,
as it can potentially carry non-aac or non-mpeg-3 audio
* Kills \n in web sound
* play_web_sound availability based on config
* play web sound and shelleo tweaks
istypeless for in play web sound & readability parenthesis around binary AND
add return index defines for shelleo proc
* Security fix for play web sound
2017-09-08 09:32:29 -05:00
LetterJay
af409af9cf
additional files
2017-09-05 16:29:25 -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
LetterJay
3e0ead1204
Merge branch 'master' into upstream-merge-29105
2017-09-02 07:11:32 -05:00
LetterJay
4a1bb5addb
Update configuration.dm
2017-09-02 06:49:21 -05:00
kevinz000
41318e715c
Merge branch 'master' into custom_roundstart_items
2017-08-31 18:23:56 -07:00
CitadelStationBot
6882163ef6
Moves comms settings into a new config file
2017-08-29 17:01:16 -05:00
kevinz000
62a358574c
sync
2017-08-29 02:37:34 -07:00
CitadelStationBot
196c9d0597
Adds tracking amount of time spent playing departments 2: The fall of the Assistants.
2017-08-20 06:01:24 -05:00
kevinz000
f91d7799f4
Merge branch 'master' into custom_roundstart_items
2017-08-09 09:46:52 -07:00
CitadelStationBot
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
kevinz000
dc50c1f4c0
Merge remote-tracking branch 'Citadel-Station-13/master' into Citadel-Station-13/custom_roundstart_items
2017-07-24 04:13:54 -07:00
CitadelStationBot
956f10f2d2
[s]Fixes panic bunker
2017-07-17 07:13:45 -05:00
kevinz000
df590fd8c1
Merge remote-tracking branch 'Citadel-Station-13/master' into Citadel-Station-13/custom_roundstart_items
2017-07-16 20:30:27 -07:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
d12546ef35
Improper mirror
2017-06-05 07:25:02 -05:00
LetterJay
60da3ff9b8
Original mirrored too much.
2017-06-05 07:18:29 -05:00
LetterJay
976c1244dd
Config shit for cards ( #1310 )
2017-06-02 21:56:08 -07:00
kevinz000
0508b613a5
automatic config load and dme
2017-05-22 17:53:24 -07:00
kevinz000
ff4ef6a1f5
reset
2017-05-21 21:58:11 -07:00
kevinz000
de0131346a
Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items
...
# Conflicts:
# code/controllers/configuration.dm
# code/game/objects/items.dm
2017-05-21 18:17:42 -07:00
kevinz000
c58c6ffdd8
autoloading
2017-05-18 21:24:02 -07:00
CitadelStationBot
7a9e05e9d9
Cerestation Tweaks MK VII: BEES edition ( #925 )
2017-05-18 10:36:51 -05:00
CitadelStationBot
a317d23a51
[MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie ( #916 )
...
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie
* fixes .rej
2017-05-18 09:37:30 -05:00
CitadelStationBot
b8cbf1a056
[MIRROR] Makes some game options which should be flags flags ( #910 )
...
* Makes some game options which should be flags flags
* Update configuration.dm
* Delete configuration.dm.rej
2017-05-18 07:50:43 -05:00
LetterJay
6a1cac4e1e
Merge branch 'master' into upstream-merge-26425
2017-05-12 00:08:32 -04:00
LetterJay
0411299a23
fixes issue with config loading
2017-05-10 21:42:48 -05:00
LetterJay
57372ebdb0
merge
2017-05-10 19:41:55 -05:00
CitadelStationBot
3b84fcb9c2
Playar byound accunt age storid in db
2017-05-04 18:14:23 -05:00
CitadelStationBot
49990d0c05
Persistent investigate and game logs separated by round ID
2017-05-02 18:47:58 -05:00
CitadelStationBot
607868a5de
[s]Exploit whack-a-mole
2017-04-25 01:31:50 -05:00
CitadelStationBot
2373e2e485
Afk fixup ( #412 )
2017-04-15 15:45:29 -04:00
Poojawa
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
LetterJay
78616ca6a9
*reverts back to the separated who list
...
*fixes a lot of mentor related issue (both them not loading and missing verbs)
2017-03-26 10:44:42 -05:00
Poojawa
f67e9f6d87
Bleeding edgy refresh ( #303 )
...
* not code stuff
* other things
* global vars, defines, helpers
* onclick hud stuff, orphans, world.dm
* controllers and datums
* game folder
* everything not client/mobs in modules
* client folder
* stage 1 mob stuff
* simple animal things
* silicons
* carbon things
* ayylmaos and monkeys
* hyoomahn
* icons n shit
* sprite fixes
* compile fixes
* some fixes I cherrypicked.
* qdel fixes
* forgot brain refractors
2017-03-21 11:44:10 -05:00
