Commit Graph
2698 Commits
Author SHA1 Message Date
CitadelStationBot 484ea6d20f Converted borgs will properly show the glowing eye message at distances of 1 2017-07-20 22:25:53 -05:00
CitadelStationBotandkevinz000 bfcb068f21 Adds proper containers for some locates (#2080) 2017-07-20 06:31:25 -07:00
CitadelStationBotandkevinz000 5dc1120b2f Calling the base on_mob_life is mandatory (#2083) 2017-07-20 06:31:10 -07:00
LetterJayandGitHub 993a1ed152 Merge pull request #2078 from Citadel-Station-13/upstream-merge-29285
[MIRROR] Charging the clockwork slab now uses overlays
2017-07-19 13:41:55 -05:00
LetterJayandGitHub 1e2fd6c235 Merge pull request #2044 from Citadel-Station-13/upstream-merge-29293
[MIRROR] Made cell / holding cell windoors their own subtype
2017-07-19 13:41:37 -05:00
LetterJayandGitHub 7b15a20022 Merge pull request #2038 from Citadel-Station-13/upstream-merge-29178
[MIRROR] Ports /vg/'s datum component system
2017-07-19 13:41:00 -05:00
LetterJayandGitHub cff128c5d5 Merge pull request #2073 from Citadel-Station-13/upstream-merge-29180
[MIRROR] Small belt overlay rewrite, and tool overlays for toolbelts
2017-07-19 13:37:25 -05:00
LetterJayandGitHub dda03c03b0 Merge pull request #2074 from Citadel-Station-13/upstream-merge-29336
[MIRROR] fixes goonchat css for some fonts not having proper sizes
2017-07-19 13:31:20 -05:00
LetterJayandGitHub 44ce24476a Merge pull request #2079 from Citadel-Station-13/upstream-merge-29344
[MIRROR] Drakes dying during the brief part of the swoop where they can be damaged will properly reset transform and alpha
2017-07-19 13:30:44 -05:00
LetterJayandGitHub 22ed4d63b9 Rename code/datums/component/components.dm to code/datums/components/component.dm 2017-07-19 13:22:20 -05:00
LetterJayandGitHub 6050c5a881 Rename code/datums/components.dm to code/datums/component/components.dm 2017-07-19 13:21:11 -05:00
LetterJayandGitHub 27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260
[MIRROR] Changes all access const to be a define
2017-07-19 13:18:58 -05:00
LetterJayandGitHub 25a098b965 Merge pull request #2069 from Citadel-Station-13/upstream-merge-29323
[MIRROR] Picking up ores by crossing them no longer spams your chat box
2017-07-19 13:18:17 -05:00
CitadelStationBot 62f633a1ad Drakes dying during the brief part of the swoop where they can be damaged will properly reset transform and alpha 2017-07-19 11:19:35 -05:00
CitadelStationBot 79fcbfece6 Charging the clockwork slab now uses overlays 2017-07-19 10:57:09 -05:00
CitadelStationBot 88df8a412d Fixes Hijack Objective 2017-07-19 10:24:22 -05:00
CitadelStationBot b36b8475ff fixes goonchat css for some fonts not having proper sizes 2017-07-19 10:24:18 -05:00
CitadelStationBot e6d6478482 Small belt overlay rewrite, and tool overlays for toolbelts 2017-07-19 09:30:06 -05:00
LetterJayandGitHub 6fe243b647 Merge pull request #2067 from Citadel-Station-13/upstream-merge-29320
[MIRROR] Electric guitars now properly use .ogg sound files
2017-07-19 09:21:22 -05:00
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
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
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
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 91a2d1ca0b Update security.dm 2017-07-19 04:57:45 -05:00
LetterJayandGitHub b497ce09ab Update iv_drip.dm 2017-07-19 04:52:47 -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
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 bf98e0d417 Picking up ores by crossing them no longer spams your chat box 2017-07-18 19:25:10 -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 5bb567ecb0 Electric guitars now properly use .ogg sound files 2017-07-18 13:51:25 -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
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