cc8c75539e
sigh
2021-02-23 12:50:33 +01:00
841bb2aac2
Merge pull request #14265 from SandPoot/tool_behavior-replacing
...
Tool behavior replacing
2021-02-21 14:48:50 -07:00
d2f9237ecd
Merge pull request #14237 from Citadel-Station-13/silicons-patch-11
...
adds sanity checks to heretic blade shatters
2021-02-18 23:51:23 -06:00
14c9fe655c
Update eldritch_items.dm
2021-02-18 17:00:28 -07:00
123de14009
upload files
2021-02-18 15:05:39 -03:00
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
2e29f30fdf
Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing
2021-02-18 15:04:22 -03:00
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
b0c4fa5755
Merge pull request #14259 from timothyteakettle/log-pierced-reality-examine
...
staring into pierced realities is now logged
2021-02-18 00:01:32 -06:00
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
e50073e636
Update eldritch_effects.dm
2021-02-16 20:54:37 +00:00
4e18044450
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 + recompile tgui
2021-02-14 20:10:41 -03:00
0aea43afcc
Merge pull request #14224 from DeltaFire15/no-more-YELLING
...
Makes clockies yell less
2021-02-13 19:06:57 -07:00
acf06abed5
Update eldritch_items.dm
2021-02-12 22:50:09 -07:00
b465225bc2
Update eldritch_items.dm
2021-02-12 18:53:38 -07:00
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
eacf1ef40b
dynamic still has permakill obj but i aint touching dynamic code
2021-02-12 19:20:22 +01:00
806d96076e
i dont actually know how to code btw
2021-02-12 18:41:58 +01:00
70303319f4
hrnngh CTRL+S doesnt save everything
2021-02-12 18:26:52 +01:00
503c276f9f
uh second try
2021-02-12 18:25:03 +01:00
b0ff405a13
cool
2021-02-12 03:06:53 +01:00
fb4641b348
e
2021-02-12 02:42:59 +01:00
a0c92f0646
upload files
2021-02-11 13:22:37 -03:00
7fbb41eee0
screaming
2021-02-11 04:12:42 +01:00
4b51174717
Update disease_disease.dm
2021-02-05 16:43:18 +00:00
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
6a2ae34ebe
Merge pull request #14111 from Arturlang/revenant_TK
...
[READY]Gives the revenant TK
2021-01-25 23:17:09 -07:00
0c6e67ac81
Merge pull request #14127 from Hatterhat/tg-56348
...
tgstation#56348 - contractor TC buff
2021-01-25 23:04:01 -07:00
7b35c80a4d
Merge pull request #14117 from timothyteakettle/blob-emote
...
lets blobs use the 'me' verb
2021-01-25 22:59:24 -07:00
6094293b4b
Merge pull request #14105 from DeltaFire15/heretic-target-fix
...
Heretic sacrifice target logging + a fix
2021-01-25 22:58:54 -07:00
b569d59271
Did the suggestion
2021-01-25 22:07:04 +02:00
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
09d91643ef
tg 56348
2021-01-22 18:39:46 -06:00
920be8cffc
stuffs
2021-01-22 01:43:35 +01:00
ca9292f6fd
Update overmind.dm
2021-01-21 22:45:46 +00:00
897f8a744f
Update overmind.dm
2021-01-21 22:39:38 +00:00
87c9201707
No gunning sadly
2021-01-20 19:51:11 +02:00
66979e2364
Merge branch 'master' into revenant_TK
2021-01-20 18:27:11 +02:00
16e0b85b44
More funshit
2021-01-20 18:23:28 +02:00
7136f5cffb
boop
2021-01-20 06:09:20 +01:00
4578f30001
brrt
2021-01-20 05:54:38 +01:00
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
dedb0cb62e
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-19 04:24:42 -07:00
a468f400e3
see branch name
2021-01-14 20:55:06 -06:00
8f7b483161
remove reverb
2021-01-13 21:37:30 -07:00
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
ea07ad6e48
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-13 15:41:28 -07:00
04c5d34cb6
Merge pull request #14015 from DeltaFire15/synth-stuffs
...
Tweaks some Synth damage stuff
2021-01-13 18:40:03 +00:00
d5e99e9cef
TESTING
2021-01-13 05:56:10 +02:00
c751f114aa
finally
2021-01-12 01:42:55 -05:00
DeltaFire