Commit Graph

18546 Commits

Author SHA1 Message Date
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
a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513
[READY] somatoray buff - mutation locks + revolution ray
2021-01-25 23:17:29 -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
de8d778f76 Merge pull request #14134 from Arturlang/Give_improvements
[READY]Give Improved
2021-01-25 23:02:03 -07:00
silicons
36215c5d48 Merge pull request #14136 from shellspeed1/Fixes-infinite-floor-tiles
Ports a fix for infinite floor tiles from tg caused by a bug that was fixed a long time ago on tg code.
2021-01-25 23:01:23 -07:00
silicons
46891ee510 Merge pull request #14137 from SandPoot/master
Dropper can no longer drop things at it's location without having them
2021-01-25 23:00:53 -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
50ad333afe Merge pull request #14116 from timothyteakettle/stop-encoding-twice
adminhelps and pms only sanitize text once, stopping ' becoming &39;! or whatever
2021-01-25 22:59:17 -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
silicons
8e20e20184 Merge pull request #14059 from Hatterhat/no-corpse-headsets
removes headsets and flashes from more legion corpses
2021-01-25 22:58:05 -07:00
SandPoot
6fb5067da4 upload files 2021-01-25 19:40:35 -03: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
shellspeed1
8176bf30ff new line 2021-01-24 21:51:08 -08:00
shellspeed1
e85379eea2 a 2021-01-24 21:36:04 -08:00
raspy-on-osu
f2d9643c75 init 2021-01-24 22:31:39 -05:00
raspy-on-osu
79640e912d bread in french (who added living bread?) 2021-01-24 19:30:15 -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
Lin
0759189ef5 Merge pull request #14124 from MrJWhit/port-AI-can-now-look-up-and-down-zlevels-
Port of "AI can now look up and down zlevels"
2021-01-24 13:30:42 -06:00
Lin
04aaa7aeda Merge pull request #14129 from MrJWhit/cursed-name
Porting a cursed name about drinking
2021-01-24 13:24:19 -06:00
Lin
a983b70495 Merge pull request #14121 from MrJWhit/port-Makes-the-microwave-cleanable-by-the-damp-rag-
Port of "Makes the microwave cleanable by the damp rag"
2021-01-24 13:23:12 -06:00
Lin
724450822f Merge pull request #14123 from MrJWhit/port-of-Let-Me-Tell-You-A-Story-
Port "Let Me Tell You A Story"
2021-01-24 13:20:03 -06:00
Lin
aa8640431c Merge pull request #14126 from MrJWhit/porting-Humanizing-a-monkey-no-longer-yeets-any-buried-smuggler's-satchels-from-the-tile-onto-their-person.-
Port "Humanizing a monkey no longer yeets any buried smuggler's satchels from the tile onto their person."
2021-01-24 13:19:42 -06:00
Artur
91cd7378ca Give Improved 2021-01-24 16:05:42 +02:00
shellspeed1
1979dcd231 Update uplink_stealth.dm 2021-01-23 01:30:50 -08:00
silicons
bc49224241 Update species.dm 2021-01-22 20:51:24 -07:00
MrJWhit
6dd674dae4 Porting 2021-01-22 20:47:45 -05:00
Hatterhat
09d91643ef tg 56348 2021-01-22 18:39:46 -06:00
MrJWhit
a78b6ae958 Update transform_procs.dm 2021-01-22 19:35:17 -05:00
MrJWhit
8603a9fc77 Update ai.dm 2021-01-22 19:26:42 -05:00
MrJWhit
01d6d40d8e Port'n 2021-01-22 19:04:37 -05:00
MrJWhit
399d04654a Update alien.dm 2021-01-22 18:57:31 -05:00
MrJWhit
d9f2cccd84 Hehoo maybe I should actually see what happens when I compile 2021-01-22 13:33:18 -05:00
MrJWhit
5fe6772c58 Update microwave.dm 2021-01-22 13:23:10 -05: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
Timothy Teakettle
8569c40ce5 Update adminpm.dm 2021-01-21 22:23:48 +00:00
Timothy Teakettle
401e6a7690 test 2021-01-21 20:17:25 +00:00
silicons
f2853ab414 Merge pull request #14103 from Arturlang/give_hotkey
[READY]Give hotkey, but citadel
2021-01-21 01:41:29 -07:00
silicons
34473c2ac7 fix 2021-01-20 16:55:19 -07:00
silicons
996ad0634d fix 2021-01-20 16:16:06 -07:00
silicons
20f06cae0f fix 2021-01-20 16:07:42 -07:00
silicons
235ca8809a uh 2021-01-20 16:04:52 -07:00