Commit Graph

1770 Commits

Author SHA1 Message Date
Dan-Neposh
b2f80555bb hopefully fixes run linters, as well as rewords some announcements 2021-03-04 01:58:36 -05:00
Dan-Neposh
2ec2f55eb7 updates fork 2021-02-17 12:03:28 -05:00
Dan-Neposh
ace2512812 solves run linter errors 2021-02-17 10:24:37 -05:00
Putnam3145
74e6f9198b Merge pull request #14236 from dzahlus/toxic-objective-removal
Removes prevent from leaving alive, maroon objective
2021-02-17 05:35:27 -08:00
silicons
0aea43afcc Merge pull request #14224 from DeltaFire15/no-more-YELLING
Makes clockies yell less
2021-02-13 19:06:57 -07:00
dzahlus
c40427da05 i hate changelings
i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings
2021-02-12 19:23:59 +01:00
dzahlus
eacf1ef40b dynamic still has permakill obj but i aint touching dynamic code 2021-02-12 19:20:22 +01:00
dzahlus
806d96076e i dont actually know how to code btw 2021-02-12 18:41:58 +01:00
dzahlus
70303319f4 hrnngh CTRL+S doesnt save everything 2021-02-12 18:26:52 +01:00
dzahlus
503c276f9f uh second try 2021-02-12 18:25:03 +01:00
Dan-Neposh
7f0af72e8f splits the announcement message in half so that the subtitles line up 2021-02-12 03:53:31 -05:00
DeltaFire
b0ff405a13 cool 2021-02-12 03:06:53 +01:00
DeltaFire
fb4641b348 e 2021-02-12 02:42:59 +01:00
DeltaFire
7fbb41eee0 screaming 2021-02-11 04:12:42 +01:00
Timothy Teakettle
4b51174717 Update disease_disease.dm 2021-02-05 16:43:18 +00:00
Dan-Neposh
ff902ee854 removes the cogscarab summon scripture I don't remember adding 2021-01-26 11:57:19 -05:00
Dan-Neposh
caa3d0a90d fixes a punctuation error in the guardian summon description 2021-01-26 11:26:19 -05:00
silicons
efc3ecef32 Merge pull request #14118 from DeltaFire15/slabs-and-silicons
About ratvarian borgs and spells sometimes not working (+ a few other small things)
2021-01-25 23:17:41 -07:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK
[READY]Gives the revenant TK
2021-01-25 23:17:09 -07:00
silicons
0c6e67ac81 Merge pull request #14127 from Hatterhat/tg-56348
tgstation#56348 - contractor TC buff
2021-01-25 23:04:01 -07:00
silicons
7b35c80a4d Merge pull request #14117 from timothyteakettle/blob-emote
lets blobs use the 'me' verb
2021-01-25 22:59:24 -07:00
silicons
6094293b4b Merge pull request #14105 from DeltaFire15/heretic-target-fix
Heretic sacrifice target logging + a fix
2021-01-25 22:58:54 -07:00
Artur
b569d59271 Did the suggestion 2021-01-25 22:07:04 +02:00
Dan-Neposh
87e9bb8e5c adds text announcing the end of the round for clockcult victory 2021-01-25 13:38:02 -05:00
Dan-Neposh
17f85d7d8d war golem, cyborg, soul vessel rites added, scarab scripture added 2021-01-25 05:22:20 -05:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Hatterhat
09d91643ef tg 56348 2021-01-22 18:39:46 -06:00
Dan-Neposh
fb75c6a949 adds in ending sequence for Ratvar spawning, + various other changes
above, as well as cancelling out each gods round end sequence depending on who wins their fight, plus some description edits which make more sense with the station based setting
2021-01-22 00:04:04 -05:00
Dan-Neposh
48d8ffc9a7 reverts every change slowing down developement of this PR 2021-01-21 23:42:23 -05:00
DeltaFire
920be8cffc stuffs 2021-01-22 01:43:35 +01:00
Timothy Teakettle
ca9292f6fd Update overmind.dm 2021-01-21 22:45:46 +00:00
Timothy Teakettle
897f8a744f Update overmind.dm 2021-01-21 22:39:38 +00:00
Artur
87c9201707 No gunning sadly 2021-01-20 19:51:11 +02:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur
16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
DeltaFire
7136f5cffb boop 2021-01-20 06:09:20 +01:00
DeltaFire
4578f30001 brrt 2021-01-20 05:54:38 +01:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
Hatterhat
a468f400e3 see branch name 2021-01-14 20:55:06 -06:00
Dan-Neposh
04d5721c4d Merge branch 'master' into clockcultrework_v2 2021-01-14 19:51:15 -05:00
Dan-Neposh
6ddfa8170f Adds a round ending sequence to Ratvar's spawn
Along with its sounds + making the Neovgre cannon sound better. Audio courtesy of Dzahlus.
2021-01-14 18:29:50 -05:00
Dan-Neposh
ab5cffc360 Various edits in order to get this PR out finally 2021-01-14 12:56:55 -05:00
silicons
8f7b483161 remove reverb 2021-01-13 21:37:30 -07:00
silicons
c66874f732 Merge pull request #14032 from kappa-sama/kaiowhat
two toggled self-buffing spells that have no relation to any anime or video game in particular
2021-01-13 16:50:50 -07:00
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
Lin
04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs
Tweaks some Synth damage stuff
2021-01-13 18:40:03 +00:00
Artur
d5e99e9cef TESTING 2021-01-13 05:56:10 +02:00
kappa-sama
c751f114aa finally 2021-01-12 01:42:55 -05:00
silicons
cd62c45902 Update nuclearbomb.dm 2021-01-10 03:52:16 -07:00