shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,538 Commits 5 Branches 0 Tags
0be326633da5317205e3f1bce7fc84431b2dcfbd
Commit Graph

485 Commits

Author SHA1 Message Date
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
oranges
43113cd9b5 Merge pull request #31947 from AnturK/yarr 
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
 2017-11-13 03:19:38 -06:00
LetterJay
14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
LetterJay
9fefd15f66 Merge branch 'master' into upstream-merge-32247 2017-11-12 23:09:10 -06:00
LetterJay
439723caff Update adminhelp.dm 2017-11-12 11:18:11 -06:00
LetterJay
d8c25f656b Update admin_investigate.dm 2017-11-12 08:56:53 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Kyle Spier-Swenson
2d8fc6de61 SSoverlay improvements and tweaks (#32371) 
* Overlay per-type cost logging.

Overlays will now log how long each type took to process.

Changed up how overlays was done to account for the fact its a queue and not a processor. (it was using almost none of the processing subsystem framework)

Made the overlay loop faster by making it not cut the list until the end.

Added a simple generic benchmark stat tracking system.

I don't know how much overhead this adds to overlays. i may put it behind testing or something, but i do want to test this on the serbers to get some stats.

* Removes flush() as it was creating race conditions

* Use ref

* text2file

* Atoms added as an overlay will have their pending overlays compiled before being converted to an appearance
 2017-11-10 13:26:23 -06:00
swindly
3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
LetterJay
460f19297f Merge pull request #3751 from Citadel-Station-13/upstream-merge-32292 
[MIRROR] animate sqdl wrapper works now.
 2017-11-09 03:20:01 -06:00
Leo
6915acfcd1 Editing a variable now logs the old value (#32478) 
* Editing a variable now logs the old value

* Moves the html_encode to log_admin
 2017-11-07 14:25:02 -06:00
LetterJay
d5a60212b9 Update player_panel.dm 2017-11-07 03:28:52 -06:00
AnturK
2e0aaf8598 Ling datum antag standarization. 2017-11-05 19:32:59 -06:00
Jordan Brown
0bb150ff98 Revert "Adds 'round' chat command" (#32421) 2017-11-05 15:37:50 -06:00
LetterJay
74706b1eea Merge pull request #3791 from Citadel-Station-13/upstream-merge-32367 
[MIRROR] Adds 'round' chat command
 2017-11-04 22:47:48 -05:00
LetterJay
03a0057609 Merge pull request #3785 from Citadel-Station-13/upstream-merge-32384 
[MIRROR] Hopefully fixes guest accounts being able to log in
 2017-11-04 22:45:00 -05:00
LetterJay
113e3a5b53 Merge pull request #3783 from Citadel-Station-13/upstream-merge-32358 
[MIRROR] Dullahan Fixes
 2017-11-04 22:44:23 -05:00
Leo
1db88cecb2 Merge pull request #32367 from tgstation/Cyberboss-patch-3 
Adds 'round' chat command
 2017-11-03 17:36:09 -05:00