shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,055 Commits 5 Branches 0 Tags
5a035bf399d557befbf420c3a9f7940fd134d7aa
Commit Graph

7391 Commits

Author SHA1 Message Date
Jordan Brown
a57eba6a16 Explosions now cause camera shake based on distance (#33570) 
* Explosions now cause camera shake based on distance

* Explosion close camera shake down to 2.5s

* Explosion camera shake max 100 close intensity, 50 far
 2017-12-31 02:32:41 -06:00
LetterJay
dad7c72a3e Merge pull request #4579 from Citadel-Station-13/upstream-merge-33663 
[MIRROR] [Ready]Adds the Pax reagent, small tweaks to pacifism
 2017-12-30 14:13:23 -06:00
LetterJay
4237a8910c Merge pull request #4483 from Citadel-Station-13/upstream-merge-33682 
[MIRROR] Makes newscaster feedback messages and comments always a list.
 2017-12-30 14:13:03 -06:00
LetterJay
c8f3fdfe38 Merge branch 'master' into upstream-merge-33663 2017-12-30 13:29:36 -06:00
LetterJay
8452cc74d0 Update newscaster.dm 2017-12-30 13:21:31 -06:00
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
LetterJay
f860fa0cd3 Update closed.dm 2017-12-30 05:12:10 -06:00
LetterJay
68b44e73f4 Merge pull request #4533 from Citadel-Station-13/upstream-merge-33734 
[MIRROR] Makes cyclelinkeddir rotate with shuttle
 2017-12-30 05:06:32 -06:00
LetterJay
0402595242 Merge pull request #4540 from Citadel-Station-13/upstream-merge-33835 
[MIRROR] Adds coordinates to href logs
 2017-12-30 05:06:19 -06:00
LetterJay
19c6db6a6e Merge pull request #4591 from Citadel-Station-13/upstream-merge-33905 
[MIRROR] Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
 2017-12-30 05:06:03 -06:00
LetterJay
61203ed9f6 Merge pull request #4588 from Citadel-Station-13/upstream-merge-33914 
[MIRROR] Prevent infinite loops in orbit checks
 2017-12-30 05:05:30 -06:00
LetterJay
72d0ca2f1a Merge pull request #4590 from Citadel-Station-13/upstream-merge-33796 
[MIRROR] Monkeymode fixes
 2017-12-30 05:05:20 -06:00
LetterJay
de0ade801c Merge pull request #4589 from Citadel-Station-13/upstream-merge-33903 
[MIRROR] Fixes mobs targeting from inside things.
 2017-12-30 05:04:09 -06:00
LetterJay
4599680f68 Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842 
[MIRROR] Internal radio implant
 2017-12-30 05:03:48 -06:00
LetterJay
2d9a70a487 Update uplink_kits.dm 2017-12-29 18:42:44 -06:00
LetterJay
d820575f78 Update orbit.dm 2017-12-29 18:41:57 -06:00
LetterJay
6f8c2c1daf Update item_attack.dm 2017-12-29 18:40:58 -06:00
LetterJay
010c1e17ad Update client_procs.dm 2017-12-29 18:38:32 -06:00
LetterJay
ac7750202b Update shuttle_rotate.dm 2017-12-29 18:38:05 -06:00
Jordan Brown
d38a4a2aa5 Merge pull request #33905 from ShizCalev/jumpsuit-fix 
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
 2017-12-29 10:10:30 -06:00
MoreRobustThanYou
459d4f35c7 Monkeymode fixes (#33796) 
* Monkey fixes

* Update say.dm
 2017-12-29 10:08:17 -06:00
Jordan Brown
8059894d7d Merge pull request #33903 from AnturK/pilot-fixes 
Fixes mobs targeting from inside things.
 2017-12-29 10:01:57 -06:00
Jordan Brown
0b9ffdd3e3 Prevent infinite loops in orbit checks 2017-12-29 10:00:44 -06:00
LetterJay
a56882556b Update _eminence.dm 2017-12-29 07:36:03 -06:00
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJay
6d52395643 Merge pull request #4587 from Citadel-Station-13/upstream-merge-33899 
[MIRROR] Fixes air alarm contaminated mode
 2017-12-29 06:48:09 -06:00
LetterJay
e17f9fdc07 Merge pull request #4586 from Citadel-Station-13/upstream-merge-33895 
[MIRROR] Corrects abductor uncuffing message
 2017-12-29 06:47:56 -06:00
LetterJay
464edc7699 Merge pull request #4585 from Citadel-Station-13/upstream-merge-33896 
[MIRROR] Fixes apple/banana/potato juicing
 2017-12-29 06:30:04 -06:00
LetterJay
0bfd05e668 Merge pull request #4584 from Citadel-Station-13/upstream-merge-33857 
[MIRROR] Increases research point income by 33% (APPROVED BY KORPHAERON)
 2017-12-29 06:26:30 -06:00
LetterJay
80ce187d3d Merge pull request #4583 from Citadel-Station-13/upstream-merge-33873 
[MIRROR] The Radiance (eminence after ratvar awakens) can now ignore chapel tiles
 2017-12-29 06:26:06 -06:00
LetterJay
b8370a7786 Merge pull request #4582 from Citadel-Station-13/upstream-merge-33882 
[MIRROR] Spell action buttons finally fixed
 2017-12-29 06:25:54 -06:00
LetterJay
71a51528c3 Merge pull request #4581 from Citadel-Station-13/upstream-merge-33847 
[MIRROR] Adds colour shift to timestop
 2017-12-29 06:25:41 -06:00
LetterJay
72ab9444c1 Merge pull request #4578 from Citadel-Station-13/upstream-merge-33876 
[MIRROR] Cleans up survivor counting tiny bit
 2017-12-29 06:25:11 -06:00
LetterJay
9d7dc29efc Merge pull request #4577 from Citadel-Station-13/upstream-merge-33874 
[MIRROR] CTF flags are no longer locked to CTF.
 2017-12-29 06:24:57 -06:00
LetterJay
cbc43aeacf Merge pull request #4576 from Citadel-Station-13/upstream-merge-33875 
[MIRROR] Makes default admin websound volume work again.
 2017-12-29 06:24:42 -06:00
LetterJay
79e9e039a8 Merge pull request #4575 from Citadel-Station-13/upstream-merge-33878 
[MIRROR] Fixes ghost light not moving while orbiting
 2017-12-29 06:24:21 -06:00
LetterJay
0f328e22b2 Merge pull request #4574 from Citadel-Station-13/upstream-merge-33558 
[MIRROR] Dead cultists can now cross Reebe's "Servant Blocker"
 2017-12-29 06:24:09 -06:00
LetterJay
b13d4dd721 Merge pull request #4572 from Citadel-Station-13/upstream-merge-33807 
[MIRROR] Made atoms not smooth with shuttles
 2017-12-29 06:23:12 -06:00
LetterJay
93914f2a31 Merge pull request #4571 from Citadel-Station-13/upstream-merge-33902 
[MIRROR] Fixes admin fingerprintslast
 2017-12-29 06:23:01 -06:00
LetterJay
f093bb8fec Merge pull request #4570 from Citadel-Station-13/upstream-merge-33856 
[MIRROR] Fixes AI eyes getting nullspaced when jumping to deleted cameras
 2017-12-29 06:22:35 -06:00
LetterJay
3c204c0125 Merge pull request #4569 from Citadel-Station-13/upstream-merge-33867 
[MIRROR] Fixes ethanol + book reaction message
 2017-12-29 06:22:26 -06:00
LetterJay
bbaee9f3d7 Merge pull request #4568 from Citadel-Station-13/upstream-merge-33880 
[MIRROR] Fixes wall CanPass
 2017-12-29 06:22:13 -06:00
LetterJay
c7db4e8310 also syncs a bunch of shit 2017-12-29 04:12:43 -06:00
YPOQ
a41a508475 Fixes air alarm contaminated mode (#33899) 
* Fixes air alarm contaminated mode

* set_filters, paths instead of ids

* Readds gasid2path call
 2017-12-29 02:57:42 -06:00
XDTM
6eabea6a71 Corrects abductor uncuffing message (#33895) 
* Corrects abductor uncuffing message

* breaks
 2017-12-29 02:56:30 -06:00
YPOQ
8bf721d5b7 Fixes plant juicing (#33896) 2017-12-29 02:56:22 -06:00
Buggy123
2c40a61968 Increases research point income by 33% (#33857) 2017-12-29 02:55:10 -06:00
MoreRobustThanYou
07ba4e8189 The Radiance (eminence after ratvar awakens) can now ignore chapel tiles (#33873) 2017-12-29 02:55:03 -06:00
Robustin
d7723a064c Spell action buttons finally fixed (#33882) 
* Action button fix

* Action button fix

* Spell action button fix

* Spell action button fix

* Update alien_powers.dm

* Update spell.dm

* Action button fix

* Update touch_attacks.dm
 2017-12-29 02:54:50 -06:00
CosmicScientist
0078782285 Adds colour shift to timestop (#33847) 
* For PKPenguin, from Cosmic

* Removes a colour removal line due to no functionality
 2017-12-29 02:53:37 -06:00