Commit Graph

1425 Commits

Author SHA1 Message Date
Artur
9020e59aa0 kevinz fix 2020-07-31 04:32:46 +03:00
Artur
2e3922d08e Merge remote-tracking branch 'origin/master' into bloodsucker_life 2020-07-31 02:07:14 +03:00
Artur
b22ffd6b6e Makes it properly work 2020-07-31 02:07:03 +03:00
silicons
c60e595d99 Merge pull request #12955 from Arturlang/bloodsucker_life
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-29 14:02:22 -07:00
Artur
09f2594c37 Plugs bloodsucker LifeTick into BiologicalLife 2020-07-28 22:58:13 +03:00
silicons
7d7f40ce90 fixes 2020-07-26 14:56:03 -07:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
53b3c6099b ok 2020-07-23 16:27:41 -07:00
Lin
8a25582c1c Merge pull request #12850 from silicons/drag
fixes dragging stuff into space, enforces no sleeping on Life() and sets Move() to forced async
2020-07-23 17:13:48 -05:00
Lin
69c3d4f24a Merge pull request #12864 from Citadel-Station-13/silicons-patch-45
regarding changelings
2020-07-23 13:18:55 -05:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
Timothy Teakettle
f5ac0b5762 some fixes 2020-07-23 18:10:46 +01:00
silicons
e0e2cd561a Update revive.dm 2020-07-22 11:38:26 -07:00
silicons
0acf7b82d5 Update revive.dm 2020-07-22 02:20:10 -07:00
silicons
919edfa2fd Update revive.dm 2020-07-22 02:11:20 -07:00
silicons
30e7483e89 Update absorb.dm 2020-07-22 02:10:24 -07:00
silicons
9fc669b4ea Update changeling.dm 2020-07-22 02:09:49 -07:00
silicons
4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00
silicons
1450b11b01 sigh 2020-07-20 21:37:44 -07:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
silicons
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
silicons
4d4133a8da Merge pull request #12819 from Arturlang/bloodsucker_typo
Fixes a bloodsucker lair typo
2020-07-20 16:53:42 -07:00
Lin
67a6330e77 Merge pull request #12786 from silicons/survivalists
makes survivalists pseudoantags again and limits summon guns/magic to one use
2020-07-20 18:20:08 -05:00
silicons
692656b02d Whew 2020-07-20 11:53:33 -07:00
silicons
526d257410 fix 2020-07-20 11:48:08 -07:00
silicons
416b989e12 changes 2020-07-20 11:35:10 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons
55f8e37544 sigh 2020-07-18 20:26:11 -07:00
silicons
1a040dd2a6 changes 2020-07-18 18:44:17 -07:00
silicons
7c5d4f863d click cd breakout 2020-07-18 18:10:21 -07:00
Artur
de5e87d522 Fixes a typo 2020-07-19 02:37:11 +03:00
Timothy Teakettle
1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle
e8fade4f7f changes 2020-07-18 02:29:12 +01:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
DeltaFire
9e05d9f748 fixes swarmers not being able to eat any items 2020-07-16 23:26:46 +02:00
Letter N
abd0ac089d https://github.com/tgstation/tgstation/pull/51687 2020-07-16 20:36:08 +08:00
silicons
f653fd5c3c kay 2020-07-15 14:58:51 -07:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
silicons
feddd14176 Merge pull request #12714 from DeltaFire15/sents-compromise-aug
Fixes / Buffs sentinels compromise to heal augmented bodyparts aswell.
2020-07-11 00:48:37 -07:00
silicons
aae496492f Update revenant.dm 2020-07-09 02:22:30 -07:00
DeltaFire
7aa160029f changes sent's healing a bit
No more killing augmented followers, it heals them aswell. Ratvar is a machine god afterall.
2020-07-08 23:45:35 +02:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Ghom
c5b94a4d00 Update code/modules/antagonists/revenant/revenant.dm 2020-07-04 18:30:01 +02:00
silicons
ca6fc8d813 Update revenant.dm 2020-07-04 06:48:00 -07:00