shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,719 Commits 5 Branches 0 Tags
439723caffeb016f9cb50b669fec67c8441bf60e
Commit Graph

256 Commits

Author SHA1 Message Date
LetterJay
439723caff Update adminhelp.dm 2017-11-12 11:18:11 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -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
113e3a5b53 Merge pull request #3783 from Citadel-Station-13/upstream-merge-32358 
[MIRROR] Dullahan Fixes
 2017-11-04 22:44:23 -05:00
KorPhaeron
8f1d81f816 Dullahan Fixes (#32358) 
* Dullahan

* Fixes cyborg issue

* Fixes hearing issues
 2017-11-03 15:54:19 -05:00
Leo
ada8ad0ead Proper and improper macros are removed before sending to irc (#32347) 
* Proper and improper macros are removed before sending to irc

* Removes leftover check
 2017-11-03 15:53:26 -05:00
LetterJay
196fb5f345 Update SDQL_2_wrappers.dm 2017-11-02 02:22:32 -05:00
Leo
24eece99a5 animate sqdl wrapper works now. 2017-11-01 21:38:35 -05:00
Leo
a9ef812497 Merge pull request #32289 from AutomaticFrenzy/patch/nukies 
Fix quick-create nuke team
 2017-11-01 21:38:29 -05:00
LetterJay
254ffca3b7 Merge pull request #3668 from Citadel-Station-13/upstream-merge-32162 
[MIRROR] Actually fixes meteors, again
 2017-10-29 15:49:40 -04:00
LetterJay
47cfffbb26 Merge pull request #3648 from Citadel-Station-13/upstream-merge-32116 
[MIRROR] Line by line profiling system
 2017-10-29 15:48:47 -04:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
vuonojenmustaturska
d6d01ab630 Actually fixes meteors, again (#32162) 
* Actually fixes meteors, again

* unrelated typo fix for an admin debug verb
 2017-10-29 07:13:31 -05:00
LetterJay
41eb83fb3d Merge pull request #3658 from Citadel-Station-13/upstream-merge-32127 
[MIRROR] [s] Blocks world proc calls
 2017-10-29 03:47:43 -04:00
LetterJay
4b300cee6c Merge branch 'master' into upstream-merge-32116 2017-10-29 03:45:59 -04:00
LetterJay
5f9a76c6dd Merge pull request #3644 from Citadel-Station-13/upstream-merge-32009 
[MIRROR] Add a safety check to buildmode, also fix a bug with corner selection
 2017-10-29 03:45:06 -04:00
oranges
c00c1dcc00 Merge pull request #32127 from tgstation/Cyberboss-patch-3 
[s] Blocks world proc calls
 2017-10-27 17:35:20 -05:00
Jordan Brown
f36d3ff08a Line by line profiling system 2017-10-27 13:10:21 -05:00
JamieH
7811507f1a Add a safety check to buildmode, also fix a bug with corner selection (#32009) 
* Update buildmode.dm

* Add files via upload

* Update buildmode.dm

* Update buildmode.dm
 2017-10-27 04:51:58 -05:00
deathride58
55cad46845 Adds a button to let people ahelping know their issue is being handled 2017-10-26 12:21:28 -04:00
LetterJay
5337b1fed2 Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780 
[MIRROR] Disentangles blob from blob mode/removes blob mode
 2017-10-22 16:39:35 -04:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
KorPhaeron
20b17eceec Disentangles blob from blob mode/removes blob mode 2017-10-18 20:55:42 -05:00
Leo
3857bfb2fc Merge pull request #31768 from AnturK/ahelptrim 
Trims ahelps
 2017-10-16 16:48:04 -05:00
Leo
506324fbec Merge pull request #31670 from tgstation/Cyberboss-patch-3 
IC Issue also tells the ahelper that their ticket has been resolved
 2017-10-14 09:07:03 -05:00
Armhulen
49d5d08456 Adds a fireball from the heavens as an admin smite (#31502) 
* really gamers?

* yeah yeah YEAH

* cucked again!

* it works

* I SAID IT WORKS
 2017-10-12 20:37:58 -05:00
LetterJay
f93733576e Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528 
[MIRROR] Minor refactor of how gas IDs are handled
 2017-10-12 07:19:30 -04:00
LetterJay
e15c337851 Merge pull request #3306 from Citadel-Station-13/upstream-merge-31449 
[MIRROR] Datum antag wizard.
 2017-10-12 07:15:53 -04:00
LetterJay
6ed7f455b7 Update modifyvariables.dm 2017-10-12 02:54:26 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
AnturK
5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
Kyle Spier-Swenson
4c10fe270f Fixes VVing associated values in lists when the value was a number. 2017-10-10 22:17:56 -05:00
kevinz000
7f08bf08e3 Adds walk and step SDQL2 wrappers (#31447) 
* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm
 2017-10-10 03:18:43 -05:00
Jordan Brown
4f32b7a0d4 Moves assert_gas() into a define it should always have been, speeding up atmos slightly 2017-10-07 13:37:28 -05:00
ExcessiveUseOfCobblestone
f2102c68f1 Resolving tickets now informs the player. (#31357) 
* Update adminhelp.dm

* Update adminhelp.dm
 2017-10-06 21:25:53 -05:00
oranges
bb9982e772 Merge pull request #31296 from ShizCalev/landmark-cleanup 
Cleans up and fixes old landmarks
 2017-10-05 03:05:40 -05:00
LetterJay
9026f029d5 Merge pull request #3079 from Citadel-Station-13/upstream-merge-31103 
[MIRROR] Refactor quick create antag panel code, fixed AFK revs not properly ending the round.
 2017-10-02 21:12:31 -04:00
LetterJay
4d68cd0803 Merge pull request #3078 from Citadel-Station-13/upstream-merge-31191 
[MIRROR] Makes the reply link for ahelps use the global token
 2017-10-02 21:12:17 -04:00
ShizCalev
e402c4350c Refactor quick create antag panel code, fixed AFK revs not properly ending the round. (#31103) 
* Refactor quick create antag, fixed AFK revs not ending

* More cleanup

* Simplified one of the checks
The other half was covered by considered_alive already.

* Reordered check

Eliminate current antags sooner before running them through the rest of
the checks.

* removed switch
 2017-10-02 02:48:51 -05:00
Jordan Brown
bd76e658b0 Makes the reply link for ahelps use the global token (#31191) 2017-10-02 01:14:14 -05:00
LetterJay
684d888366 Update playsound.dm 2017-10-01 22:51:34 -05:00
JJRcop
7c88f10db0 played_url now includes ckey 2017-10-01 19:30:43 -05:00
LetterJay
5ec781502c Merge branch 'master' into upstream-merge-31116 2017-10-01 15:09:10 -04:00
LetterJay
80a84db919 Update adminhelp.dm 2017-10-01 02:39:24 -05:00
LetterJay
0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04:00
LetterJay
49c63dd794 Update randomverbs.dm 2017-10-01 01:57:03 -05:00
LetterJay
747312cb6d updates 2017-10-01 00:59:59 -05:00
AnturK
6afd603fe6 Fixes some hardset dna misuse 2017-09-30 14:51:52 -05:00