shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,080 Commits 5 Branches 0 Tags
f03df4f7bb2d8f30470f988d0ee2e2190bbdeb7e
Commit Graph

2561 Commits

Author SHA1 Message Date
LetterJay
3c0a9c23e1 Merge pull request #3081 from Citadel-Station-13/upstream-merge-31196 
[MIRROR] Fixes check antagonists for blood brothers
 2017-10-02 21:12:40 -04: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
LetterJay
2c219ba814 Merge pull request #3077 from Citadel-Station-13/upstream-merge-31192 
[MIRROR] ismecha define
 2017-10-02 21:11:59 -04:00
LetterJay
08b9a11536 Update retaliate.dm 2017-10-02 17:32:54 -05:00
oranges
139ebadc52 Merge pull request #31196 from kevinz000/patch-303 
Fixes check antagonists for blood brothers
 2017-10-02 15:52:10 -05: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
LetterJay
87690e3bb7 Merge pull request #3072 from Citadel-Station-13/upstream-merge-31186 
[MIRROR] played_url now includes ckey
 2017-10-02 02:31:39 -04:00
LetterJay
313196b42f Merge pull request #3062 from Citadel-Station-13/upstream-merge-31201 
[MIRROR] Fixes grown runtime spam
 2017-10-02 02:31:32 -04:00
Jordan Brown
bd76e658b0 Makes the reply link for ahelps use the global token (#31191) 2017-10-02 01:14:14 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
cc93f1e546 Merge pull request #3074 from Citadel-Station-13/upstream-merge-31127 
[MIRROR] Chat command to notify admins when the round ends
 2017-10-01 23:53:41 -04:00
LetterJay
684d888366 Update playsound.dm 2017-10-01 22:51:34 -05:00
LetterJay
a921dcd568 Merge pull request #3064 from Citadel-Station-13/upstream-merge-31177 
[MIRROR] Ashwalker tendrils now drop everything on victims before consuming
 2017-10-01 23:39:48 -04:00
LetterJay
021b0a2bee Update growninedible.dm 2017-10-01 22:38:55 -05:00
LetterJay
2cafd6fefb Merge pull request #3060 from Citadel-Station-13/upstream-merge-31086 
[MIRROR] Adds desc to things lacking them.
 2017-10-01 23:37:35 -04:00
LetterJay
fc89d769f0 Merge pull request #3056 from Citadel-Station-13/upstream-merge-31130 
[MIRROR] Adds the Cargo-Tech-of-the-Shift award
 2017-10-01 23:37:26 -04:00
LetterJay
cc8f494f1f Merge pull request #3036 from Citadel-Station-13/upstream-merge-31129 
[MIRROR] Cleans up some antag/event landmark checks
 2017-10-01 23:36:48 -04:00
oranges
b9f71e9e15 Merge pull request #31127 from Cyberboss/notify_command 
Chat command to notify admins when the round ends
 2017-10-01 21:12:41 -05:00
LetterJay
05022208e3 Merge pull request #3067 from Citadel-Station-13/upstream-merge-31213 
[MIRROR] Revert "Prompt for observer confirmation now happens when you click it initially"
 2017-10-01 20:48:09 -04:00
JJRcop
7c88f10db0 played_url now includes ckey 2017-10-01 19:30:43 -05:00
LetterJay
64ced3f6f4 Merge pull request #3061 from Citadel-Station-13/upstream-merge-31114 
[MIRROR] Fixes space vision
 2017-10-01 16:56:24 -04:00
oranges
e2dd424fb0 Revert "Prompt for observer confirmation now happens when you click it initially" 2017-10-01 15:50:27 -05:00
LetterJay
353739071f Update lib_items.dm 2017-10-01 15:46:53 -05:00
LetterJay
0480bebc8b Merge pull request #3058 from Citadel-Station-13/upstream-merge-31167 
[MIRROR] Prompt for observer confirmation now happens when you click it initially
 2017-10-01 16:38:27 -04:00
LetterJay
77bdebd020 Merge pull request #3053 from Citadel-Station-13/upstream-merge-31155 
[MIRROR] Fixes station name in cargo stock displays
 2017-10-01 16:37:31 -04:00
LetterJay
cef0d9ef68 Merge pull request #3052 from Citadel-Station-13/upstream-merge-31165 
[MIRROR] fixes delete hotkey triggering messages when the user isn't even a living mob
 2017-10-01 16:35:53 -04:00
LetterJay
c8647565fc Merge pull request #3048 from Citadel-Station-13/upstream-merge-31157 
[MIRROR] Fixes events with sleeps.
 2017-10-01 16:32:00 -04:00
LetterJay
f538d91fe8 Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145 
[MIRROR] Fixes aliums being able to attack the SM crystal
 2017-10-01 16:31:44 -04:00
LetterJay
3d2b5e99c9 Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143 
[MIRROR] adds a space
 2017-10-01 16:29:35 -04:00
LetterJay
2d8e3b301f Merge pull request #3037 from Citadel-Station-13/upstream-merge-31128 
[MIRROR] Removes irccheck admin restriction
 2017-10-01 16:29:04 -04:00
LetterJay
676abb946c Update halloween.dm 2017-10-01 15:26:56 -05:00
LetterJay
f1f99fc26c Update electrical_storm.dm 2017-10-01 15:26:32 -05:00
LetterJay
00aa312610 Update carp_migration.dm 2017-10-01 15:26:15 -05:00
kevinz000
4274a875db Ashwalker tendrils now drop everything on victims before consuming (#31177) 
* Update ash_walker_den.dm

* Update ash_walker_den.dm
 2017-10-01 15:22:26 -05:00
LetterJay
e572d2e529 Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138 
[MIRROR] Structure istype define
 2017-10-01 16:20:56 -04:00
oranges
eeeae1b855 Fixes grown runtime spam 2017-10-01 15:20:07 -05:00
oranges
d701230090 Merge pull request #31114 from AnturK/spacevision 
Fixes space vision
 2017-10-01 15:15:54 -05:00
bawhoppen
82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
LetterJay
21302e3fdc Merge pull request #3032 from Citadel-Station-13/upstream-merge-31141 
[MIRROR] Speeds up simple_animals/hostile/proc/CanAttack()
 2017-10-01 15:49:44 -04:00
LetterJay
e3810ef517 Merge branch 'master' into upstream-merge-31128 2017-10-01 15:46:15 -04:00
LetterJay
6ca3deb8d1 Merge branch 'master' into upstream-merge-31129 2017-10-01 15:45:54 -04:00
oranges
c56bb27bbd Merge pull request #31167 from tgstation/Cyberboss-patch-2 
Prompt for observer confirmation now happens when you click it initially
 2017-10-01 14:43:52 -05:00
LetterJay
fafd98ed0e Merge pull request #3033 from Citadel-Station-13/upstream-merge-31142 
[MIRROR] Fixes cogscarab sprites not updating
 2017-10-01 15:42:35 -04:00
LetterJay
40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117 
[MIRROR] Fixes liches losing spells
 2017-10-01 15:42:12 -04:00
LetterJay
5ec781502c Merge branch 'master' into upstream-merge-31116 2017-10-01 15:09:10 -04:00
Jordan Brown
3a83b28bae Adds the Cargo-Tech-of-the-Shift award 2017-10-01 09:43:20 -05:00
vuonojenmustaturska
e79cd3369f Fixes station name in cargo stock displays (#31155) 2017-10-01 09:26:37 -05:00
kevinz000
40bcb74a56 Fixes delete hotkey triggering messages when the user isn't even a living mob (#31165) 2017-10-01 09:25:27 -05:00
AnturK
cae3dd615d Fixes events with sleeps. 2017-10-01 07:34:01 -05:00