Commit Graph
35728 Commits
Author SHA1 Message Date
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
Keate Senior e2eb08fcba probably gets travis to stop yelling about the new reebe 2020-07-25 17:43:49 -04: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 ed68943318 Revert "Makes Ratvar spawn above the Ark"
This reverts commit e4ae613434.
and GitKraken being laggy made it happen twice hrrng
2020-07-23 22:42:28 -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
Keate Senior e4ae613434 Makes Ratvar spawn above the Ark 2020-07-23 17:49:14 -04: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 f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
silicons 3c4b11f3f2 please 2020-07-21 11:20:45 -07:00
CitadelStationBot 4ac4d94c31 Automatic changelog generation for PR #12852 [ci skip] 2020-07-21 12:06:08 -05:00
siliconsandGitHub bf8ca6d310 Merge pull request #12852 from Ludox235/Abductors-are-cringe
This shit creeped me out so there's a good chance it creeps other people out
2020-07-21 10:06:05 -07:00
Ludox 401d7b14b5 Get that shit off my screen
Who tought this was a good idea for fuck sake
2020-07-21 10:18:39 +02:00
CitadelStationBot c27f339049 Automatic changelog generation for PR #12824 [ci skip] 2020-07-20 19:25:57 -05:00
siliconsandGitHub aa3cc9fae8 Merge pull request #12824 from kappa-sama/patch-35
makes brainwashing disk role restricted and debuffs its price
2020-07-20 17:25:53 -07:00
Changelogs f4c5796b6d Automatic changelog compile [ci skip] 2020-07-21 00:10:06 +00:00
LinandGitHub b6f689b06d Merge pull request #12843 from Citadel-Station-13/silicons-patch-40
uhhhhhhh ok nothing to see here let's fix spell packets this time again
2020-07-20 19:05:28 -05:00
CitadelStationBot 9a798c7ba8 Automatic changelog generation for PR #12787 [ci skip] 2020-07-20 19:01:36 -05:00
siliconsandGitHub 3d2995b4e8 Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
2020-07-20 17:01:32 -07:00
CitadelStationBot 9ea17928a5 Automatic changelog generation for PR #12829 [ci skip] 2020-07-20 18:59:40 -05:00
siliconsandGitHub a7144d2404 Merge pull request #12829 from timothyteakettle/fried-component
the fried component
2020-07-20 16:59:36 -07:00
CitadelStationBot 8c254744bf Automatic changelog generation for PR #12811 [ci skip] 2020-07-20 18:58:05 -05:00
siliconsandGitHub 7df369e5d7 Merge pull request #12811 from kappa-sama/patch-33
removes the 2 best weapons in the game from traitor uplink's 10tc surgery bag
2020-07-20 16:58:01 -07:00
CitadelStationBot 3efe9c8c00 Automatic changelog generation for PR #12807 [ci skip] 2020-07-20 18:57:27 -05:00
siliconsandGitHub 1d99591b6b Merge pull request #12807 from kappa-sama/patch-32
lowers stray cargo pod weight from 2x normal to 1/2 normal
2020-07-20 16:57:24 -07:00
CitadelStationBot 12a09bee52 Automatic changelog generation for PR #12805 [ci skip] 2020-07-20 18:56:59 -05:00
siliconsandGitHub 9bb92f8d4d Merge pull request #12805 from SiliconMain/patch-1
This is stupid
2020-07-20 16:56:57 -07:00
CitadelStationBot 53e18d0314 Automatic changelog generation for PR #12826 [ci skip] 2020-07-20 18:56:25 -05:00
siliconsandGitHub 3f2cab02eb Merge pull request #12826 from Kraseo/instastuns-bad
Makes damp rags no longer instantly apply chemicals
2020-07-20 16:56:22 -07:00
CitadelStationBot 38557d0b29 Automatic changelog generation for PR #12804 [ci skip] 2020-07-20 18:55:41 -05:00
siliconsandGitHub 947b050c47 Merge pull request #12804 from Arturlang/decal_painter_fix
Decal Painter ui fix
2020-07-20 16:55:38 -07:00
CitadelStationBot ef9a757a82 Automatic changelog generation for PR #12800 [ci skip] 2020-07-20 18:55:03 -05:00
siliconsandGitHub 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
siliconsandGitHub fefc0530b8 Merge pull request #12795 from TheSpaghetti/patch-3
Makes extradimensional oranges weirder. [/TG/ PORT]
2020-07-20 16:54:43 -07:00
CitadelStationBot 2e09ecee4c Automatic changelog generation for PR #12749 [ci skip] 2020-07-20 18:54:28 -05:00
siliconsandGitHub 448706d540 Merge pull request #12749 from TheSpaghetti/patch-2
Adds monophobia quirk.
2020-07-20 16:54:25 -07:00
siliconsandGitHub 4d4133a8da Merge pull request #12819 from Arturlang/bloodsucker_typo
Fixes a bloodsucker lair typo
2020-07-20 16:53:42 -07:00
siliconsandGitHub 2ec64f3e05 Update wizard.dm 2020-07-20 16:50:56 -07:00
LinandGitHub 210b7b281c Merge pull request #12727 from Citadel-Station-13/silicons-patch-19
bandaids around turnstiles being bad code until it can have its movement checks refactored
2020-07-20 18:25:01 -05:00
LinandGitHub 7adae61ade Merge pull request #12773 from Citadel-Station-13/silicons-patch-28
jexp exemption now also exempts from antag days remaining locks
2020-07-20 18:22:42 -05:00
CitadelStationBot ffde1709ea Automatic changelog generation for PR #12823 [ci skip] 2020-07-20 18:21:59 -05:00