 silicons
|
5ae410790b
|
locking
|
2020-11-22 14:40:57 -07:00 |
|
|
Timothy Teakettle
|
285208ece3
|
Merge branch 'master' into communication-hotkeys
|
2020-11-22 21:30:43 +00:00 |
|
|
silicons
|
37e26833a6
|
wew
|
2020-11-22 14:16:14 -07:00 |
|
|
Timothy Teakettle
|
5de801ac40
|
communication hotkeys
|
2020-11-22 21:08:58 +00: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 |
|
|
Artur
|
84b299912a
|
Merge remote-tracking branch 'origin/master' into tgui_whitescreenfix_port
|
2020-11-22 13:29:26 +02:00 |
|
|
silicons
|
31fa58a9e9
|
fix
|
2020-11-22 02:48:37 -07:00 |
|
|
Putnam
|
c5e410c1bc
|
Makes spontaneous brain trauma require min 5 players.
|
2020-11-22 00:12:54 -08:00 |
|
|
silicons
|
5a127f6cb5
|
sigh
|
2020-11-21 23:32:10 -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
|
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 |
|
|
Timothy Teakettle
|
0c65359f42
|
functionality
|
2020-11-22 00:00:24 +00:00 |
|
|
shellspeed1
|
c8f8972027
|
Removes the ling dna limit
|
2020-11-20 03:03:38 -08:00 |
|
|
shellspeed1
|
f900643922
|
h
|
2020-11-20 02:44:15 -08:00 |
|
|
shellspeed1
|
6cc7f15743
|
Update changeling.dm
|
2020-11-20 01:41:14 -08: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 |
|
|
timothyteakettle
|
60077f028e
|
port
|
2020-11-17 01:41:19 +00:00 |
|
|
tgstation-server
|
03b2f1ac2e
|
Update TGS DMAPI
|
2020-11-17 00:37:11 +00:00 |
|
|
Dan-Neposh
|
05401800f3
|
splits clockwork guardians from marauders
Also fixes that typo in the guardian spell description
|
2020-11-16 16:25:15 -05: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 |
|
|
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 |
|