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
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
silicons
821c3becc3
Merge pull request #13704 from Putnam3145/make-emotes-local
...
Makes emotes show up in the "local" filter with TGUI
2020-12-09 21:47:06 -07: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
silicons
c891a456e8
Update typing_indicator.dm
2020-12-02 23:43:00 -07:00
Putnam
809e270290
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into make-emotes-local
2020-12-02 08:16:22 -08: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
0f9734b1f7
Merge pull request #13698 from timothyteakettle/communication-hotkeys
...
ports rebindable communication hotkeys from tg
2020-11-28 09:12:40 -07:00
silicons
5e965d099f
COME ON
2020-11-26 23:37:27 -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
silicons
fa516b1097
Merge pull request #13685 from uomo91/adminlogging
...
Ports: Admins can now see chronological order of events in logging tabs.
2020-11-25 22:21:34 -07: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
Putnam
b000ea6a25
Attempts to make emotes part of the local filter.
2020-11-24 06:02:34 -08: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
fbdc339653
Update living.dm
2020-11-22 13:31:36 -07:00
silicons
45d84ec7d4
Update living.dm
2020-11-21 21:04:48 -07:00
uomo91
cfaa988217
Merge master and fix newline conflict.
2020-11-19 17:12:19 -06: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
uomo91
be009f2e54
Better labeling to differentiate log types.
2020-11-18 06:08:14 -06: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
uomo91
82869f4aef
Fix timestamp proc.
2020-11-16 01:48:48 -06:00
uomo91
9a6759efaa
Remove unneeded linecount thing.
2020-11-16 01:39:08 -06:00
DeltaFire
8f04d7f0d1
Merge remote-tracking branch 'upstream/master' into system-corruption
2020-11-16 04:29:59 +01:00
silicons
9d7226cb4d
Merge pull request #13670 from shellspeed1/master
...
Makes floor bots buildable with all toolboxes.
2020-11-15 17:12:37 -07:00
DeltaFire
922129abd2
proc override stuff
2020-11-15 21:12:01 +01:00
DeltaFire
410ffffcc3
there we go
...
robot rad safe: 250, 750 with upgrade (500 for normal mobs)
Also some typo fixes
2020-11-15 20:30:50 +01:00
DeltaFire
e6c61c46c8
tweaks corruption gain from rads
...
Since they got immunity to the other special bad stuff, no need to also give them superlow rad damage, given they already have a tripled minimum until which they're safe
2020-11-13 17:47:17 +01:00
DeltaFire
06295ca433
no species effects from radiation for robots
2020-11-13 17:45:04 +01:00
DeltaFire
82bf995dba
EMP tweaks
...
EMPs do less libm damage on synthetics (half, so, max of 15 instead of 30), and the corruption amount is reduced to a max of 11.5, logarythmical so it's already 4 at a EMP power of 5 / 8 at 25, though the limb burn amount stays linear.
2020-11-13 17:21:03 +01:00
DeltaFire
021d3bbada
tweakings
2020-11-13 16:46:35 +01:00
