Commit Graph

4800 Commits

Author SHA1 Message Date
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
keronshb
3d7c896100 Scarp Changes and Bundle
This should really fix it now.
2020-12-15 20:10:21 -05:00
silicons
13bb064302 Merge pull request #13758 from timothyteakettle/better-holoforms
replaces custom holoform verb with an action, lets holoform AIs emote
2020-12-13 23:09:34 -07:00
DeltaFire
d3f3862e18 Merge pull request #13696 from silicons/slime_tf
refactors slime shapeshifting, blobform, and limb regrowth to generic mob ability datums for !!no reason at all other than code improvement!!
2020-12-14 05:57:03 +01:00
DeltaFire
1aa032df32 Merge pull request #13752 from Citadel-Station-13/silicons-patch-15
tweaks stamcrit to be removed when under 100 stamina damage, rather than at 140
2020-12-14 05:32:28 +01:00
timothyteakettle
4cb93931d4 let them beep 2020-12-14 01:00:29 +00:00
Timothy Teakettle
016d3d39fc emote over holopad 2020-12-13 22:18:54 +00:00
Timothy Teakettle
76fe9c7f4c swap cooldown and cooldown check lines 2020-12-13 02:34:52 +00:00
Timothy Teakettle
866220aefb better cooldown 2020-12-13 02:33:57 +00:00
timothyteakettle
76b291c0b5 action 2020-12-13 01:16:25 +00:00
timothyteakettle
3a017d1173 it works 2020-12-12 01:49:50 +00:00
Timothy Teakettle
99f50addc7 wip 2020-12-11 20:35:37 +00:00
Lin
c1fee8e5c4 Merge pull request #13739 from timothyteakettle/tongue-and-eyes
custom eyes and tongues now properly carry across cloning
2020-12-11 16:59:05 +00:00
silicons
1153f30b63 Update carbon.dm 2020-12-11 02:26:52 -07:00
DeltaFire
bece5971b8 Merge pull request #13745 from Arturlang/soulstone_references
Adds more sanity to construct soul returning
2020-12-11 00:42:30 +01:00
Artur
ef13b07dd4 Forgot this 2020-12-09 17:56:28 +02:00
Artur
827920dba7 Paranoid ramblings 2020-12-09 17:54:44 +02:00
timothyteakettle
43df7462d5 copy from old species 2020-12-07 23:03:28 +00:00
Lin
3b6553899b Merge pull request #13711 from DeltaFire15/medbot-synthetic-ignore
Medibots now only treat those they can actually treat
2020-12-06 06:36:28 +00:00
Lin
cbcf60ff76 Merge pull request #13733 from DeltaFire15/tail-entwine-fix
Tailcoilies fix
2020-12-06 06:12:57 +00:00
DeltaFire
663fff03c6 Merge pull request #13720 from timothyteakettle/podpeople-green-blood
podpeople have green blood but done correctly
2020-12-06 03:43:19 +01:00
DeltaFire
0c4e9ca1c5 better phrasing 2020-12-05 02:56:03 +01:00
DeltaFire
f0c1890a65 fix 2020-12-05 02:48:33 +01:00
silicons
31cf8842e4 Update death.dm 2020-12-02 23:45:18 -07:00
silicons
d43086572d Update carbon.dm 2020-12-02 23:44:35 -07:00
Timothy Teakettle
d0ebd6c2d8 green blood 2020-11-30 19:22:54 +00:00
DeltaFire
6bdb54117b Merge pull request #13687 from Citadel-Station-13/silicons-patch-6
https://github.com/tgstation/tgstation/pull/54991 - tail intertwining
2020-11-29 18:13:12 +01:00
silicons
0d6986d3a2 Update jellypeople.dm 2020-11-27 02:25:41 -07:00
silicons
e7c02de01e k 2020-11-26 23:16:25 -07:00
DeltaFire
21734b5d63 there we go 2020-11-26 23:04:39 +01:00
DeltaFire
566d74bd77 E 2020-11-26 16:12:08 +01:00
DeltaFire
67303ce7be Update medbot.dm 2020-11-26 00:19:47 +01:00
DeltaFire
b487c7cb57 actually 2020-11-25 23:53:33 +01:00
DeltaFire
f4bef53633 only care about robots if oxydam 2020-11-25 23:41:18 +01:00
silicons
cf3c4d9d89 Update living.dm 2020-11-23 00:28:17 -07:00
silicons
c7396632db Merge pull request #13582 from timothyteakettle/i-hate-mcolor
adds advanced colouring mode: allows you to individually colour mutant parts
2020-11-22 13:33:28 -07:00
silicons
0554ccbba4 fix 2020-11-22 13:32:48 -07:00
silicons
fbdc339653 Update living.dm 2020-11-22 13:31:36 -07:00
silicons
31fa58a9e9 fix 2020-11-22 02:48:37 -07:00
silicons
86b584fab5 typos 2020-11-21 21:08:55 -07:00
silicons
45d84ec7d4 Update living.dm 2020-11-21 21:04:48 -07:00
silicons
27c4dff507 ports 2020-11-21 21:02:54 -07:00
silicons
f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
Putnam3145
84c90db0e7 Merge pull request #13559 from Citadel-Station-13/silicons-patch-21
typing indicator is no longer cleared on mob move
2020-11-18 17:51:18 -08:00
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
silicons
b9b67f62a3 Merge pull request #13673 from Arturlang/sacrifice_tweaks
Makes construct mind saving reference the mind, fixing some issues
2020-11-17 01:10:45 -07:00
silicons
cee17c3f65 Update living.dm 2020-11-16 13:24:38 -07:00
silicons
3f7bcb3d30 Update code/modules/mob/living/living.dm
Co-authored-by: DeltaFire15 <46569814+DeltaFire15@users.noreply.github.com>
2020-11-16 13:17:17 -07:00
silicons
24257de407 Update living.dm 2020-11-16 09:50:05 -07:00
silicons
a7efaeb0e5 Update living.dm 2020-11-16 09:35:03 -07:00