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
d16f68b4da
Sigils of Transmission can now drain power, but Interdiction Lenses have been removed ( #2173 )
2017-07-28 23:52:02 -07:00
adc7a52b8d
BYPASSES THE DEEP FREEZE ( #2168 )
2017-07-28 23:51:24 -07:00
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
269e2cbd64
Removes the dangerrating variable, which is completely unused ( #2157 )
2017-07-27 06:44:35 -07:00
c52f7a0475
Delayed objective ( #2140 )
...
Delayed objective [Latejoiners can now be selected as traitor targets]
2017-07-27 05:27:58 -07:00
147bd4cf97
Lava is no longer a plating subtype ( #2138 )
2017-07-26 00:05:53 -07:00
3ede530307
Romerol zombies count as dead for assassinate and maroon objectives. ( #2130 )
2017-07-25 15:34:18 -07:00
3085776125
Reviving Stasis now always regenerates all organs
2017-07-21 18:18:45 -05:00
bfcb068f21
Adds proper containers for some locates ( #2080 )
2017-07-20 06:31:25 -07:00
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
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
79fcbfece6
Charging the clockwork slab now uses overlays
2017-07-19 10:57:09 -05:00
88df8a412d
Fixes Hijack Objective
2017-07-19 10:24:22 -05:00
6aeb096054
Updates epinephrine flufftext
...
Updating with less specific epinephrine flufftext.
2017-07-18 14:43:39 +02:00
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
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
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
fbeebdeab9
Merge pull request #2027 from ktccd/Enable-Borer-Random-Event
...
Enable borer random event
2017-07-17 07:46:01 -05:00
74e5f80257
Fixes the Ark not pushing stuff away even while waiting for components
2017-07-17 07:16:55 -05:00
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
f87046aaee
Comments
2017-07-15 23:44:13 +02:00
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
54da14ea6b
Rename Bumped to CollidedWith ( #2017 )
2017-07-15 11:44:12 -07:00
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#2021 )"
This reverts commit f2ac487927
2017-07-15 11:41:36 -07:00
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00
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
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
7c4b887551
Clockwork component icons for tgui will only be generated once ( #1995 )
2017-07-14 03:21:13 -07:00
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
55462ed7d1
Replaces ex_act and emp_act numbers with defines
2017-07-13 17:46:41 -05:00
1da785ffb5
Removes old height parameter from CanPass proc
2017-07-13 17:46:36 -05:00
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
2879cd1593
YOU CAN NOW PET BLOBS ( #1976 )
2017-07-10 22:42:48 -07:00
059e1ad46b
Replaces clockwork component initials with icons ( #1971 )
2017-07-10 16:14:11 -07:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
bdd9978dcf
De-lags sandbox a bit ( #1928 )
2017-07-07 10:34:25 -07:00
eb7f6c515b
Cleans up posibrain code
2017-07-06 09:43:16 -05:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
b75fee9f38
Merge branch 'master' into upstream-merge-28711
2017-07-03 17:47:00 -05:00
1054100178
Merge pull request #1447 from Citadel-Station-13/upstream-merge-28108
...
[MIRROR] Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power
2017-07-03 17:46:37 -05:00
694bf7a641
Update clockwork_slab.dm
2017-07-03 14:09:59 -05:00
08fd496450
Update clockwork_slab.dm
2017-07-03 12:02:32 -05:00
5882b25b7a
Rewrites Recollection and splits it into categories, rewords Hierophant Network description
2017-07-03 10:10:17 -05:00
32c35a211b
[MIRROR] Fixes abductors not being able to sleep people ( #1692 )
...
* Fixes abductors not being able to sleep people
* Update abduction_gear.dm
* Delete abduction_gear.dm.rej
2017-06-30 21:21:26 -07:00
ca2d03a082
Moves transit space to separate z level. ( #1696 )
2017-06-30 20:56:45 -07:00
9d5e51777b
use_power var now uses a define to reflect it not being a bool ( #1842 )
2017-06-30 20:41:59 -07:00
f1937eb1fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-06-26 06:14:55 -05:00
LetterJay