Commit Graph

1123 Commits

Author SHA1 Message Date
CitadelStationBot cf87bf20f5 makes gulag beacon indestructible (#2123) 2017-07-26 00:06:21 -07:00
CitadelStationBot 147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
CitadelStationBot 66cf0b674d Fix ruin ripley's spawn equipment (#2128) 2017-07-25 15:34:36 -07:00
CitadelStationBot 3ede530307 Romerol zombies count as dead for assassinate and maroon objectives. (#2130) 2017-07-25 15:34:18 -07:00
CitadelStationBot 47e20105a3 fixes instruments (#2129) 2017-07-25 15:33:45 -07:00
CitadelStationBot b998e14a5b Map Spellcheck 2017-07-24 21:16:46 -05:00
CitadelStationBot 37b9e24bc0 Removes the gulag sink and water bottles from the sustenance vendor. (#2094) 2017-07-24 04:08:56 -07:00
CitadelStationBot 5f8da9c34b Prevents the captain's sabre from rustling jimmies (#2113) 2017-07-24 04:08:41 -07:00
CitadelStationBot 6a53670890 Fixes shower runtimes (#2100) 2017-07-24 04:08:16 -07:00
CitadelStationBot 49ee9d6cc9 roundstart AT cleanup (#2103) 2017-07-24 04:07:02 -07:00
CitadelStationBot 2c567685fb Instrument performance update - Scans for hearers every 4 ticks instead of per note. (#2108) 2017-07-24 04:06:52 -07:00
CitadelStationBot 6522ca6130 Nuke screwdrivers are no longer randomly colored (#2110) 2017-07-24 04:06:16 -07:00
CitadelStationBot f14fab916b Supermatter sliver theft now works (#2115) 2017-07-24 04:05:55 -07:00
LetterJay a482eb6d48 Merge pull request #2091 from Citadel-Station-13/upstream-merge-29410
[MIRROR] Reviving Stasis now always regenerates all organs
2017-07-23 06:52:56 -05:00
LetterJay 564f1bc533 Merge pull request #2092 from Citadel-Station-13/upstream-merge-29409
[MIRROR] Fixes a drone ping issue
2017-07-23 06:52:41 -05:00
LetterJay 6a961f7348 Merge pull request #2093 from Citadel-Station-13/upstream-merge-29401
[MIRROR] Ore satchels no longer have infinite capacity
2017-07-23 06:52:26 -05:00
CitadelStationBot e937aeaa51 Fixes harmonicas acting like muzzles (and runtiming instead of properly muting you too.) 2017-07-21 18:26:06 -05:00
CitadelStationBot c8763c994c Ore satchels no longer have infinite capacity 2017-07-21 18:20:53 -05:00
CitadelStationBot 4fbdf9851d Fixes a drone ping issue 2017-07-21 18:19:49 -05:00
CitadelStationBot 3085776125 Reviving Stasis now always regenerates all organs 2017-07-21 18:18:45 -05:00
CitadelStationBot 5db90b28dc Fixes the party alarm (#2082) 2017-07-21 07:05:29 -07:00
CitadelStationBot 64f7a14e07 Adds investigate logs to portals 2017-07-20 22:26:01 -05:00
CitadelStationBot bfcb068f21 Adds proper containers for some locates (#2080) 2017-07-20 06:31:25 -07:00
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
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 e6d6478482 Small belt overlay rewrite, and tool overlays for toolbelts 2017-07-19 09:30:06 -05:00
LetterJay 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
LetterJay 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
LetterJay a7b3516491 Merge pull request #2000 from Citadel-Station-13/upstream-merge-29228
[MIRROR] Fixes IV Drips
2017-07-19 05:02:19 -05:00
LetterJay 91a2d1ca0b Update security.dm 2017-07-19 04:57:45 -05:00
LetterJay b497ce09ab Update iv_drip.dm 2017-07-19 04:52:47 -05:00
LetterJay 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
LetterJay 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 5bb567ecb0 Electric guitars now properly use .ogg sound files 2017-07-18 13:51:25 -05:00
CitadelStationBot c294d781b6 Fixes flashbang stun times (#2056) 2017-07-18 06:14:29 -07:00
CitadelStationBot 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
CitadelStationBot 556a8b7216 Unbreaks turf.empty (#2053) 2017-07-18 05:58:27 -07:00
ktccd 6aeb096054 Updates epinephrine flufftext
Updating with less specific epinephrine flufftext.
2017-07-18 14:43:39 +02: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
CitadelStationBot e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBot bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
LetterJay fbeebdeab9 Merge pull request #2027 from ktccd/Enable-Borer-Random-Event
Enable borer random event
2017-07-17 07:46:01 -05:00
LetterJay 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