Commit Graph

1464 Commits

Author SHA1 Message Date
Dan-Neposh
aa605ec007 Changes the death sound for Ratvar to have more oomph behind it 2020-07-31 21:02:12 -04:00
silicons
a9e84df7f4 fix 2020-07-29 01:17:39 -07:00
silicons
e4148fe4ad Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 01:11:11 -07:00
Keate Senior
1416fd08dc updates clockwork armor /what is magic defense even for i don't get it/ 2020-07-29 00:15:11 -04:00
Keate Senior
5284fbbec0 various fixes to make the PR not conflict with clickdelays probably 2020-07-28 23:52:13 -04:00
DeltaFire
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
Keate Senior
af02490739 still conflicts with clickdelays bluh whatever I'll fix it if its merged 2020-07-28 13:21:27 -04:00
Keate Senior
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
Keate Senior
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
Keate Senior
0e6fe357da Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834""
This reverts commit 4b876ef9fb.
yo hol up I gotta see if the confliction is fixed first
2020-07-28 04:59:58 -04:00
Keate Senior
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
Keate Senior
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
DeltaFire
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
silicons
7d7f40ce90 fixes 2020-07-26 14:56:03 -07:00
DeltaFire
93672ea1e4 modifies the ark to not immediately activate and purges some todos
Tin
2020-07-26 23:00:29 +02:00
Keate Senior
5fb64c38e8 Makes the god fight cooler by adding new quotes and some sound changes 2020-07-26 03:58:52 -04:00
Keate Senior
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
Keate Senior
49b97f2ea2 increases the penalty for off-station scripture recital to x3 cost/time 2020-07-26 03:54:22 -04:00
Keate Senior
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
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
Keate Senior
01c31c1ce4 My illiteracy knows no bounds 2020-07-25 15:31:26 -04:00
Keate Senior
18bdf83136 God I hate travis, will this appease you? 2020-07-24 14:47:53 -04:00
Keate Senior
8473a0291d Revert "/probably/ gets Travis to stop shouting about guardians"
This reverts commit be9723678e.
2020-07-24 12:05:50 -04:00
Keate Senior
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
Keate Senior
be9723678e /probably/ gets Travis to stop shouting about guardians 2020-07-23 23:46:10 -04:00
Keate Senior
14ff477fa1 Revert "Makes Ratvar spawn above the Ark"
This reverts commit e4ae613434.
2020-07-23 22:38:04 -04:00
Keate Senior
edd68c5174 makes Travis not yell at marauders I don't know they worked fine /shrug 2020-07-23 22:35:48 -04:00
silicons
53b3c6099b ok 2020-07-23 16:27:41 -07:00
Lin
8a25582c1c Merge pull request #12850 from silicons/drag
fixes dragging stuff into space, enforces no sleeping on Life() and sets Move() to forced async
2020-07-23 17:13:48 -05:00
Keate Senior
e4ae613434 Makes Ratvar spawn above the Ark 2020-07-23 17:49:14 -04:00
Lin
69c3d4f24a Merge pull request #12864 from Citadel-Station-13/silicons-patch-45
regarding changelings
2020-07-23 13:18:55 -05:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
Timothy Teakettle
f5ac0b5762 some fixes 2020-07-23 18:10:46 +01:00
Keate Senior
fafde35ee2 Fixes the Arks looping issue, and gives Ratvar new words when fighting
Also removes the grace period variable since the ark activates immediately now /shrug
2020-07-23 12:59:40 -04:00
Keate Senior
7f652cf338 updates the UI so it works with TGUI3 2020-07-23 06:38:47 -04:00
silicons
e0e2cd561a Update revive.dm 2020-07-22 11:38:26 -07:00
silicons
0acf7b82d5 Update revive.dm 2020-07-22 02:20:10 -07:00
silicons
919edfa2fd Update revive.dm 2020-07-22 02:11:20 -07:00
silicons
30e7483e89 Update absorb.dm 2020-07-22 02:10:24 -07:00
silicons
9fc669b4ea Update changeling.dm 2020-07-22 02:09:49 -07:00
silicons
4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00
silicons
f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
silicons
1450b11b01 sigh 2020-07-20 21:37:44 -07:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
silicons
c7022445b5 Merge pull request #12800 from DeltaFire15/swarmer-fix
Fixes swarmers not being able to eat any items at all
2020-07-20 16:55:00 -07:00
silicons
4d4133a8da Merge pull request #12819 from Arturlang/bloodsucker_typo
Fixes a bloodsucker lair typo
2020-07-20 16:53:42 -07:00
Lin
67a6330e77 Merge pull request #12786 from silicons/survivalists
makes survivalists pseudoantags again and limits summon guns/magic to one use
2020-07-20 18:20:08 -05:00
Keate Senior
ecb9a430eb Stable gateways and integration cog QoL by DeltaFire
APC interfaces now lock after being cogged, and Reebe can only be accessed by stabilizing/linking an obelisk with the one in reebe
2020-07-20 16:57:23 -04:00
silicons
692656b02d Whew 2020-07-20 11:53:33 -07:00
silicons
526d257410 fix 2020-07-20 11:48:08 -07:00