shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,454 Commits 5 Branches 0 Tags
0f2fd05e87ffd5efe39a7e9d2fd73ea419d0e500
Commit Graph

514 Commits

Author SHA1 Message Date
duncathan salt
0f2fd05e87 removes silly garbage defines 2017-12-19 08:02:18 -06:00
LetterJay
75fe7bfa65 Merge pull request #4402 from Citadel-Station-13/upstream-merge-33578 
[MIRROR] Changes manage job slots to use a browser datum, also lets it be used before roundstart
 2017-12-18 15:19:22 -06:00
LetterJay
91a26e66cf Merge pull request #4396 from Citadel-Station-13/upstream-merge-33513 
[MIRROR] ahelp chat command is silent on success
 2017-12-17 21:24:24 -06:00
LetterJay
78dcad12e4 Merge pull request #4391 from Citadel-Station-13/upstream-merge-33527 
[MIRROR] Adds some permission checks to admin/topic
 2017-12-17 21:23:42 -06:00
LetterJay
3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519 
[MIRROR] Finishes the forceMove port
 2017-12-17 20:28:07 -06:00
Jordan Brown
6a09d5c981 Merge pull request #33578 from lzimann/job 
Changes manage job slots to use a browser datum, also lets it be used before roundstart
 2017-12-17 04:09:45 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
deathride58
b1efb191bc fixes brain_damage_lines.json compile errors 2017-12-15 16:35:07 -08:00
oranges
b1ca28ef3c Merge pull request #33513 from tgstation/Cyberboss-patch-2 
ahelp chat command is silent on success
 2017-12-15 17:00:58 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
Kyle Spier-Swenson
2152bc7121 Adds some permission checks to admin/topic (#33527) 2017-12-15 03:27:46 -06:00
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
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -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