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

4877 Commits

Author SHA1 Message Date
LetterJay
5b4e26cb06 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-10-11 08:06:03 -05:00
LetterJay
a75362cecc COLLAR 2017-10-11 08:05:49 -05:00
LetterJay
3f6596dc17 Merge pull request #3300 from Citadel-Station-13/upstream-merge-31406 
[MIRROR] Adds Slappers
 2017-10-10 22:34:28 -04:00
LetterJay
1330fdcdd7 Merge pull request #3299 from Citadel-Station-13/upstream-merge-31513 
[MIRROR] Cleans up empty file
 2017-10-10 22:34:20 -04:00
LetterJay
6e155be9fe Merge pull request #3298 from Citadel-Station-13/upstream-merge-31474 
[MIRROR] Removes some spawns from explosion effects
 2017-10-10 22:34:12 -04:00
LetterJay
be2d504b2b Merge pull request #3297 from Citadel-Station-13/upstream-merge-31327 
[MIRROR] The shuttle can no longer leave during clockcult rounds
 2017-10-10 22:33:52 -04:00
LetterJay
56f7bcddcc Merge pull request #3296 from Citadel-Station-13/upstream-merge-31443 
[MIRROR] Fixes pandemic no beaker UI runtime
 2017-10-10 22:33:33 -04:00
LetterJay
822f15f4ae Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494 
[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 22:32:52 -04:00
LetterJay
8d604a3922 Merge pull request #3290 from Citadel-Station-13/upstream-merge-31462 
[MIRROR] Fixes headrev TP
 2017-10-10 22:32:12 -04:00
LetterJay
41ef0500ac Merge pull request #3289 from Citadel-Station-13/upstream-merge-31444 
[MIRROR] Fixes cigarettes runtiming when preferences generation attempts to light them before initialization is done.
 2017-10-10 22:32:02 -04:00
LetterJay
1a35063877 Merge pull request #3288 from Citadel-Station-13/upstream-merge-31477 
[MIRROR] Fix a bug in the new lobby music system
 2017-10-10 22:31:43 -04:00
LetterJay
5e99ad27e5 Merge pull request #3287 from Citadel-Station-13/upstream-merge-30920 
[MIRROR] Adds the Chemistry Smoke Machine
 2017-10-10 22:31:27 -04:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
ad3b59c247 Merge pull request #3281 from Citadel-Station-13/upstream-merge-31498 
[MIRROR] Fixes emote runtimes
 2017-10-10 22:28:14 -04:00
deathride58
c163176e5d Adds Slappers (#31406) 
* ADDS SLAPPERS

* fixes everything, just need sprites

* nerfs criticism
 2017-10-10 19:54:30 -05:00
Leo
a1ccf4adda Merge pull request #31513 from ShizCalev/file-cleanup 
Cleans up empty file
 2017-10-10 17:48:31 -05:00
MoreRobustThanYou
3e8d51d871 Removes some spawns from explosion effects (#31474) 
* Update effects_explosion.dm

* god damn it

* Update effects_explosion.dm

* Update effects_explosion.dm

* THANK YOU KEVINZ FOR THE WRAPPER

* Update effects_explosion.dm

* Update effects_explosion.dm

* clean my ass
 2017-10-10 15:41:24 -05:00
Ashe Higgs
3c50cacc6c The shuttle can no longer leave during clockcult rounds (#31327) 
* Servants now win if the shuttle leaves

* Some more round feedback, a missed thing too

* Hostile environment!

* now it compiles!
 2017-10-10 13:57:51 -05:00
kevinz000
3d0f0dd7f0 Fixes pandemic no beaker UI runtime (#31443) 2017-10-10 13:51:37 -05:00
Jordan Brown
7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war 
In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 13:28:38 -05:00
AnturK
724b0d24fe Fixes headrev TP (#31462) 
* Fixes headrev TP

* Mhm
 2017-10-10 13:20:12 -05:00
kevinz000
3d4b35d000 Fixes cigarettes runtiming when preferences generation attempts to light them before initialization is done. (#31444) 
* Update cigs_lighters.dm

* Update cigs_lighters.dm

* Update cigs_lighters.dm
 2017-10-10 13:19:03 -05:00
JamieH
9eb83d1598 Fix a bug in the new lobby music system (#31477) 
* Fix a bug in the new lobby music system

* Update ticker.dm

* ...
 2017-10-10 13:14:50 -05:00
Robustin
a570ec8610 Adds the Chemistry Smoke Machine (#30920) 
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
 2017-10-10 13:13:38 -05:00
kevinz000
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
MoreRobustThanYou
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
Robustin
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
nicbn
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
AnturK
e880545425 Fixes emote runtimes (#31498) 
* Emote runtime

* Bleh didn't add all
 2017-10-10 08:42:30 -05:00
Leo
ed3a031543 Merge pull request #31497 from AnturK/cyberboss-pls 
Fixes some tempremoves
 2017-10-10 07:10:35 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
f0fc11f5b5 Merge pull request #3273 from Citadel-Station-13/upstream-merge-31493 
[MIRROR] Fixes closet layer
 2017-10-10 05:55:28 -04:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
b0c833059e Update chunk.dm 2017-10-10 04:40:26 -05:00
GLACoding
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
oranges
260ec3364b Merge pull request #31482 from kevinz000/patch-328 
Removes a spawn from revolution gamemode code
 2017-10-10 03:23:20 -05:00
oranges
1843738e7c Merge pull request #31483 from kevinz000/patch-329 
Removes a spawn from nukeop gamemode code
 2017-10-10 03:23:14 -05:00
oranges
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
AnturK
344238a401 Fixes closet layer (#31493) 
* Fixes closet layer

* Actually this might be better.
 2017-10-10 03:20:53 -05:00