shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,287 Commits 5 Branches 0 Tags
0dbc2241eabc90e83c677540f0ea70ab184dff29
Commit Graph

553 Commits

Author SHA1 Message Date
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay
b6a8902e01 Merge pull request #4639 from Citadel-Station-13/upstream-merge-34032 
[MIRROR] Unsquishes job ban panel
 2018-01-03 04:57:12 -06:00
Dax Dupont
417e3d801e Unsquishes job ban panel 2018-01-02 20:10:30 -06:00
LetterJay
3a2deb1d49 Merge branch 'master' into upstream-merge-33601 2018-01-02 18:26:18 -06:00
LetterJay
f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2018-01-02 05:16:13 -06:00
LetterJay
b49009d481 Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621 
[MIRROR] removes silly garbage defines
 2018-01-02 04:52:57 -06:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
BeeSting12
7dac76651e Makes it clear that command reports are IC. (#33949) 
* fixes #33936

* sticky's idea was better
 2017-12-31 02:28:25 -06:00
LetterJay
dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -06:00
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
deathride58
a8154d102a Merge pull request #4531 from Citadel-Station-13/upstream-merge-33777 
[MIRROR] Arena shuttle teleport fix
 2017-12-28 02:53:47 +00:00
LetterJay
e2d2c8cda0 Merge branch 'master' into upstream-merge-33627 2017-12-27 04:41:27 -06:00
Tad Hardesty
2e4b622aa4 Add song title display to Play Internet Sound (#33839) 
* Add song title display to Play Internet Sound

* Expands youtube-dl -J flag
 2017-12-26 15:35:05 -06:00
Emmett Gaines
a1ec5538a6 Arena shuttle teleport fix (#33777) 2017-12-25 19:12:20 -06:00
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
deathride58
9ce056322a Merge pull request #4493 from Citadel-Station-13/upstream-merge-33714 
[MIRROR] Job landmarks now show the mob with the proper job outfit.
 2017-12-24 23:05:36 +00:00
kevinz000
454c073d22 Fixes message spam when proccalls are delayed due to another admin's proccalls running (#33732) 
* Fixes proccall block message spam

* One thread
 2017-12-22 10:40:25 -06:00
oranges
4e8898d55f Merge pull request #33714 from lzimann/icon 
Job landmarks now show the mob with the proper job outfit.
 2017-12-21 19:27:23 -06:00
CitadelStationBot
ff4c5907a6 [MIRROR] Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round. (#4484) 
* Merge pull request #33730 from kevinz000/patch-409

Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round.

* Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round.
 2017-12-21 06:04:20 -08:00
LetterJay
8ea38cfde2 Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681 
[MIRROR] Immovable rod abuse, smite and event trigger.
 2017-12-21 04:55:32 -06:00
LetterJay
56ecc13289 Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246 
[MIRROR] Roundend report refactor
 2017-12-21 03:22:31 -06:00
AnturK
6c4d687db6 Immovable rod abuse, smite and event trigger. (#33681) 2017-12-21 00:11:20 -06:00
deathride58
0be7ea0755 Merge pull request #4451 from Citadel-Station-13/upstream-merge-33599 
[MIRROR] Callback security and usr
 2017-12-21 03:29:13 +00:00
deathride58
17dda62a93 Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622 
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-21 03:28:14 +00:00
LetterJay
00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
oranges
d960c45e77 Merge pull request #33622 from duncathan/assert_gas 
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-20 00:14:13 -06:00
LetterJay
2148eb021b Update randomverbs.dm 2017-12-19 19:34:44 -06:00
LetterJay
da2bf6293f Update one_click_antag.dm 2017-12-19 19:34:02 -06:00
LetterJay
80412ae3b9 Update player_panel.dm 2017-12-19 19:32:18 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
duncathan salt
0f2fd05e87 removes silly garbage defines 2017-12-19 08:02:18 -06:00
Jordan Brown
fabfad270f Callback security and usr (#33599) 
* Gonna regret writing this one day

* tmp -> temp

* Make PushUsr() a /world proc

* Callbacks now preserve usr

* Fixes PushUsr return value

* Fixes PushUsr invocations

* Update modifyvariables.dm

* Use weakrefs in callback user

* Further fixes

* Whoopsie
 2017-12-18 21:41:33 -06:00
Emmett Gaines
8cf30a65fb dock() re-organization 2017-12-18 21:23:58 -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
LetterJay
245545c134 Update adminhelp.dm 2017-12-17 15:53:13 -06:00
Jordan Brown
a834287d65 Fixes cross comms 2017-12-17 15:05:43 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -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