shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,134 Commits 5 Branches 0 Tags
6c147c9ef33bc8f1e49a9dea08db752db51b47e1
Commit Graph
11134 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 6c147c9ef3 Merge branch 'master' into upstream-merge-33660 2018-01-01 04:59:20 -06:00
LetterJayandGitHub 6bafa75ee8 Merge pull request #4626 from Citadel-Station-13/upstream-merge-33965 
[MIRROR] Autotag .github => GitHub
 2018-01-01 04:58:01 -06:00
LetterJayandGitHub cd3f399924 Merge pull request #4619 from Citadel-Station-13/upstream-merge-33954 
[MIRROR] fixes component's dupe
 2018-01-01 04:27:20 -06:00
LetterJayandGitHub d986ca1ee3 Merge pull request #4594 from Citadel-Station-13/upstream-merge-33911 
[MIRROR] Adds white and rainbow gloves to the gloves/color/random selection pool
 2018-01-01 04:26:56 -06:00
CitadelStationBot 0fbe251dfe Automatic changelog generation for PR #4599 [ci skip] 2018-01-01 04:26:36 -06:00
LetterJayandGitHub dd0a5c9d24 Merge pull request #4599 from cebutris/guardianstuff 
blacklists holoparasites from discounting
 2018-01-01 04:26:34 -06:00
LetterJayandGitHub 7078a7ea49 Merge pull request #4598 from cebutris/cebusoap2 
adds functional cebusoap
 2018-01-01 04:26:03 -06:00
CitadelStationBot a881de18b9 Automatic changelog generation for PR #4596 [ci skip] 2018-01-01 04:25:40 -06:00
LetterJayandGitHub 1463a442a5 Merge pull request #4596 from Citadel-Station-13/upstream-merge-33915 
[MIRROR] Removes suit sensors from bural garbs
 2018-01-01 04:25:37 -06:00
LetterJayandGitHub ce43797f03 Merge pull request #4602 from Citadel-Station-13/upstream-merge-33918 
[MIRROR] Changed BYOND Link to Secure HTTPS
 2018-01-01 04:11:00 -06:00
CitadelStationBot c79b75687d Autotag .github => GitHub 2018-01-01 04:01:33 -06:00
Jordan BrownandCitadelStationBot 2c350fcb6c Autotag .github => GitHub (#33965) 2018-01-01 04:01:33 -06:00
LetterJayandGitHub 3a8f27a2bf Merge pull request #4623 from Citadel-Station-13/upstream-merge-33960 
[MIRROR] Corrects flamethrower capitalization
 2017-12-31 15:23:14 -06:00
LetterJayandGitHub 8369a3886d Merge pull request #4622 from Citadel-Station-13/upstream-merge-33957 
[MIRROR] cleans up some behaviour for PlaceOnTop/Bottom
 2017-12-31 15:22:55 -06:00
LetterJayandGitHub 2db4000f08 Merge pull request #4618 from Citadel-Station-13/upstream-merge-33951 
[MIRROR] Fixes reset_perspective runtimes
 2017-12-31 15:22:25 -06:00
LetterJayandGitHub d1febba415 Merge pull request #4616 from Citadel-Station-13/upstream-merge-33950 
[MIRROR] Fixes thermals, also drops the see invisible from thermals.
 2017-12-31 15:22:04 -06:00
CitadelStationBot 482e0c6fe5 Corrects flamethrower capitalization 2017-12-31 10:02:59 -06:00
Jordan BrownandCitadelStationBot 54032f9c6d Merge pull request #33960 from ShizCalev/flamer 
Corrects flamethrower capitalization
 2017-12-31 10:02:59 -06:00
CitadelStationBot 922e360ed4 cleans up some behaviour for PlaceOnTop/Bottom 2017-12-31 10:01:46 -06:00
Jordan BrownandCitadelStationBot 4e0efc64d5 Merge pull request #33957 from ninjanomnom/helper-cleanup 
cleans up some behaviour for PlaceOnTop/Bottom
 2017-12-31 10:01:46 -06:00
CitadelStationBot 05eb81b5c3 fixes component's dupe 2017-12-31 09:59:16 -06:00
Jordan BrownandCitadelStationBot d0e5a38c29 Merge pull request #33954 from jammer312/components_fix 
fixes component's dupe
 2017-12-31 09:59:16 -06:00
CitadelStationBot 88f3e9f99f Fixes reset_perspective runtimes 2017-12-31 09:58:02 -06:00
Jordan BrownandCitadelStationBot 19c35c63d6 Merge pull request #33951 from AnturK/perspective_fix 
Fixes reset_perspective runtimes
 2017-12-31 09:58:02 -06:00
LetterJayandGitHub 806124e69b Merge pull request #4617 from Citadel-Station-13/revert-4611-upstream-merge-33940 
Revert "[MIRROR] Fix PDA message photos not being viewable"
 2017-12-31 06:58:39 -06:00
LetterJayandGitHub 7a6cf002d3 Revert "[MIRROR] Fix PDA message photos not being viewable" 2017-12-31 06:41:03 -06:00
CitadelStationBot 0a007a754a Fixes thermals, also drops the see invisible from thermals. 2017-12-31 06:30:34 -06:00
AnturKandCitadelStationBot bbca0afa37 Fixes thermals, also drops the see invisible from thermals. (#33950) 2017-12-31 06:30:34 -06:00
CitadelStationBot 38ddc2c0e3 Automatic changelog generation for PR #4615 [ci skip] 2017-12-31 02:53:36 -06:00
LetterJayandGitHub 873e3c7a35 Merge pull request #4615 from Citadel-Station-13/upstream-merge-33570 
[MIRROR] Explosions now cause camera shake based on distance
 2017-12-31 02:53:34 -06:00
LetterJayandGitHub 34b4976c28 Merge pull request #4614 from Citadel-Station-13/upstream-merge-33949 
[MIRROR] Makes it clear that command reports are IC.
 2017-12-31 02:53:22 -06:00
CitadelStationBot 2268a2e53c Automatic changelog generation for PR #4613 [ci skip] 2017-12-31 02:52:46 -06:00
LetterJayandGitHub d8e85b5f15 Merge pull request #4613 from Citadel-Station-13/upstream-merge-33945 
[MIRROR] Improves loot drop spawners, adds AI law spawners to cores
 2017-12-31 02:52:44 -06:00
CitadelStationBot 01e744041b Automatic changelog generation for PR #4612 [ci skip] 2017-12-31 02:52:32 -06:00
LetterJayandGitHub 88df151bd7 Merge pull request #4612 from Citadel-Station-13/upstream-merge-33947 
[MIRROR] Last resort now requires a confirmation.
 2017-12-31 02:52:29 -06:00
CitadelStationBot cf1dc29d3b Automatic changelog generation for PR #4611 [ci skip] 2017-12-31 02:52:05 -06:00
LetterJayandGitHub 515c4a0472 Merge pull request #4611 from Citadel-Station-13/upstream-merge-33940 
[MIRROR] Fix PDA message photos not being viewable
 2017-12-31 02:52:03 -06:00
CitadelStationBot 92a7555322 Automatic changelog generation for PR #4609 [ci skip] 2017-12-31 02:51:47 -06:00
LetterJayandGitHub 7998f037bd Merge pull request #4609 from Citadel-Station-13/upstream-merge-33580 
[MIRROR] Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
 2017-12-31 02:51:44 -06:00
CitadelStationBot 305d07faa2 Automatic changelog generation for PR #4608 [ci skip] 2017-12-31 02:51:29 -06:00
LetterJayandGitHub c8e6cc0171 Merge pull request #4608 from Citadel-Station-13/upstream-merge-33778 
[MIRROR] Updates space-heater sprite to 3/4, updates icon
 2017-12-31 02:51:26 -06:00
CitadelStationBot 3e5c7eb897 Automatic changelog generation for PR #4607 [ci skip] 2017-12-31 02:50:56 -06:00
LetterJayandGitHub 8248ac8091 Merge pull request #4607 from Citadel-Station-13/upstream-merge-33863 
[MIRROR] Removes chemist job from omegastation
 2017-12-31 02:50:54 -06:00
LetterJayandGitHub ab11e4be2e Merge pull request #4606 from Citadel-Station-13/upstream-merge-33937 
[MIRROR] printplayer fix for jobless minds
 2017-12-31 02:50:34 -06:00
LetterJayandGitHub 503f8e2635 Merge pull request #4605 from Citadel-Station-13/upstream-merge-33805 
[MIRROR] Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
 2017-12-31 02:50:21 -06:00
LetterJayandGitHub 8f2aab0908 Merge pull request #4595 from Citadel-Station-13/upstream-merge-33930 
[MIRROR] Fixes assistants spawning naked
 2017-12-31 02:50:00 -06:00
CitadelStationBot 5a035bf399 Explosions now cause camera shake based on distance 2017-12-31 02:32:41 -06:00
Jordan BrownandCitadelStationBot 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
CitadelStationBot c11ad1f40b Makes it clear that command reports are IC. 2017-12-31 02:28:26 -06:00
BeeSting12andCitadelStationBot 7dac76651e Makes it clear that command reports are IC. (#33949) 
* fixes #33936

* sticky's idea was better
 2017-12-31 02:28:25 -06:00