Commit Graph

368 Commits

Author SHA1 Message Date
ktccd a2f92461a4 Merge pull request #2210 from Citadel-Station-13/upstream-merge-29585
[MIRROR] Improves several Sound Loops' Performance
2017-07-31 22:06:17 +02:00
ktccd a6e74b9a27 Merge pull request #2193 from Citadel-Station-13/upstream-merge-29572
[MIRROR] Removes a rogue period from the sliver theft objective
2017-07-31 21:51:42 +02:00
CitadelStationBot 3d53f888b1 Improves several Sound Loops' Performance 2017-07-31 14:35:16 -05:00
LetterJay 35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
LetterJay feeb6cdd8b Update game_mode.dm 2017-07-30 23:24:59 -05:00
LetterJay 77c67b31c6 Merge pull request #2064 from Citadel-Station-13/upstream-merge-29290
[MIRROR] Unwrenching clockwork structures no longer damages them
2017-07-30 23:14:39 -05:00
LetterJay 05f7040d12 Merge pull request #2155 from Citadel-Station-13/kevinz000-patch-4
REEEEEE USE YOUR TRUE/FALSE DEFINES KTCCD
2017-07-30 23:13:42 -05:00
CitadelStationBot a98322d497 Removes a rogue period from the sliver theft objective 2017-07-30 19:58:11 -05:00
LetterJay 0e131b50e5 Merge pull request #2188 from Citadel-Station-13/upstream-merge-29546
[MIRROR] Grammar fix for revenants
2017-07-29 23:55:51 -05:00
CitadelStationBot 272414bd30 Fixes latejoin antagonist exploit (#2181) 2017-07-29 19:51:16 -07:00
CitadelStationBot 6990dcbceb Grammar fix for revenants 2017-07-29 21:03:12 -05:00
LetterJay d07b21a9d8 Merge pull request #2174 from Citadel-Station-13/upstream-merge-29325
[MIRROR] Prolonging Prisms have a higher cost to delay, but no longer increase in cost based off of CV
2017-07-29 15:47:48 -05:00
CitadelStationBot d16f68b4da Sigils of Transmission can now drain power, but Interdiction Lenses have been removed (#2173) 2017-07-28 23:52:02 -07:00
CitadelStationBot adc7a52b8d BYPASSES THE DEEP FREEZE (#2168) 2017-07-28 23:51:24 -07:00
CitadelStationBot 30cb54a928 Prolonging Prisms have a higher cost to delay, but no longer increase in cost based off of CV 2017-07-28 18:45:22 -05:00
CitadelStationBot 269e2cbd64 Removes the dangerrating variable, which is completely unused (#2157) 2017-07-27 06:44:35 -07:00
kevinz000 b2e176346c Update cit_objectives.dm 2017-07-27 05:29:27 -07:00
ktccd c52f7a0475 Delayed objective (#2140)
Delayed objective [Latejoiners can now be selected as traitor targets]
2017-07-27 05:27:58 -07:00
CitadelStationBot 147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
CitadelStationBot 3ede530307 Romerol zombies count as dead for assassinate and maroon objectives. (#2130) 2017-07-25 15:34:18 -07:00
CitadelStationBot 3085776125 Reviving Stasis now always regenerates all organs 2017-07-21 18:18:45 -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 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 88bef4f0c0 Unwrenching clockwork structures no longer damages them 2017-07-18 09:47:52 -05:00
CitadelStationBot a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
ktccd 6aeb096054 Updates epinephrine flufftext
Updating with less specific epinephrine flufftext.
2017-07-18 14:43:39 +02: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
LetterJay fbeebdeab9 Merge pull request #2027 from ktccd/Enable-Borer-Random-Event
Enable borer random event
2017-07-17 07:46:01 -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 609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -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
CitadelStationBot 54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
kevinz000 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 f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00
CitadelStationBot 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
ktccd 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
CitadelStationBot 7c4b887551 Clockwork component icons for tgui will only be generated once (#1995) 2017-07-14 03:21:13 -07:00
LetterJay 9d3c4d4702 Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215
[MIRROR] Replaces ex_act and emp_act numbers with defines
2017-07-13 23:57:35 -05:00
CitadelStationBot 55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot 1da785ffb5 Removes old height parameter from CanPass proc 2017-07-13 17:46:36 -05:00
CitadelStationBot f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905)
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
2017-07-13 06:37:51 -07:00
CitadelStationBot 2879cd1593 YOU CAN NOW PET BLOBS (#1976) 2017-07-10 22:42:48 -07:00
CitadelStationBot 059e1ad46b Replaces clockwork component initials with icons (#1971) 2017-07-10 16:14:11 -07:00
CitadelStationBot ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00