shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,885 Commits 5 Branches 0 Tags
b358324c09100889fb6241d0f662d9c480323ad7
Commit Graph
6885 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub b358324c09 Merge pull request #3286 from Citadel-Station-13/upstream-merge-31481 
[MIRROR] Removes spawn from meteors.
 2017-10-10 22:30:58 -04:00
LetterJayandGitHub 1191ccf9de Merge pull request #3285 from Citadel-Station-13/upstream-merge-31505 
[MIRROR] Fixes crashed ship runtime
 2017-10-10 22:30:42 -04:00
CitadelStationBot 930cc9a219 Automatic changelog generation for PR #3284 [ci skip] 2017-10-10 21:30:00 -05:00
LetterJayandGitHub 74fbde6801 Merge pull request #3284 from Citadel-Station-13/upstream-merge-31495 
[MIRROR] Diseases will now cure if species is changed
 2017-10-10 22:29:58 -04:00
CitadelStationBot 15066973cd Automatic changelog generation for PR #3283 [ci skip] 2017-10-10 21:28:38 -05:00
LetterJayandGitHub e494f5cc8b Merge pull request #3283 from Citadel-Station-13/upstream-merge-31504 
[MIRROR] Fixes Clock Cult ending with dead cultists
 2017-10-10 22:28:36 -04:00
LetterJayandGitHub f1124cf376 Merge pull request #3282 from Citadel-Station-13/upstream-merge-31356 
[MIRROR] Cleans up atmos unary machinery code
 2017-10-10 22:28:29 -04:00
LetterJayandGitHub ad3b59c247 Merge pull request #3281 from Citadel-Station-13/upstream-merge-31498 
[MIRROR] Fixes emote runtimes
 2017-10-10 22:28:14 -04:00
LetterJayandGitHub f15db182fe Merge pull request #3280 from Citadel-Station-13/upstream-merge-31497 
[MIRROR] Fixes some tempremoves
 2017-10-10 22:28:03 -04:00
LetterJayandGitHub b7470ce4d8 Merge pull request #3279 from Citadel-Station-13/upstream-merge-31484 
[MIRROR] Removes portable chem dispenser from xenobio
 2017-10-10 22:27:41 -04:00
CitadelStationBot 57b3636549 Removes spawn from meteors. 2017-10-10 12:46:05 -05:00
kevinz000andCitadelStationBot e5c87a8868 Removes spawn from meteors. (#31481) 
* Update meteors.dm

* Update meteors.dm

* Update meteors.dm

* Update meteors.dm

* Update meteors.dm

* Update meteors.dm
 2017-10-10 12:46:05 -05:00
CitadelStationBot 1a61e3cf7a Fixes crashed ship runtime 2017-10-10 12:42:52 -05:00
Jordan BrownandCitadelStationBot 039b6ae9ce Merge pull request #31505 from ShizCalev/crashed-ship-fix 
Fixes crashed ship runtime
 2017-10-10 12:42:52 -05:00
CitadelStationBot e82c163a7d Diseases will now cure if species is changed 2017-10-10 12:41:42 -05:00
MoreRobustThanYouandCitadelStationBot bc318af840 Diseases will now cure if species is changed (#31495) 
* Diseases will now cure if species is changed

* Update _disease.dm

* Update _disease.dm

* Update species.dm
 2017-10-10 12:41:42 -05:00
CitadelStationBot 73664b1fe1 Fixes Clock Cult ending with dead cultists 2017-10-10 12:38:31 -05:00
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 13fc473dd1 Cleans up atmos unary machinery code 2017-10-10 12:28:12 -05:00
nicbnandCitadelStationBot c8cfb3abeb Cleans up atmos unary machinery code (#31356) 
* Cleans up atmos unary machinery code

* return 0 and return are different things: cryo.dm

* same: oxygen generator

* same: vent pump

* same: vent scrubber

* Reveiw

* Update vent_scrubber.dm

* Update vent_scrubber.dm
 2017-10-10 12:28:12 -05:00
CitadelStationBot d3e5e100fe Fixes emote runtimes 2017-10-10 08:42:30 -05:00
AnturKandCitadelStationBot e880545425 Fixes emote runtimes (#31498) 
* Emote runtime

* Bleh didn't add all
 2017-10-10 08:42:30 -05:00
CitadelStationBot a0e07a986c Fixes some tempremoves 2017-10-10 07:10:35 -05:00
LeoandCitadelStationBot ed3a031543 Merge pull request #31497 from AnturK/cyberboss-pls 
Fixes some tempremoves
 2017-10-10 07:10:35 -05:00
CitadelStationBot 462cab419d Removes portable chem dispenser from xenobio 2017-10-10 07:09:21 -05:00
LeoandCitadelStationBot 8101c5776a Merge pull request #31484 from Bawhoppen/berniesanders 
Removes portable chem dispenser from xenobio
 2017-10-10 07:09:21 -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