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
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
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
silicons
9733305997
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-09 14:56:32 -08:00
silicons
656691912e
Merge pull request #13965 from Xantholne/GoodNightDisky
...
Good Night Disky
2021-01-09 15:39:06 -07:00
DeltaFire
125ea9dad2
vitality sigil drain
2021-01-09 20:44:51 +01:00
DeltaFire
05f7991981
snap
2021-01-09 20:37:24 +01:00
DeltaFire
9cfd3c073e
smol fix
2021-01-09 00:33:20 +01:00
silicons
ddad368d6a
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-08 00:33:57 -08:00
Putnam3145
5cde6e0157
Merge pull request #13871 from silicons/debris
...
Merry Christmas - GIVING JANITORS A JOB
2021-01-08 00:26:52 -08:00
silicons
dc02c8cf74
Merge pull request #13967 from keronshb/blobtweaks
...
Small blob tweaks + fix
2021-01-08 01:20:23 -07:00
MrJWhit
784fca8bd4
Hehe fixies
2021-01-07 20:59:37 -05:00
Xantholne
18a336cec5
Adds bed tucking element
2021-01-05 02:47:21 -07:00
keronshb
af3c8edf01
Small blob tweaks + fix
...
Fixes the permanent consumption of a factory blob w/ blobbernaut failure. Also changes resource blob pointgen from 1 to 2 and allows factory blobs to be placed across 5 tiles instead of 7.
2021-01-04 12:32:41 -05:00
Xantholne
fe4f184792
good night disky
2021-01-04 03:50:43 -07:00
silicons
1b9a399bbd
Merge pull request #13905 from zeroisthebiggay/help
...
gives codex cicatrix inhands
2020-12-30 14:46:26 -07:00
DeltaFire
3dbf4830f0
Merge pull request #13892 from Citadel-Station-13/silicons-patch-50
...
rebalances changeling combat mutations
2020-12-30 18:17:30 +01:00
Letter N
3996f50a00
who is nanotransen
2020-12-29 14:00:58 +08:00
Letter N
51143f89e5
Merge remote-tracking branch 'origin/master' into semi-sync
2020-12-29 10:37:06 +08:00
zerothebigboy
6f38ec403f
help
2020-12-28 15:34:35 -05:00
silicons
0c87c3b0e0
fiX
2020-12-28 12:15:55 -08:00
DeltaFire
01f1844781
there
2020-12-28 19:15:59 +01:00
DeltaFire
b1be0159e2
Merge pull request #13877 from Citadel-Station-13/silicons-patch-43
...
heretics uses killonce objectives
2020-12-28 17:56:58 +01:00
Letter N
ce5ab2f3a4
Merge remote-tracking branch 'origin/master' into semi-sync
2020-12-28 09:35:58 +08:00
silicons
3f026749c8
Update mutations.dm
2020-12-27 12:15:17 -07:00
silicons
824427ce2f
Update mutations.dm
2020-12-27 12:11:27 -07:00
silicons
d574996db9
Merge pull request #13846 from DeltaFire15/robot-antag-healing
...
Ling & Bloodsucker healing now affects IPCs / Synths
2020-12-27 05:48:48 -07:00
silicons
646db6ef32
Update rust_lore.dm
2020-12-26 11:03:51 -07:00
silicons
f5ecdad8e9
Update eldritch_antag.dm
2020-12-26 10:58:46 -07:00
Letter N
56fb81d02c
Immursive Audio 2
2020-12-24 11:06:49 +08:00
Letter N
e9ca58446c
Merge remote-tracking branch 'origin/master' into semi-sync
2020-12-23 12:25:24 +08:00
DeltaFire
48cbe2ce46
snap
2020-12-22 19:15:52 +01:00
DeltaFire
261b9fc517
Merge pull request #13833 from kiwedespars/mmhmhm
...
bone chitin gloves no longer more murderous than an armblade
2020-12-22 17:41:20 +01:00
silicons
c939d7aaaf
Merge pull request #13822 from DeltaFire15/oops-all-stunhands
...
Fixes a thing in stunhands used on clockies
2020-12-22 09:32:40 -07:00
kiwedespars
0646d3f285
nerf...
2020-12-21 15:07:25 -08:00
Artur
ee9cf20aec
Awaken
2020-12-22 00:25:59 +02:00
Letter N
abd94d1c03
Merge remote-tracking branch 'origin/master' into semi-sync
2020-12-21 21:19:06 +08:00
Letter N
98ff0a080e
ImmursionAudio(TM)
2020-12-21 19:47:11 +08:00
Letter N
a808f805d4
ASYNC EVERYTHING!
2020-12-21 16:24:51 +08:00
DeltaFire
cfba083680
oops
2020-12-21 00:15:29 +01:00
silicons
db6f9349c5
Merge pull request #13785 from Putnam3145/fix-grab-bag
...
Makes grab bag ONLY make station antags; triples alien dynamic threat.
2020-12-20 15:42:04 -07:00
Lin
f6a6c138df
Merge pull request #13776 from DeltaFire15/ai-kill-once
...
Makes Traitor AIs have 'kill once' objectives instead of 'assassinate'
2020-12-20 17:22:06 +00:00
BlueWildrose
98b1de5536
oh yes we don't want that do we?
2020-12-18 22:56:39 -07:00
Blue Wildrose
d4d5e53cb6
go away Travis
2020-12-16 19:27:04 -07:00
Blue Wildrose
9c60de46a1
Prevent AI from doomsdaying while carded
2020-12-16 18:45:41 -07:00