Commit Graph

250 Commits

Author SHA1 Message Date
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
e6650e6f35 Refined Test Areas (Station Z) debug output (#2321) 2017-08-21 20:25:20 -07:00
CitadelStationBot
da6e3d7c8e readds toggle_hear_radio admin verb 2017-08-19 06:45:50 -05:00
LetterJay
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay
ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
CitadelStationBot
3d83b55cf6 Annihilates the colons! 2017-08-15 10:49:55 -05:00
LetterJay
69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
LetterJay
fdfdd4fc21 Update admin_investigate.dm 2017-08-14 08:24:34 -05:00
CitadelStationBot
2476d59be6 Makes the ahelp topic give the permissions warning 2017-08-14 06:54:44 -05:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
LetterJay
1520c4facd Merge pull request #2327 from Citadel-Station-13/upstream-merge-29800
[MIRROR] Massively improves downloading/viewing logs.
2017-08-12 06:34:41 -05:00
LetterJay
962d983079 Merge pull request #2294 from Citadel-Station-13/upstream-merge-29746
[MIRROR] Fixes adminhelp sending the wrong message to players
2017-08-12 06:33:29 -05:00
Poojawa
5a7126a0dd Panic Bunker for moderator/trialmin access 2017-08-12 01:15:42 -05:00
CitadelStationBot
bd8289b29f Massively improves downloading/viewing logs. 2017-08-10 10:49:22 -05:00
LetterJay
9e0b151240 Merge pull request #2303 from Citadel-Station-13/upstream-merge-29768
[MIRROR] Standardized CENTCOM spelling
2017-08-09 02:20:26 -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
c2419e84f5 Adds a Test Areas (Station Z) verb 2017-08-08 05:50:22 -05:00
CitadelStationBot
fbabd14798 Fixes adminhelp sending the wrong message to players 2017-08-07 12:26:15 -05:00
LetterJay
fc450fd561 Merge pull request #2291 from Citadel-Station-13/upstream-merge-29725
[MIRROR] Sounds played with sound_to_playing_players are less tinny
2017-08-07 07:26:18 -05:00
CitadelStationBot
d071a78888 Sounds played with sound_to_playing_players are less tinny 2017-08-06 18:02:47 -05:00
CitadelStationBot
a90448b262 Fixes oversight with APCs using areastring 2017-08-05 19:28:33 -05:00
CitadelStationBot
795dcece74 Fixes admin buildmode not returning a qdel hint (#2254) 2017-08-04 08:42:33 -07:00
CitadelStationBot
ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00
CitadelStationBot
d4f15ff6da [MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#2039)
* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use

* Fixes beam rifle indent error

* Projectile target check hit code now uses a proc for resharing

* Update beam_rifle.dm

* Delete beam_rifle.dm.rej

* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed

* Update turf.dm

* Update turf.dm

* Delete click.dm.rej

* Update click.dm

* fxies

* woops

* Update turf.dm

* the actual rifle

* dumb clickcatcher

* actions
2017-08-03 06:12:27 -07:00
CitadelStationBot
f62fc85f0d [MIRROR] Admin "Reload Station" Map Generator - Reloads specified block to roundstart. also buildmode area mapgens have names instead of paths on a list. (#2172)
* Admin "Reload Station" Map Generator - Reloads specified block to roundstart. also buildmode area mapgens have names instead of paths on a list.

* clean up + manual sync
2017-08-02 06:28:08 -05:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
kevinz000
bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026)
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
2017-07-31 23:41:22 -07:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
CitadelStationBot
79e6963aca Hallucinations 3.0 2017-07-30 19:58:28 -05:00
CitadelStationBot
8cb2b1b59e Fixes SDQL for (hopefully) the last time by removing try catches. Removes automatic runtime tracking from SDQL. (#2160) 2017-07-27 06:44:45 -07:00
CitadelStationBot
64966027e7 fixes hub not working ree (#2112) 2017-07-24 04:05:44 -07:00
CitadelStationBot
64f7a14e07 Adds investigate logs to portals 2017-07-20 22:26:01 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
CitadelStationBot
2cbfec38a2 Makes round end delay message optional 2017-07-15 22:19:46 -05:00
CitadelStationBot
54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
kevinz000
44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
2017-07-15 11:41:36 -07:00
CitadelStationBot
f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07: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
CitadelStationBot
55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot
f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905)
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
2017-07-13 06:37:51 -07:00
CitadelStationBot
fcf09e06e0 Allows admins to set messages when they delay the round end (#1965) 2017-07-10 16:13:51 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
060c7b9dec Fixes race condition with admin proc calls and load admins 2017-07-09 19:49:00 -05:00
CitadelStationBot
d608741385 Fixes repeated adminhelp message 2017-07-08 13:19:07 -05:00
CitadelStationBot
29d2c7b980 Fixes permissions elevation exploit (#1930) 2017-07-07 10:35:17 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
c32da6e2cb Merge pull request #1840 from Citadel-Station-13/upstream-merge-28932
[MIRROR] Show ban id to banned players
2017-06-30 22:38:26 -05:00
CitadelStationBot
d105e57af1 Do not use your brain, do not look at the code, do not engage me (#1818) 2017-06-30 20:21:34 -07:00