shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,860 Commits 5 Branches 0 Tags
0f61a5a5eea0673febb8cd98f03cb1014aee6b14
Commit Graph
6860 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
RobustinandCitadelStationBot 0f61a5a5ee Fixes Clock Cult ending with dead cultists (#31504) 
* Probably fixes premature CC ending

* I should make this commit into a 2nd PR for GBP
 2017-10-10 12:38:31 -05:00
CitadelStationBot f8d0646b09 Automatic changelog generation for PR #3277 [ci skip] 2017-10-10 04:56:20 -05:00
LetterJayandGitHub 9d7877cd02 Merge pull request #3277 from Citadel-Station-13/upstream-merge-31012 
[MIRROR] Syndicate turrets (and other machines in walls) can now be hit by projectiles. Also reworks target priorities.
 2017-10-10 05:56:18 -04:00
LetterJayandGitHub 5c88efd838 Merge pull request #3276 from Citadel-Station-13/upstream-merge-31482 
[MIRROR] Removes a spawn from revolution gamemode code
 2017-10-10 05:55:56 -04:00
LetterJayandGitHub f53d0844fc Merge pull request #3275 from Citadel-Station-13/upstream-merge-31483 
[MIRROR] Removes a spawn from nukeop gamemode code
 2017-10-10 05:55:48 -04:00
LetterJayandGitHub b7c65c7482 Merge pull request #3274 from Citadel-Station-13/upstream-merge-31492 
[MIRROR] Fixes xeno mass confusion
 2017-10-10 05:55:38 -04:00
LetterJayandGitHub f0fc11f5b5 Merge pull request #3273 from Citadel-Station-13/upstream-merge-31493 
[MIRROR] Fixes closet layer
 2017-10-10 05:55:28 -04:00
LetterJayandGitHub c24a212f0e Merge pull request #3272 from Citadel-Station-13/upstream-merge-31447 
[MIRROR] Adds walk and step SDQL2 wrappers
 2017-10-10 05:55:17 -04:00
LetterJayandGitHub 8b16fc54d6 Merge pull request #3271 from Citadel-Station-13/upstream-merge-31440 
[MIRROR] Fixes runtime with lavaland_equipment_pressure_check if air isn't initialized on a turf or whatever
 2017-10-10 05:55:03 -04:00
CitadelStationBot 59d3139a59 Automatic changelog generation for PR #3270 [ci skip] 2017-10-10 04:54:46 -05:00
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 a9faf3e73e Syndicate turrets (and other machines in walls) can now be hit by projectiles. Also reworks target priorities. 2017-10-10 03:28:33 -05:00
GLACodingandCitadelStationBot 9050cc63ca Syndicate turrets (and other machines in walls) can now be hit by projectiles. Also reworks target priorities. (#31012) 
* Projectile code additions

* Adds !prehit checks and corrects the check for energy cannon spam

* Adds checks for machines and structures to stop double hitting

* JJRcop Requesting Fixes #1

* JJRcop Requested Fixes #2

* Fixes projectiles unable to hit mobs in machines

* Adds in a new proc select_target, and rewrites some bits

Fixes projectiles double hitting when targetting machines with mobs on them, also makes it so weapons with forcedodge can hit targets inside walls.

* AnturK requested fix #1
 2017-10-10 03:28:33 -05:00
CitadelStationBot 6de67bb1ff Removes a spawn from revolution gamemode code 2017-10-10 03:23:21 -05:00
orangesandCitadelStationBot 260ec3364b Merge pull request #31482 from kevinz000/patch-328 
Removes a spawn from revolution gamemode code
 2017-10-10 03:23:20 -05:00
CitadelStationBot ae86b0c7bd Removes a spawn from nukeop gamemode code 2017-10-10 03:23:14 -05:00
orangesandCitadelStationBot 1843738e7c Merge pull request #31483 from kevinz000/patch-329 
Removes a spawn from nukeop gamemode code
 2017-10-10 03:23:14 -05:00
CitadelStationBot 140c458b7a Fixes xeno mass confusion 2017-10-10 03:22:03 -05:00
orangesandCitadelStationBot 429543f4ae Merge pull request #31492 from ShizCalev/sometimes-i-drink-a-glass-of-water-just-to-suprise-my-liver 
Fixes xeno mass confusion
 2017-10-10 03:22:03 -05:00
CitadelStationBot f60dfb7865 Fixes closet layer 2017-10-10 03:20:53 -05:00
AnturKandCitadelStationBot 344238a401 Fixes closet layer (#31493) 
* Fixes closet layer

* Actually this might be better.
 2017-10-10 03:20:53 -05:00
CitadelStationBot 0e7c679766 Adds walk and step SDQL2 wrappers 2017-10-10 03:18:43 -05:00
kevinz000andCitadelStationBot 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
CitadelStationBot 630ffaf427 Fixes runtime with lavaland_equipment_pressure_check if air isn't initialized on a turf or whatever 2017-10-10 03:17:33 -05:00
orangesandCitadelStationBot 472e68be9c Merge pull request #31440 from kevinz000/patch-319 
Fixes runtime with lavaland_equipment_pressure_check if air isn't initialized on a turf or whatever
 2017-10-10 03:17:33 -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