shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,836 Commits 5 Branches 0 Tags
a1d48686017b31fe9938615a09ac61b9644b73bc
Commit Graph
6836 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub a1d4868601 Merge pull request #3270 from Citadel-Station-13/upstream-merge-31437 
[MIRROR] Makes the santa event properly poll ghosts
 2017-10-10 05:54:44 -04:00
CitadelStationBot 3251264f0a Automatic changelog generation for PR #3269 [ci skip] 2017-10-10 04:54:34 -05:00
LetterJayandGitHub c3533fee76 Merge pull request #3269 from Citadel-Station-13/upstream-merge-31408 
[MIRROR] Makes cameras work on shuttles
 2017-10-10 05:54:33 -04:00
CitadelStationBot 1ff6602834 Automatic changelog generation for PR #3268 [ci skip] 2017-10-10 04:54:19 -05:00
LetterJayandGitHub 0331110388 Merge pull request #3268 from Citadel-Station-13/upstream-merge-31416 
[MIRROR] Clockwork Golems will not slip on glass
 2017-10-10 05:54:18 -04:00
LetterJayandGitHub 26800c1d1d Merge pull request #3267 from Citadel-Station-13/upstream-merge-31399 
[MIRROR] Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser
 2017-10-10 05:54:08 -04:00
CitadelStationBot 8aabbe56b7 Automatic changelog generation for PR #3266 [ci skip] 2017-10-10 04:53:18 -05:00
LetterJayandGitHub 65f584d9ec Merge pull request #3266 from Citadel-Station-13/upstream-merge-31381 
[MIRROR] Improve extended examination text for many objects
 2017-10-10 05:53:17 -04:00
CitadelStationBot 9665fa226c Automatic changelog generation for PR #3265 [ci skip] 2017-10-10 04:52:28 -05:00
LetterJayandGitHub 73cfa0eb62 Merge pull request #3265 from Citadel-Station-13/upstream-merge-31394 
[MIRROR] Makes the asteroid escape shuttle throw people
 2017-10-10 05:52:26 -04:00
LetterJayandGitHub b0c833059e Update chunk.dm 2017-10-10 04:40:26 -05:00
CitadelStationBot 49bf5905e9 Makes the santa event properly poll ghosts 2017-10-10 03:16:24 -05:00
MoreRobustThanYouandCitadelStationBot b05a4ebb29 Makes the santa event properly poll ghosts (#31437) 
* Makes the santa event properly poll ghosts

* Update xmas.dm

* Update xmas.dm

* Create event.dm

* Update tgstation.dme

* Update xmas.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm
 2017-10-10 03:16:23 -05:00
orangesandCitadelStationBot 494bb0222c Makes cameras work on shuttles 2017-10-10 03:15:13 -05:00
CitadelStationBot a5401fa570 Clockwork Golems will not slip on glass 2017-10-10 03:14:01 -05:00
orangesandCitadelStationBot 5d3a805d30 Merge pull request #31416 from Armhulen/patch-2 
Clockwork Golems will not slip on glass
 2017-10-10 03:14:01 -05:00
CitadelStationBot c074cabe1a Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser 2017-10-10 03:11:50 -05:00
kevinz000andCitadelStationBot a6ac800db0 Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser (#31399) 
* precision

* precision

* sanity checks

* itt kevinz doesn't know how cyberboss procs work

* fixes

* allows user cancellation

* im dumb

* itt: im still dumb

* fixes stuff, makes it set on init

* refactors reagentgrinder code

* more fixes, prevents melee attacks from going anyways

* ...? wtf is with usetopic

* Finally found out what's wrongw ith this thing.

* fixes a mistake
 2017-10-10 03:11:50 -05:00
CitadelStationBot 3b4b2af687 Improve extended examination text for many objects 2017-10-10 03:07:38 -05:00
Tad HardestyandCitadelStationBot 01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
CitadelStationBot 6c92c7f30c Makes the asteroid escape shuttle throw people 2017-10-10 03:07:31 -05:00
orangesandCitadelStationBot 304c07fb7e Merge pull request #31394 from ninjanomnom/asteroid-shuttle 
Makes the asteroid escape shuttle throw people
 2017-10-10 03:07:31 -05:00
LetterJayandGitHub eb9737912c Merge pull request #3242 from Citadel-Station-13/upstream-merge-31418 
[MIRROR] Fixes missing plating icons
 2017-10-10 02:47:16 -04:00
CitadelStationBot a064eb080e Automatic changelog generation for PR #3264 [ci skip] 2017-10-10 01:46:46 -05:00
LetterJayandGitHub 295c509236 Merge pull request #3264 from Kevak/Shockcollarpocketfix 
Fixes Shock Collars Getting Stuck In Pockets.
 2017-10-10 02:46:45 -04:00
CitadelStationBot 098c3787a3 Automatic changelog generation for PR #3248 [ci skip] 2017-10-10 01:46:06 -05:00
LetterJayandGitHub e0f9167153 Merge pull request #3248 from Citadel-Station-13/upstream-merge-31066 
[MIRROR] Refactors virus spreading
 2017-10-10 02:46:04 -04:00
Kevak fb60efeacb Fixes shock collars getting stuck in pockets. 2017-10-09 22:45:02 -07:00
CitadelStationBot a1a18d7b4e Automatic changelog generation for PR #3262 [ci skip] 2017-10-10 00:06:25 -05:00
LetterJayandGitHub 1ce9626bc9 Merge pull request #3262 from Citadel-Station-13/upstream-merge-31478 
[MIRROR] Fixes the crew pinpointer icon for west facing medium arrow
 2017-10-10 01:06:24 -04:00
LetterJayandGitHub 9aca1d6cf6 Merge pull request #3261 from Citadel-Station-13/upstream-merge-31446 
[MIRROR] Boolean defines in mech construction datums, clears out some dels
 2017-10-10 01:06:12 -04:00
LetterJayandGitHub 7edd104159 Merge pull request #3260 from Citadel-Station-13/upstream-merge-31439 
[MIRROR] Fixes invalid arg runtime with drop_if_replaced
 2017-10-10 01:05:59 -04:00
LetterJayandGitHub ad69aa5b8d Merge pull request #3259 from Citadel-Station-13/upstream-merge-31465 
[MIRROR] Removes a spawn from traitor code
 2017-10-10 01:05:47 -04:00
LetterJayandGitHub e6fad0965d Merge pull request #3258 from Citadel-Station-13/upstream-merge-31451 
[MIRROR] Update server tools API to 3.1.0.2
 2017-10-10 01:05:35 -04:00
LetterJayandGitHub 94d36578e1 Merge pull request #3257 from Citadel-Station-13/upstream-merge-31468 
[MIRROR] Gets rid of spawns in buttons
 2017-10-10 01:05:21 -04:00
CitadelStationBot 0b9d251608 Automatic changelog generation for PR #3256 [ci skip] 2017-10-10 00:05:05 -05:00
LetterJayandGitHub e232520705 Merge pull request #3256 from Citadel-Station-13/upstream-merge-31469 
[MIRROR] Fixes Teslas always doing the same movement pattern
 2017-10-10 01:05:03 -04:00
LetterJayandGitHub 634633c691 Merge pull request #3255 from Citadel-Station-13/upstream-merge-31466 
[MIRROR] Makes config loading messages consistent
 2017-10-10 01:04:42 -04:00
LetterJayandGitHub b969bb7eec Update data_huds.dm 2017-10-10 00:04:20 -05:00
NeriandGitHub e2b786a328 Merge pull request #13 from Citadel-Station-13/master 
Updating fork
 2017-10-09 20:06:46 -07:00
CitadelStationBot 10cecff362 Automatic changelog generation for PR #3263 [ci skip] 2017-10-09 22:02:48 -05:00
LetterJayandGitHub 3082f82ead Merge pull request #3263 from deathride58/readdkinkmates 
Readds kinkmates to delta and meta
 2017-10-09 23:02:46 -04:00
CitadelStationBot 2cbc034d5f Automatic changelog generation for PR #3240 [ci skip] 2017-10-09 22:02:32 -05:00
LetterJayandGitHub 803434f3a3 Merge pull request #3240 from deathride58/furryhippie 
Cherrypicks several Boxstation changes from old Hippie (+ other small tweaks)
 2017-10-09 23:02:31 -04:00
LetterJayandGitHub 11abb49d12 Merge pull request #3254 from Citadel-Station-13/upstream-merge-31463 
[MIRROR] Stops check antags message if round has not started yet.
 2017-10-09 23:02:06 -04:00
LetterJayandGitHub 8c0ecb3c5c Merge pull request #3253 from Citadel-Station-13/upstream-merge-31470 
[MIRROR] Uses the proper list for xeno landmarks/nightmare spawning
 2017-10-09 23:01:59 -04:00
LetterJayandGitHub 95031ae187 Merge pull request #3252 from Citadel-Station-13/upstream-merge-31441 
[MIRROR] Fixes a forceMove(null)
 2017-10-09 23:01:51 -04:00
CitadelStationBot d0335ebba6 Automatic changelog generation for PR #3251 [ci skip] 2017-10-09 22:01:45 -05:00
LetterJayandGitHub 5d219d691d Merge pull request #3251 from Citadel-Station-13/upstream-merge-31448 
[MIRROR] Fixes 9mm ammo appearing in traitortot surplus crates
 2017-10-09 23:01:43 -04:00
LetterJayandGitHub 261df4f136 Merge pull request #3250 from Citadel-Station-13/upstream-merge-31387 
[MIRROR] Adds a hacked autolathe subtype
 2017-10-09 23:01:35 -04:00