Commit Graph

502 Commits

Author SHA1 Message Date
deathride58
fdb9de488e Merge pull request #4359 from Citadel-Station-13/upstream-merge-33480
[MIRROR] Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
2017-12-15 04:21:34 +00:00
Jordan Brown
253a3d519e Adds SDQL chat command (#33366)
Allow's calling SDQL from bots supporting the CHAT system API
2017-12-14 15:44:25 -06:00
deathride58
4d61ea105d Update holder2.dm 2017-12-14 14:33:17 -05:00
Kyle Spier-Swenson
55247e9bdf Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on. 2017-12-13 21:04:00 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
kevinz000
cc598d873c Adds a chat command to reload admins in case someone locks themselves out. (#33458)
* Update chat_commands.dm

* skype
2017-12-12 13:04:39 -06:00
AnturK
c5013d65f6 Adds "Get" command to movable vv dropdown (#33296) 2017-12-11 20:35:16 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
deathride58
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
deathride58
fa42a336f3 Merge pull request #4310 from Citadel-Station-13/upstream-merge-33320
[MIRROR] Fix runtimes using Tweak Component Ratings on non-machines
2017-12-10 21:44:34 +00:00
oranges
38da8cb545 Merge pull request #33320 from AutomaticFrenzy/patch/component-ratings
Fix runtimes using Tweak Component Ratings on non-machines
2017-12-10 14:08:21 -06:00
AnturK
030812035f Undelaying will now reboot the server normally. (#33423) 2017-12-10 12:54:02 -06:00
Jordan Brown
8b9e15d1b5 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 10:35:23 -06:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
AnturK
4671fd9724 Fixes ahelp trimming (#33268) 2017-12-05 14:27:16 -06:00
Leo
c0547bea4b Merge pull request #33217 from tgstation/Cyberboss-patch-3
Makes ahelp timestamps consistent with logs
2017-12-03 16:07:30 -06:00
Jordan Brown
87c16e3939 Merge pull request #33112 from AnturK/devilfix
Fixes devilstuff
2017-11-28 06:29:25 -06:00
Dorsisdwarf
6dea43c709 Advanced Laserpointer Feline Interaction 2017-11-24 17:56:58 -06:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
deathride58
cf01fa79db Merge pull request #4078 from Citadel-Station-13/upstream-merge-32801
[MIRROR] Adds ip and cid to banning panel ban search
2017-11-23 01:04:20 +00:00
LetterJay
eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
Jordie
31b9828285 Adds ip and cid to banning panel ban search (#32801)
For kevinz000 because he managed to lose a ban and couldn't find it with ckey or ackey somehow.

No indexes because ORDER BY indexing is too finicky and having something like 8 indexes just for this wouldn't be worth the slowdown.
2017-11-22 15:38:07 -06:00
Jordan Brown
5468bcc56f ahelp command can now accept a ticket # (#32970)
* `ahelp` command can now accept a ticket #

As opposed to only a ckey

* Fix bad invocation of TicketByID()

* Use correct ahelp typepath
2017-11-22 12:38:07 -06:00
deathride58
0f9a85e4d7 Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101
[MIRROR] Refactor of catpeople mutant organs
2017-11-21 21:16:31 +00:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58
d8e1562fcf Merge pull request #3995 from deathride58/manualsyncsreeEEEE
Manual map syncs + manual mirrors of missed upstream map PRs
2017-11-20 05:12:06 +00:00
deathride58
eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
deathride58
bc1f65b381 Update adminhelp.dm 2017-11-18 00:24:52 -05:00
deathride58
3cee5f3568 Update pray.dm 2017-11-17 23:36:00 -05:00
deathride58
2d250c9b01 Update playsound.dm 2017-11-17 23:34:31 -05:00
deathride58
9cb06c70f6 Update adminjump.dm 2017-11-17 23:33:22 -05:00
deathride58
b55312613f Update secrets.dm 2017-11-17 23:31:47 -05:00
deathride58
4bf7fd963d Update secrets.dm 2017-11-17 23:30:31 -05:00
deathride58
7669ea4820 and copypasta falls out of my pocket 2017-11-17 22:14:09 -05:00
deathride58
fb62491701 manual map syncs + manual missed pr mirrors 2017-11-17 21:34:49 -05:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
Tad Hardesty
5abfb077bd Fix Create Object/Turf/Mob all having the same title (#32747) 2017-11-15 19:06:51 -06:00
LetterJay
286442cf4a Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183
[MIRROR] Ling datum antag standarization.
2017-11-15 15:00:46 -06:00
LetterJay
a90a1d8eca Update player_panel.dm 2017-11-15 12:20:30 -06:00
LetterJay
d899fadd18 missed this during the REF purge 2017-11-15 12:17:49 -06:00
LetterJay
1939e96bb6 Merge branch 'master' into upstream-merge-32183 2017-11-15 10:22:40 -06:00
LetterJay
16019df886 Merge branch 'master' into upstream-merge-32280 2017-11-15 10:21:04 -06:00
LetterJay
bbef661092 Merge pull request #3927 from Citadel-Station-13/upstream-merge-32481
[MIRROR] [READY]integrated circuitry port+upgrade.
2017-11-14 15:51:03 -06:00
LetterJay
c3b60e502e Merge pull request #3882 from Citadel-Station-13/upstream-merge-32371
[MIRROR] SSoverlay improvements and tweaks
2017-11-14 14:56:34 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJay
304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
LetterJay
09f2c19f0f Update admin_verbs.dm 2017-11-13 11:40:22 -06:00
Emmett Gaines
3c35202b5e Performance and usability improvement for blueprints 2017-11-13 03:32:35 -06:00