shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,851 Commits 5 Branches 0 Tags
1d4ae5196cf364dfd9f9cdcff1e2880caebd17ce
Commit Graph

8851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58
1d4ae5196c it works 👍 2017-11-13 17:00:26 -05:00
CitadelStationBot
7fc04dbe5f Automatic changelog generation for PR #3920 [ci skip] 2017-11-13 13:14:28 -06:00
LetterJay
ab42a6242f Merge pull request #3920 from Citadel-Station-13/LetterJay-patch-2 
Fixes flavor text on examine
 2017-11-13 13:14:25 -06:00
LetterJay
d983c7d928 Update examine.dm 2017-11-13 11:54:18 -06:00
CitadelStationBot
3ba974c9fe Automatic changelog generation for PR #3919 [ci skip] 2017-11-13 11:53:24 -06:00
LetterJay
36778e9404 Merge pull request #3919 from Citadel-Station-13/upstream-merge-32623 
[MIRROR] Adds ambience for Reebe.
 2017-11-13 11:53:21 -06:00
LetterJay
648477ebe1 Merge pull request #3917 from Citadel-Station-13/upstream-merge-32637 
[MIRROR] Adds a timer to falsewall code
 2017-11-13 11:53:08 -06:00
CitadelStationBot
e0ec263ef8 Automatic changelog generation for PR #3916 [ci skip] 2017-11-13 11:53:00 -06:00
LetterJay
301497dfb0 Merge pull request #3916 from Citadel-Station-13/upstream-merge-32667 
[MIRROR] Fixes the broken cable cuffs sprite
 2017-11-13 11:52:58 -06:00
LetterJay
5591672deb Merge pull request #3915 from Citadel-Station-13/upstream-merge-32618 
[MIRROR] Fixes readapt removing hivemind communication.
 2017-11-13 11:52:48 -06:00
LetterJay
304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947 
[MIRROR] Pirate ship event
 2017-11-13 11:52:40 -06:00
CitadelStationBot
97c4372a86 Automatic changelog generation for PR #3913 [ci skip] 2017-11-13 11:52:03 -06:00
LetterJay
07cb443ba0 Merge pull request #3913 from Citadel-Station-13/upstream-merge-32553 
[MIRROR] Xrays go through walls but stop on mobs/blob
 2017-11-13 11:51:59 -06:00
LetterJay
f0a852ef1e Merge pull request #3911 from Citadel-Station-13/upstream-merge-32658 
[MIRROR] Fixes latejoin chaplains not getting their weapon on spawn
 2017-11-13 11:51:38 -06:00
LetterJay
a4c2084404 Merge pull request #3910 from Citadel-Station-13/upstream-merge-32557 
[MIRROR] Adds Extended Drill Hair
 2017-11-13 11:51:30 -06:00
CitadelStationBot
e3d9daf77d Automatic changelog generation for PR #3908 [ci skip] 2017-11-13 11:50:38 -06:00
LetterJay
32bfa75c3a Merge pull request #3908 from Citadel-Station-13/upstream-merge-32558 
[MIRROR] Prevent placing posters on diagonal wall corners
 2017-11-13 11:50:36 -06:00
LetterJay
bc23305ef9 Merge pull request #3907 from Citadel-Station-13/upstream-merge-32613 
[MIRROR]  Fixes cryo overlay system
 2017-11-13 11:50:23 -06:00
LetterJay
f46db62f48 Update examine.dm 2017-11-13 11:49:47 -06:00
LetterJay
a21a5cf30d Merge pull request #3906 from Citadel-Station-13/upstream-merge-32640 
[MIRROR] Adds a multitool_act and a proper check on tool_check
 2017-11-13 11:46:41 -06:00
LetterJay
0a21e6e83b Merge pull request #3904 from Citadel-Station-13/upstream-merge-32642 
[MIRROR] Makes clown box consistent with the rest of the boxes
 2017-11-13 11:45:13 -06:00
LetterJay
f610a6110b Merge pull request #3903 from Citadel-Station-13/upstream-merge-32597 
[MIRROR] Fixes stimulum decay
 2017-11-13 11:45:00 -06:00
LetterJay
228aed8b35 Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546 
[MIRROR] Refactor of base machinery a tiny bit more. DONE
 2017-11-13 11:44:46 -06:00
CitadelStationBot
eabdcdb169 Automatic changelog generation for PR #3901 [ci skip] 2017-11-13 11:44:35 -06:00
LetterJay
55e2d08b06 Merge pull request #3901 from Citadel-Station-13/upstream-merge-32566 
[MIRROR] Space vacuum damage doubled
 2017-11-13 11:44:33 -06:00
CitadelStationBot
cd1da8a8fb Automatic changelog generation for PR #3900 [ci skip] 2017-11-13 11:44:27 -06:00
LetterJay
6e3e6ef6b8 Merge pull request #3900 from Citadel-Station-13/upstream-merge-32585 
[MIRROR] adjusted default internet song volume to 25
 2017-11-13 11:44:25 -06:00
LetterJay
0d65074f44 Merge pull request #3899 from Citadel-Station-13/upstream-merge-32635 
[MIRROR] Fixes fleeing the station message accuracy
 2017-11-13 11:44:16 -06:00
LetterJay
4142105fe6 Merge pull request #3895 from Citadel-Station-13/upstream-merge-32435 
[MIRROR] Disposal pipes and pipe dispensers refactor
 2017-11-13 11:44:04 -06:00
LetterJay
97757d2c87 Merge pull request #3894 from Citadel-Station-13/upstream-merge-32559 
[MIRROR] Makes false alarm use more explicit in event code.
 2017-11-13 11:42:53 -06:00
LetterJay
9a80e5f91c Merge pull request #3893 from Citadel-Station-13/upstream-merge-32582 
[MIRROR] Fixes 512 compile reminders
 2017-11-13 11:42:40 -06:00
LetterJay
34b3607211 Merge pull request #3867 from Citadel-Station-13/upstream-merge-32504 
[MIRROR] Weakrefs
 2017-11-13 11:41:38 -06:00
LetterJay
3e55cec1b0 Merge pull request #3862 from Citadel-Station-13/upstream-merge-32498 
[MIRROR] Fixes VV not displaying false values in keyed lists
 2017-11-13 11:41:18 -06:00
CitadelStationBot
124f2b1c29 Automatic changelog generation for PR #3731 [ci skip] 2017-11-13 11:40:57 -06:00
LetterJay
9ec12211fb Merge pull request #3731 from Citadel-Station-13/upstream-merge-32247 
[MIRROR] Some minor contamination fixes
 2017-11-13 11:40:54 -06:00
LetterJay
9ff35c5b2c Merge branch 'master' into upstream-merge-32435 2017-11-13 11:30:06 -06:00
CitadelStationBot
d5778aeb42 Adds ambience for Reebe. 2017-11-13 03:45:03 -06:00
Qustinnus
182b81a721 Adds ambience for Reebe. (#32623) 
* spooky

* fix 1

* fix 2
 2017-11-13 03:45:03 -06:00
CitadelStationBot
7626d9a5fa Adds a timer to falsewall code 2017-11-13 03:29:22 -06:00
nicbn
a0f70c9364 Adds a timer to falsewall code (#32637) 
* Adds a timer to falsewall code

* better code

* removes a parameter
 2017-11-13 03:29:21 -06:00
FrozenGuy5
90dc27b331 Fixes the broken cable cuffs sprite 2017-11-13 03:24:05 -06:00
oranges
51b0c286a9 Fixes readapt removing hivemind communication. 2017-11-13 03:20:50 -06:00
CitadelStationBot
dfcaf338cb Pirate ship event 2017-11-13 03:19:38 -06:00
oranges
43113cd9b5 Merge pull request #31947 from AnturK/yarr 
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
 2017-11-13 03:19:38 -06:00
CitadelStationBot
7f16d54984 Xrays go through walls but stop on mobs/blob 2017-11-13 03:17:24 -06:00
oranges
033f336ed1 Merge pull request #32553 from ExcessiveUseOfCobblestone/ihategoofxray 
Xrays go through walls but stop on mobs/blob
 2017-11-13 03:17:24 -06:00
CitadelStationBot
60453c2c2e Fixes latejoin chaplains not getting their weapon on spawn 2017-11-13 03:16:02 -06:00
KorPhaeron
3f297ccb79 Fixes chaplain not getting his weapon on spawn (#32658) 2017-11-13 03:16:01 -06:00
oranges
7c45ae5cb7 Adds Extended Drill Hair 2017-11-13 03:12:44 -06:00
CitadelStationBot
a892132cdf Prevent placing posters on diagonal wall corners 2017-11-13 02:33:30 -06:00