Commit Graph

17265 Commits

Author SHA1 Message Date
silicons
211019903e Merge pull request #13709 from Hatterhat/thanks-aleks
funny hands no longer survive off of their host
2020-11-25 22:23:46 -07:00
silicons
a20f14b937 Merge pull request #13705 from Putnam3145/buff-rad-collector
Buffs rad collectors
2020-11-25 22:23:17 -07:00
silicons
8fa69c458b Merge pull request #13707 from DeltaFire15/synthetic-alcohol-intolerance
Makes synthetics inherently immune to alcohol
2020-11-25 22:23:05 -07:00
silicons
a78ebb1f08 Merge pull request #13702 from Putnam3145/harness-tweak
Makes gear harness no longer cover chest/groin.
2020-11-25 22:22:43 -07:00
silicons
bba5cef9be Merge pull request #13697 from Putnam3145/brain-trauma-again
Makes spontaneous brain trauma require min 5 players.
2020-11-25 22:22:20 -07:00
silicons
f301ed4f8f Merge pull request #13689 from DeltaFire15/apc-power-fuckery
Fixes APC recharge power use
2020-11-25 22:21:57 -07: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
silicons
2be21324bc Merge pull request #13686 from Arturlang/tgui_whitescreenfix_port
Ports tgui whitescreen fixes
2020-11-25 22:21:27 -07:00
DeltaFire
69127ebec6 e 2020-11-25 18:06:08 +01:00
DeltaFire
24b712c71e better way to do this 2020-11-25 15:42:43 +01:00
Hatterhat
2de9b55703 uuuuuuuuuuuugh 2020-11-25 02:26:23 -06:00
DeltaFire
282a5d6ab2 aaactually lets just make robots immune in general 2020-11-24 20:32:42 +01:00
DeltaFire
a3208d1ac8 synth alcohol immunity 2020-11-24 20:27:34 +01:00
DeltaFire
ac20bb7d8c fixes up a tiiny cell charge oversight 2020-11-24 19:43:14 +01:00
Putnam
a7fc05a1c7 Buffs rad collectors. 2020-11-24 06:43:17 -08:00
Putnam
17aa88fa8d Makes gear harness no longer cover chest/groin. 2020-11-24 01:14:38 -08: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
Artur
84b299912a Merge remote-tracking branch 'origin/master' into tgui_whitescreenfix_port 2020-11-22 13:29:26 +02:00
Putnam
c5e410c1bc Makes spontaneous brain trauma require min 5 players. 2020-11-22 00:12:54 -08:00
silicons
75d807df4e Merge pull request #13694 from TheObserver-sys/PublicMiningRevival
Local Assistant man can now bash rock again!*
2020-11-21 18:25:13 -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
f7034818a4 Merge pull request #13672 from Citadel-Station-13/silicons-patch-4
chief sub
2020-11-18 17:50:50 -08:00
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
DeltaFire
adc2af2dde typo 2020-11-18 22:51:54 +01:00
DeltaFire
e24b26c7e6 fixes APCs using nearly no power 2020-11-18 22:47:28 +01:00
uomo91
be009f2e54 Better labeling to differentiate log types. 2020-11-18 06:08:14 -06:00
DeltaFire15
ab81a7e3ef oops! (#13688) 2020-11-18 11:06:04 +01:00
The0bserver
6d1ace27f7 Initial Commit: Mapping is painful 2020-11-18 00:38:35 -05:00
silicons
3df485ad94 Merge pull request #13680 from DeltaFire15/hallucination-runtime-fix
Fixes a hallucination runtime
2020-11-17 01:13:33 -07:00
silicons
891d4ec76e Merge pull request #13681 from DeltaFire15/supplypod-shrapnel
Fixes a bunch of supplypod related stuff
2020-11-17 01:12:56 -07:00
silicons
1c915c2e6f Merge pull request #13676 from DeltaFire15/borg-slab-fix
Very minor fix to clockie borg slab ui
2020-11-17 01:12:28 -07: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
1942e16a82 Merge pull request #13671 from DeltaFire15/clock-rite-neutering-support
Just some more clock rite code-wise support
2020-11-17 01:10:26 -07:00
silicons
157b2b6e2a Merge pull request #13665 from Citadel-Station-13/tgs-dmapi-update
Automatic TGS DMAPI Update
2020-11-17 01:10:03 -07:00
silicons
a950bcb0fb Merge pull request #13644 from DeltaFire15/hybrid-limbs-wound-stuff
[READY] Hybrid bodyparts - wound surgery edition
2020-11-17 01:09:47 -07:00
tgstation-server
03b2f1ac2e Update TGS DMAPI 2020-11-17 00:37:11 +00:00
Artur
6cdef62abb Ports https://github.com/tgstation/tgstation/pull/54895/ 2020-11-16 15:19:31 +02:00
uomo91
82869f4aef Fix timestamp proc. 2020-11-16 01:48:48 -06:00
uomo91
6b85ab5c01 Individual logging code. 2020-11-16 01:40:48 -06:00
uomo91
9a6759efaa Remove unneeded linecount thing. 2020-11-16 01:39:08 -06:00
DeltaFire
fb128e64b1 Merge remote-tracking branch 'upstream/master' into borg-slab-fix 2020-11-16 04:31:31 +01:00
DeltaFire
fbad172861 Merge remote-tracking branch 'upstream/master' into clock-rite-neutering-support 2020-11-16 04:30:15 +01:00
DeltaFire
8f04d7f0d1 Merge remote-tracking branch 'upstream/master' into system-corruption 2020-11-16 04:29:59 +01:00
DeltaFire
185c8929b0 Merge remote-tracking branch 'upstream/master' into supplypod-shrapnel 2020-11-16 04:29:43 +01:00
DeltaFire
c225c29b45 Merge remote-tracking branch 'upstream/master' into hallucination-runtime-fix 2020-11-16 04:29:27 +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