shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,674 Commits 5 Branches 0 Tags
df1d5fbc71561b00b8a65b6ea425fb8a96f1b9b6
Commit Graph
3674 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot df1d5fbc71 Automatic changelog generation for PR #2027 [ci skip] 2017-07-17 07:46:02 -05:00
LetterJayandGitHub fbeebdeab9 Merge pull request #2027 from ktccd/Enable-Borer-Random-Event 
Enable borer random event
 2017-07-17 07:46:01 -05:00
LetterJayandGitHub 62648534cb Merge pull request #2046 from Citadel-Station-13/upstream-merge-29274 
[MIRROR] Minor instrument code cleanup
 2017-07-17 07:41:59 -05:00
CitadelStationBot 8a016adc0a Automatic changelog generation for PR #2047 [ci skip] 2017-07-17 07:41:44 -05:00
LetterJayandGitHub 07a3dbea04 Merge pull request #2047 from Citadel-Station-13/upstream-merge-29291 
[MIRROR] Fixes the Ark not pushing stuff away even while waiting for components
 2017-07-17 07:41:42 -05:00
LetterJayandGitHub 61640eaf72 Merge pull request #2048 from Citadel-Station-13/upstream-merge-29284 
[MIRROR] [s] Fixes goonchat cookie false positives
 2017-07-17 07:41:29 -05:00
LetterJayandGitHub 97484e175a Merge pull request #2045 from Citadel-Station-13/upstream-merge-29289 
[MIRROR] [s]Fixes panic bunker
 2017-07-17 07:25:39 -05:00
CitadelStationBot 9c76e88952 [s] Fixes goonchat cookie false positives 2017-07-17 07:18:00 -05:00
CitadelStationBot 74e5f80257 Fixes the Ark not pushing stuff away even while waiting for components 2017-07-17 07:16:55 -05:00
CitadelStationBot c94e598b3f Minor instrument code cleanup 2017-07-17 07:14:50 -05:00
CitadelStationBot 956f10f2d2 [s]Fixes panic bunker 2017-07-17 07:13:45 -05:00
CitadelStationBotandkevinz000 6f7e908c89 RPDs can now place disposals pipes on dense non-wall turfs (#2035) 2017-07-17 00:54:17 -07:00
CitadelStationBotandkevinz000 7a0c43e492 Makes GetAllContents faster. (#2036) 2017-07-17 00:53:50 -07:00
CitadelStationBotandkevinz000 3066f32215 Improves drone detonation logging (#2037) 2017-07-17 00:53:00 -07:00
CitadelStationBotandkevinz000 260a140f97 Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. (#2034) 2017-07-17 00:52:43 -07:00
LetterJayandGitHub 344dc1a061 Merge pull request #2032 from Citadel-Station-13/upstream-merge-29257 
[MIRROR] Fixes monkeys trying to take offhands
 2017-07-15 23:19:59 -05:00
CitadelStationBot 2ea1fff7f3 Automatic changelog generation for PR #2031 [ci skip] 2017-07-15 23:19:43 -05:00
LetterJayandGitHub c3857fe264 Merge pull request #2031 from Citadel-Station-13/upstream-merge-29269 
[MIRROR] Fixes missiles being able to ricochet
 2017-07-15 23:19:41 -05:00
LetterJayandGitHub 638213b2c2 Merge pull request #2030 from Citadel-Station-13/upstream-merge-29270 
[MIRROR] Cleaned up duped vars
 2017-07-15 23:19:26 -05:00
LetterJayandGitHub 44473643bb Merge pull request #2029 from Citadel-Station-13/upstream-merge-29267 
[MIRROR] Makes round end delay message optional
 2017-07-15 23:19:08 -05:00
CitadelStationBot e6fbba5404 Automatic changelog generation for PR #2005 [ci skip] 2017-07-15 23:18:54 -05:00
LetterJayandGitHub 8d31153fdc Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223 
[MIRROR] Organ Update [Cloning isn't broken edition]
 2017-07-15 23:18:53 -05:00
CitadelStationBot f634966a34 Fixes monkeys trying to take offhands 2017-07-15 22:33:14 -05:00
CitadelStationBot a4d968ec82 Fixes missiles being able to ricochet 2017-07-15 22:31:05 -05:00
CitadelStationBot d286ed197e Cleaned up duped vars 2017-07-15 22:28:58 -05:00
CitadelStationBot 2cbfec38a2 Makes round end delay message optional 2017-07-15 22:19:46 -05:00
ktccd f87046aaee Comments 2017-07-15 23:44:13 +02:00
ktccd accc12103c Enables Random borer event 
Enables the borer event, from max 0 occurances to max 1 occurance per
round.
Decreases random chance weight of borer event, from 15 down to the
default 10.
Increases minimum players required up from 15 to 20, as the gamemode at
MINIMUM requires 10 living players to greentext anyway and does poorly
on very lowpop rounds.
Earliest start increased from 20 minutes to 40 minutes, as our rounds
lasts longer than TG rounds do.
 2017-07-15 23:44:04 +02:00
CitadelStationBotandkevinz000 d21766956e [MIRROR] Cleaned up some emag_acts (#2018) 
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-15 13:17:56 -07:00
cebutrisandkevinz000 099b908d64 Fixes traitor holoparasites (#1904) 
* fixes holoparasites

* adds #1051 and #1066

* as it turns out I'm blind

* fixes line 500 indentation
 2017-07-15 11:48:56 -07:00
CitadelStationBotandkevinz000 b025182955 Possibly fix player_list sometimes having a null (#2022) 2017-07-15 11:45:33 -07:00
CitadelStationBot 82d3864625 Automatic changelog generation for PR #2019 [ci skip] 2017-07-15 13:45:12 -05:00
CitadelStationBotandkevinz000 b2f20fffd8 Fixes timestop! (and tweaks its sounds) (#2019) 2017-07-15 11:45:11 -07:00
CitadelStationBotandkevinz000 62180f8953 ClickCross now uses CanPass instead of density directly. (#2016) 2017-07-15 11:44:36 -07:00
CitadelStationBot a7d63c437b Automatic changelog generation for PR #2015 [ci skip] 2017-07-15 13:44:27 -05:00
LetterJayandkevinz000 dcf957f0b2 adds icons for PDAs by Cecily and the hunter hat (#2015) 
* adds icons for PDAs by Cecily and the hunter hat

* Update cit_hats.dm
 2017-07-15 11:44:26 -07:00
CitadelStationBotandkevinz000 54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
CitadelStationBotandkevinz000 738eaa1d54 Fix the attackby of the supermatter containment core (#2024) 2017-07-15 11:42:39 -07:00
kevinz000andGitHub 44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025) 
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
 2017-07-15 11:41:36 -07:00
CitadelStationBot 9d0cd37dd3 Automatic changelog generation for PR #2021 [ci skip] 2017-07-15 13:40:51 -05:00
CitadelStationBotandkevinz000 f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00
CitadelStationBotandkevinz000 2ae38397c9 removes current method of handling flightsuit pulling (#2023) 2017-07-15 11:40:34 -07:00
LetterJayandGitHub 3ed842376e Update species.dm 2017-07-15 10:06:30 -05:00
LetterJayandGitHub 905db6ded5 Update DNA.dm 2017-07-15 10:05:00 -05:00
CitadelStationBotandkevinz000 2d3905457e [MIRROR] Rename Bump to Collide (#2002) 
* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
 2017-07-14 21:35:56 -07:00
lm40andkevinz000 80d06fe843 Update dogborgstuff.dm (#2013) 2017-07-14 21:35:22 -07:00
CitadelStationBotandkevinz000 bd3c3e9de4 Removes the entry in sound.dm for servostep.ogg (#2004) 2017-07-14 19:35:48 -07:00
CitadelStationBotandkevinz000 6d4c97120f Fixes wallframes (#2001) 2017-07-14 19:35:11 -07:00
CitadelStationBotandkevinz000 a0a77f5a41 Refactors screwdriver coloring to use greyscale (#2003) 2017-07-14 19:34:03 -07:00
CitadelStationBotandkevinz000 51ae2fb9b7 Fixes formatting (#2009) 2017-07-14 19:30:48 -07:00