shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,685 Commits 5 Branches 0 Tags
0a6deecb8650e92b30667ad93821a42ff3963166
Commit Graph
2647 Commits
Author SHA1 Message Date
ktccd 0a6deecb86 Somehow this didn't get in? 
Added camphor also, it was supposed to have been committed already, dang
git-magic!
 2017-07-18 11:13:56 +02:00
ktccd aa049ce481 Adding citadel chems and flufftext 
Aphrodisiac and Anaphrodisiac added to borer chem list. Now that TG
removed borers, maybe they'll stay on this time.
Also added flufftext for borer_chems, so that there is some kind of
feedback to the host when their borer puts something in them. I'm not
sure what span class should be used, but the chem is usually beneficial
and the only chem that might be dangerous (meth) is not very subtle as
to miss it just because the span class...

Also added snowflake exception for citadel chem flavor text, because
some people/species cannot feel arousal and thus would not notice the
chemical having any effect.
 2017-07-18 10:56:31 +02:00
CitadelStationBotandkevinz000 e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBotandkevinz000 bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
CitadelStationBotandkevinz000 b2c8115ca5 Winter coats now properly hold flashlights (#2043) 2017-07-17 22:51:14 -07:00
deathride58andkevinz000 d21260d480 Makes arousal meter invisible when arousal is disabled (#2028) 
* makes arousal meter invisible when arousal is disabled

* sets the appearance of the arousal meter when the hud is generated

* hm

* hopefully fixed

* cmon

* okay NOW it works. it 100% works
 2017-07-17 22:50:52 -07: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
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
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
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 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
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 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
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
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
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 689142f160 Makes showers clean WASHABLE_COLOUR_PRIORITY (#2007) 2017-07-14 19:30:37 -07:00
Raeschenandkevinz000 6e72c48115 Added " say_mod = "chirps" " to the avian species entry to allow the say prefix to be "chirps" instead of "says" (#2008) 2017-07-14 19:30:17 -07:00
CitadelStationBotandkevinz000 63ffbdf090 Fixes cleave conditions for the cleaving saw (#2006) 2017-07-14 19:30:06 -07:00
CitadelStationBotandkevinz000 106cdfc37b [MIRROR] Fixes the maid costume's apron (#2010) 
* Fixes the maid costume's apron

* Delete admins.txt.rej
 2017-07-14 19:29:55 -07:00
ktccdandkevinz000 6d3123f63c Readds borers (#1999) 
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
 2017-07-14 19:28:52 -07:00