289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
03d01d917f
Merge branch 'master' into wounds-part-2
2020-08-02 18:10:31 +01:00
65d184c552
Merge pull request #12999 from KeRSedChaplain/guardianfix
...
Removes clockwork guardian's projectile deflection. OOPS!
2020-08-01 21:05:52 -07:00
6f2d4ac4df
makes clockwork guardians have no projectile deflection
2020-08-01 23:36:36 -04:00
128225ca6f
Merge pull request #12970 from kappa-sama/patch-35
...
salt pr
2020-08-01 03:34:17 -07:00
30d82d66d1
Merge pull request #12939 from Sishen1542/iaa-iaa
...
Reflavors IAA, removes certain items from IAA uplinks, adds TC stealing functionality to uplinks
2020-08-01 02:24:01 -07:00
974fd83e45
Merge pull request #12975 from MrJWhit/abductor-spawntext
...
Changes to abductors spawntext
2020-08-01 00:51:18 -07:00
320c91f4d3
Merge pull request #12742 from KeRSedChaplain/clockcultrework
...
Clockwork Cult rework
2020-08-01 00:17:11 -07:00
9e36d65a05
HAHAHAHA NOTHING TO SEE HERE
...
THIS VARIABLE HAS ALWAYS BEEN THERE WHAT DO YOU MEAN HAHAHAHAHA
2020-08-01 00:00:41 -04:00
7a0dff1f77
fixes the invisible slabs and buffs a couple scripture casting times
2020-07-31 23:03:59 -04:00
aa605ec007
Changes the death sound for Ratvar to have more oomph behind it
2020-07-31 21:02:12 -04:00
dfa26309d1
copypaste moment
2020-07-31 17:07:47 -04:00
9020e59aa0
kevinz fix
2020-07-31 04:32:46 +03:00
2e3922d08e
Merge remote-tracking branch 'origin/master' into bloodsucker_life
2020-07-31 02:07:14 +03:00
b22ffd6b6e
Makes it properly work
2020-07-31 02:07:03 +03:00
2a23f88438
Whoopsie
2020-07-30 12:44:44 -04:00
249cb136ef
Reworks abducotr spawn text
2020-07-30 12:38:30 -04:00
6356084fe9
this
2020-07-29 23:36:27 -04:00
c60e595d99
Merge pull request #12955 from Arturlang/bloodsucker_life
...
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-29 14:02:22 -07:00
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
a9e84df7f4
fix
2020-07-29 01:17:39 -07:00
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
1416fd08dc
updates clockwork armor /what is magic defense even for i don't get it/
2020-07-29 00:15:11 -04:00
5284fbbec0
various fixes to make the PR not conflict with clickdelays probably
2020-07-28 23:52:13 -04:00
09f2594c37
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-28 22:58:13 +03:00
aa0670e34c
Updates the clockie delay structure
...
Prolonging prisms exist again. They can be built application-tier and take one minute to delay the shuttle by two minutes (So, basically, you end up with one minute more on the timer before it started). It costs 2000 power for the initial use, and 1000 additional power per time it was already used. Oh, and it creates a reeeaaally obvious effect pointing anyone towards the structure. So, good luck defending it.
Also fixes up some scripture sorting but that's minor.
2020-07-28 21:37:05 +02:00
af02490739
still conflicts with clickdelays bluh whatever I'll fix it if its merged
2020-07-28 13:21:27 -04:00
daed810c3a
I didn't get to see if it'd still conflict with the clickdelay testmerge
...
ugghh I shouldn't be coding when my second brain cell falls asleep but hey at least the change is incredibly small
2020-07-28 12:59:34 -04:00
0d85f0553b
bumps krav down to 25, only give martyr to syndie iaa
2020-07-28 09:30:26 -06:00
e8d4d5b053
Revert "Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834 """
...
This reverts commit 0e6fe357da
2020-07-28 05:00:13 -04:00
0e6fe357da
Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834 ""
...
This reverts commit 4b876ef9fb
2020-07-28 04:59:58 -04:00
4b876ef9fb
Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834 "
...
This reverts commit 7e1cab15ae
2020-07-28 04:07:41 -04:00
7e1cab15ae
THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834
...
REVERT IF CLICKDELAYS ARE UN-TESTMERGED
2020-07-28 04:07:01 -04:00
27aba092e0
aaaaaaaaaa
2020-07-27 08:20:03 -06:00
53482e6bd6
modifies the ark, aswell as changing a tiny bit of stuff for stable gateways
...
The ark no longer immediately activates when summoned. Instead, an cultist needs to activate it. Once on, it cannot be turned off again save by destroying it.
Also, the stable-gateway deactivation doafter now has an actual beam-animation.
2020-07-27 00:52:35 +02:00
7d7f40ce90
fixes
2020-07-26 14:56:03 -07:00
93672ea1e4
modifies the ark to not immediately activate and purges some todos
...
Tin
2020-07-26 23:00:29 +02:00
5fb64c38e8
Makes the god fight cooler by adding new quotes and some sound changes
2020-07-26 03:58:52 -04:00
7fd93ecd7d
description edits/Ratvar calling you out for trying to make another Ark
...
makes the Ark's description fit for a station based setting, and makes Ratvar have a nicer tone when talking to someone trying to summon another ark after he's spawned already
2020-07-26 03:57:32 -04:00
49b97f2ea2
increases the penalty for off-station scripture recital to x3 cost/time
2020-07-26 03:54:22 -04:00
f2ef4def24
Buffs some of the available scriptures for clock cult borgs
...
engineering borgs get a focus on the structures
combat oriented borgs get more combat spells IE: belligerent and volt blaster
mediborgs get mending mantra
comments out the janitor slab things, to mirror the janiborg being commented out
2020-07-26 03:52:35 -04:00
1990f75957
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-25 23:46:27 -07:00
01c31c1ce4
My illiteracy knows no bounds
2020-07-25 15:31:26 -04:00
42b6944761
Update internal_affairs.dm
2020-07-25 01:54:58 -06:00
1939d44478
removes a lot of shit from IAA
2020-07-25 01:05:38 -06:00
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
18bdf83136
God I hate travis, will this appease you?
2020-07-24 14:47:53 -04:00
8473a0291d
Revert "/probably/ gets Travis to stop shouting about guardians"
...
This reverts commit be9723678e
2020-07-24 12:05:50 -04:00
e6d7327387
Revert "makes Travis not yell at marauders I don't know they worked fine /shrug"
...
This reverts commit edd68c5174
2020-07-24 12:05:36 -04:00
be9723678e
/probably/ gets Travis to stop shouting about guardians
2020-07-23 23:46:10 -04:00
Timothy Teakettle