shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,302 Commits 5 Branches 0 Tags
a703a599faed911367af9431fa44b91fd99cf5cd
Commit Graph

5105 Commits

Author SHA1 Message Date
LetterJay
a703a599fa Merge pull request #3413 from Citadel-Station-13/upstream-merge-31695 
[MIRROR] Makes directional windows only block air if anchored
 2017-10-16 07:08:11 -04:00
LetterJay
74bc1be6c2 Merge pull request #3412 from Citadel-Station-13/upstream-merge-31705 
[MIRROR] Fixes tendril possession
 2017-10-16 07:08:02 -04:00
LetterJay
d5d0fa919a Merge pull request #3411 from Citadel-Station-13/upstream-merge-31714 
[MIRROR] Fixes "permenant" and "permenantly" typos in code/comments.
 2017-10-16 07:06:37 -04:00
LetterJay
029d98028a Merge pull request #3410 from Citadel-Station-13/upstream-merge-31713 
[MIRROR] Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
 2017-10-16 07:06:28 -04:00
Jordan Brown
e6def19aa2 Merge pull request #31695 from ninjanomnom/directional-windows 
Makes directional windows only block air if anchored
 2017-10-15 11:33:33 -05:00
Armhulen
c516404175 Fixes tendril possession (#31705) 2017-10-15 11:33:24 -05:00
Jordan Brown
3d50fec086 Merge pull request #31714 from DaxDupont/screaminginternally 
Fixes "permenant" and "permenantly" typos in code/comments.
 2017-10-15 11:32:13 -05:00
Jordan Brown
4e4f2fa19d Merge pull request #31713 from vuonojenmustaturska/initializefixesoct 
Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
 2017-10-15 11:32:05 -05:00
WJohn
4b3f578633 Readds the boxstation whiteship as a ruin. (#31709) 
* Adds box's whiteship back as a broken down relic.

* And accompanying files to make it work.

* Derp
 2017-10-15 11:31:48 -05:00
LetterJay
be2dc49384 Merge pull request #3408 from Citadel-Station-13/upstream-merge-31694 
[MIRROR] Prevents the fire reaction from leaving garbage in the gas mixture
 2017-10-15 10:24:22 -04:00
LetterJay
670bd1ef53 Merge pull request #3407 from Citadel-Station-13/upstream-merge-31696 
[MIRROR] Fixes freon colours never going away
 2017-10-15 10:24:12 -04:00
LetterJay
e72d36c381 Merge pull request #3406 from deathride58/heavysechoundnerfs 
INTENSE BORGO BALANCE CHANGES
 2017-10-15 10:23:37 -04:00
LetterJay
a1187795dd Merge pull request #3405 from Citadel-Station-13/upstream-merge-31692 
[MIRROR] allows vent internal pressure bound to be set by air alarms
 2017-10-15 10:23:26 -04:00
LetterJay
6a288fec29 Merge pull request #3403 from Citadel-Station-13/upstream-merge-31661 
[MIRROR] Fixes custom shuttle docker display
 2017-10-15 10:23:07 -04:00
LetterJay
b6f69c88ea Merge pull request #3402 from Citadel-Station-13/upstream-merge-31553 
[MIRROR] Removes a bunch of sleeps/spawns and makes a few booleans defines
 2017-10-15 10:22:59 -04:00
LetterJay
666ef5f60d Merge pull request #3401 from Citadel-Station-13/upstream-merge-31652 
[MIRROR] Golden Bike Horns now have a small delay between each flips.
 2017-10-15 10:22:52 -04:00
LetterJay
1a79e09cf8 Merge pull request #3400 from Citadel-Station-13/upstream-merge-31663 
[MIRROR] Repopulates SSshuttle recover
 2017-10-15 10:22:17 -04:00
LetterJay
499254761c Merge pull request #3399 from Citadel-Station-13/upstream-merge-31671 
[MIRROR] ID ejecting from computers by alt-clicking
 2017-10-15 10:22:04 -04:00
LetterJay
8f97e8c65f Merge pull request #3398 from Citadel-Station-13/upstream-merge-31688 
[MIRROR] fixes filter NaN issue
 2017-10-15 10:21:46 -04:00
LetterJay
6bcec20501 Merge pull request #3396 from Citadel-Station-13/upstream-merge-31679 
[MIRROR] Adds petcollars to the cmo, captain, and bartender's locker
 2017-10-15 10:21:11 -04:00
LetterJay
b02e9c6a90 Merge pull request #3395 from Citadel-Station-13/upstream-merge-31731 
[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
 2017-10-15 10:20:04 -04:00
LetterJay
5b4bb85ca1 Merge pull request #3394 from Citadel-Station-13/upstream-merge-31726 
[MIRROR] restores safety check in gas mixture temperature_share()
 2017-10-15 10:19:33 -04:00
duncathan salt
e2e4d7aa60 Prevents the fire reaction from leaving garbage in the gas mixture (#31694) 2017-10-15 08:48:31 -05:00
LetterJay
243d8759c7 Update gas_mixture.dm 2017-10-15 07:51:48 -05:00
LetterJay
a5ee5c76c8 Merge pull request #3393 from Citadel-Station-13/upstream-merge-31684 
[MIRROR] [s] Removes scrubber and filter infinite pressure exploits.
 2017-10-15 08:48:56 -04:00
LetterJay
e2914c5987 Merge pull request #3392 from Citadel-Station-13/upstream-merge-31677 
[MIRROR] Allows mobs to get shocked when they smash things
 2017-10-15 08:48:26 -04:00
LetterJay
2f88a62b26 Merge pull request #3391 from Citadel-Station-13/upstream-merge-31674 
[MIRROR] Resets client movement delay to its initial value on death
 2017-10-15 08:48:17 -04:00
LetterJay
58872d8b02 Merge pull request #3390 from Citadel-Station-13/upstream-merge-31616 
[MIRROR] readds guardians to the uplink
 2017-10-15 08:48:04 -04:00
Leo
9c7d2ef609 Merge pull request #31696 from duncathan/atmos-patch6 
Fixes freon colours never going away
 2017-10-15 07:32:53 -05:00
LetterJay
f4753de219 Update gland.dm 2017-10-15 07:00:28 -05:00
LetterJay
f68230c93c Update job_closets.dm 2017-10-15 06:58:52 -05:00
deathride58
dc7f43d72c lets it actually compile 2017-10-15 02:16:13 -04:00
deathride58
bc12f646ed adds sounds to dogborg pounce 2017-10-15 02:10:01 -04:00
deathride58
d6d9c1e1a8 bluh 2017-10-15 01:01:20 -04:00
deathride58
38d139205d wooooooork 2017-10-15 00:53:35 -04:00
deathride58
fe5db1194a fuk 2017-10-15 00:46:45 -04:00
deathride58
47195cdbf0 INTENSE BORGO BALANCE TWEAKS 2017-10-15 00:30:22 -04:00
oranges
993cf948fb allows vent internal pressure bound to be set by air alarms 2017-10-14 21:10:47 -05:00
Jordan Brown
4d110d9b70 Merge pull request #31661 from ninjanomnom/custom-docker 
Fixes custom shuttle docker display
 2017-10-14 18:55:03 -05:00
kevinz000
b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00
Mercenaryblue
ecd85a2de7 Golden Bike Horns now have a small delay between each flips. (#31652) 
* flip timer on GBH

Added a slight timer on the flip effect, allowing its victims to finish the flip before being forced to jump again.

* GBH Fix 1.0.1

if (!flip_flag)

* world.time instead of a timer
 2017-10-14 18:51:36 -05:00
Jordan Brown
44ca2d67f6 Merge pull request #31663 from ninjanomnom/shuttle-subsystem 
Repopulates SSshuttle recover
 2017-10-14 18:49:24 -05:00
Jordan Brown
5bb7618aa9 Merge pull request #31671 from kingofkosmos/altclickejectidfromcomputers 
ID ejecting from computers by alt-clicking
 2017-10-14 18:48:13 -05:00
Jordan Brown
6b7fce369b Merge pull request #31688 from duncathan/atmos-patch3 
fixes filter NaN issue
 2017-10-14 18:46:01 -05:00
jughu
4b17b4a9a3 Adds petcollars to the cmo, captain, and bartender's locker 2017-10-14 18:01:05 -05:00
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
duncathan salt
b840605cb6 restores safety check in gas mixture temperature_share() (#31726) 2017-10-14 15:53:33 -05:00
kevinz000
80ac0313a7 Merge pull request #3389 2017-10-14 13:36:22 -07:00
kevinz000
e8bb77ba2c Merge pull request #3387 2017-10-14 13:35:04 -07:00
duncathan salt
9a4ee4d5a4 removes filter and scrubber pressure exploits (#31684) 2017-10-14 15:20:49 -05:00