shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,716 Commits 5 Branches 0 Tags
85f1b25bcd3c5a6d72b6d5d2b0f74386a1a3561c
Commit Graph
3716 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 85f1b25bcd Merge pull request #1986 from Citadel-Station-13/upstream-merge-28556 
[MIRROR] [Seriously, it's ready]Virology Rework: The Thresholdening
 2017-07-19 06:29:06 -05:00
CitadelStationBot 0563e8b2f3 Automatic changelog generation for PR #2068 [ci skip] 2017-07-19 05:34:57 -05:00
LetterJayandGitHub 95d2969339 Merge pull request #2068 from Citadel-Station-13/upstream-merge-29283 
[MIRROR] Cyborgs regenerate oxygen damage, and can heal toxin damage with cable coils
 2017-07-19 05:34:56 -05:00
LetterJayandGitHub 7cbdc0e2ae Merge pull request #2070 from Citadel-Station-13/upstream-merge-29356 
[MIRROR] Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
 2017-07-19 05:34:24 -05:00
LetterJayandGitHub 92e967d904 Update vomit.dm 2017-07-19 05:15:51 -05:00
LetterJayandGitHub a11a7f770d Update vision.dm 2017-07-19 05:15:34 -05:00
LetterJayandGitHub ad2efb18be Update sensory.dm 2017-07-19 05:14:41 -05:00
CitadelStationBot 54107e4090 Automatic changelog generation for PR #2000 [ci skip] 2017-07-19 05:02:20 -05:00
LetterJayandGitHub a7b3516491 Merge pull request #2000 from Citadel-Station-13/upstream-merge-29228 
[MIRROR] Fixes IV Drips
 2017-07-19 05:02:19 -05:00
LetterJayandGitHub 5e8bee0d9b Merge pull request #2062 from Citadel-Station-13/upstream-merge-29313 
[MIRROR] Adds a move delay when resisting out of cryo
 2017-07-19 05:00:03 -05:00
LetterJayandGitHub 14461521f8 Merge pull request #2058 from Citadel-Station-13/upstream-merge-29305 
[MIRROR] Fixes carbons not handling the Blood-Drunk status effect properly
 2017-07-19 04:59:30 -05:00
CitadelStationBot eff86875b6 Automatic changelog generation for PR #2057 [ci skip] 2017-07-19 04:59:04 -05:00
LetterJayandGitHub 11772ffa74 Merge pull request #2057 from Citadel-Station-13/upstream-merge-29299 
[MIRROR] Prevents the anomalous crystal from making fantasy into reality
 2017-07-19 04:59:02 -05:00
LetterJayandGitHub b497ce09ab Update iv_drip.dm 2017-07-19 04:52:47 -05:00
CitadelStationBot 95467882c6 Automatic changelog generation for PR #2052 [ci skip] 2017-07-19 04:46:10 -05:00
LetterJayandGitHub 98c2128386 Merge pull request #2052 from Citadel-Station-13/remove 
removes the 'yiff in hell' graffiti artwork
 2017-07-19 04:46:09 -05:00
CitadelStationBot 0485a68ebd Automatic changelog generation for PR #2051 [ci skip] 2017-07-19 04:45:55 -05:00
LetterJayandGitHub 0eacb2c7a8 Merge pull request #2051 from ktccd/Borer-lewds 
Borer lewds
 2017-07-19 04:45:53 -05:00
CitadelStationBot 0b7d08d5ac Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc 2017-07-19 04:05:53 -05:00
CitadelStationBot 5801f6211f Cyborgs regenerate oxygen damage, and can heal toxin damage with cable coils 2017-07-18 18:45:30 -05:00
CitadelStationBot 20070c370c Adds a move delay when resisting out of cryo 2017-07-18 09:43:34 -05:00
CitadelStationBotandkevinz000 c294d781b6 Fixes flashbang stun times (#2056) 2017-07-18 06:14:29 -07:00
CitadelStationBotandkevinz000 665e1f2e8e Unprotects the deadmin list (#2059) 2017-07-18 06:14:19 -07:00
CitadelStationBotandkevinz000 8d9dc6dd13 [MIRROR] Fixes a ... likely important bug with shuttle code.... (#2061) 
* Fixes a ... likely important bug with shuttle code....

* Delete turf.dm.rej

* Update turf.dm
 2017-07-18 06:01:02 -07:00
CitadelStationBotandkevinz000 556a8b7216 Unbreaks turf.empty (#2053) 2017-07-18 05:58:27 -07:00
ktccdandGitHub 6aeb096054 Updates epinephrine flufftext 
Updating with less specific epinephrine flufftext.
 2017-07-18 14:43:39 +02:00
CitadelStationBot d99d886aa4 Fixes carbons not handling the Blood-Drunk status effect properly 2017-07-18 06:46:06 -05:00
CitadelStationBot 228f539eca Prevents the anomalous crystal from making fantasy into reality 2017-07-18 06:46:00 -05:00
LetterJay 2d096997bc removes the 'yiff in hell' graffiti artwork 2017-07-18 05:25:38 -05:00
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
LetterJay fa9e1577ec Fix missing PDA icons 2017-07-18 01:14:09 -05:00
CitadelStationBotandkevinz000 b29641d23e [Meta] Minor Whiteship Edits (#2042) 2017-07-17 22:55:42 -07:00
CitadelStationBot 01cb8d9e0f Automatic changelog generation for PR #2040 [ci skip] 2017-07-18 00:52:19 -05: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
CitadelStationBot 7a173b95ed Automatic changelog generation for PR #2043 [ci skip] 2017-07-18 00:51:15 -05:00
CitadelStationBotandkevinz000 b2c8115ca5 Winter coats now properly hold flashlights (#2043) 2017-07-17 22:51:14 -07:00
CitadelStationBot 8aab67f825 Automatic changelog generation for PR #2028 [ci skip] 2017-07-18 00:50:54 -05: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
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