Commit Graph

39402 Commits

Author SHA1 Message Date
shellspeed1
3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
CitadelStationBot
c1cecb651d Automatic changelog generation for PR #13679 [ci skip] 2020-11-18 23:54:54 -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
CitadelStationBot
0c0521105f Automatic changelog generation for PR #13662 [ci skip] 2020-11-18 19:51:05 -06:00
Putnam3145
cd3b3e52ea Merge pull request #13662 from Citadel-Station-13/silicons-patch-3
re-allows angel species on magic mirrors
2020-11-18 17:51:02 -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
CitadelStationBot
b4d833ab1e Automatic changelog generation for PR #13688 [ci skip] 2020-11-18 04:06:07 -06:00
DeltaFire15
ab81a7e3ef oops! (#13688) 2020-11-18 11:06:04 +01:00
CitadelStationBot
7a3a2db2d4 Automatic changelog generation for PR #13680 [ci skip] 2020-11-17 02:13:37 -06:00
silicons
3df485ad94 Merge pull request #13680 from DeltaFire15/hallucination-runtime-fix
Fixes a hallucination runtime
2020-11-17 01:13:33 -07:00
CitadelStationBot
da58667dac Automatic changelog generation for PR #13681 [ci skip] 2020-11-17 02:13:00 -06: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
CitadelStationBot
b35840031c Automatic changelog generation for PR #13676 [ci skip] 2020-11-17 02:12:31 -06: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
CitadelStationBot
d6866c5bc2 Automatic changelog generation for PR #13675 [ci skip] 2020-11-17 02:11:04 -06:00
silicons
6a7ab4de67 Merge pull request #13675 from DeltaFire15/sleeper-ui-fix
Fixes sleeper UI Interactiveness
2020-11-17 01:11:01 -07:00
CitadelStationBot
41575d2264 Automatic changelog generation for PR #13674 [ci skip] 2020-11-17 02:10:57 -06:00
silicons
f11b636727 Merge pull request #13674 from DeltaFire15/vtec-fixing
The borg VTEC ability no longer persists after the upgrade is removed
2020-11-17 01:10:53 -07:00
CitadelStationBot
874687ea2d Automatic changelog generation for PR #13673 [ci skip] 2020-11-17 02:10:48 -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
CitadelStationBot
ecc99f6daa Automatic changelog generation for PR #13671 [ci skip] 2020-11-17 02:10:30 -06: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
CitadelStationBot
e2fe97e86a Automatic changelog generation for PR #13644 [ci skip] 2020-11-17 02:09:51 -06: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
DeltaFire
fb128e64b1 Merge remote-tracking branch 'upstream/master' into borg-slab-fix 2020-11-16 04:31:31 +01:00
DeltaFire
c8719e18d8 Merge remote-tracking branch 'upstream/master' into sleeper-ui-fix 2020-11-16 04:31:02 +01:00
DeltaFire
44a49a7261 Merge remote-tracking branch 'upstream/master' into vtec-fixing 2020-11-16 04:30:45 +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
CitadelStationBot
bf69245a58 Automatic changelog generation for PR #13670 [ci skip] 2020-11-15 18:12:40 -06: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
CitadelStationBot
d2f978d9f3 Automatic changelog generation for PR #13678 [ci skip] 2020-11-15 18:11:55 -06:00
silicons
2a076da3b5 Merge pull request #13678 from Arturlang/Should_not_sleep_not
Comments out spacemandmm should not sleeps
2020-11-15 17:11:52 -07:00
CitadelStationBot
e22e02e5ff Automatic changelog generation for PR #13683 [ci skip] 2020-11-15 18:11:23 -06:00
silicons
15bb6c96ec Merge pull request #13683 from SandPoot/master
Attempts to turn gift static blacklist into a global list
2020-11-15 17:11:21 -07:00
SandPoot
00adf078b0 this is needed 2020-11-15 19:13:01 -03:00
SandPoot
cbb44674ac fix + renaming global list? 2020-11-15 19:10:50 -03:00
CitadelStationBot
8d51f402d8 Automatic changelog generation for PR #13682 [ci skip] 2020-11-15 16:09:25 -06:00
silicons
fde0bd8c66 Merge pull request #13682 from EmeraldSundisk/cogarea
Trying to figure out what's up with CogStation...
2020-11-15 15:09:22 -07:00
DeltaFire
922129abd2 proc override stuff 2020-11-15 21:12:01 +01:00
DeltaFire
e191cd3b5b sleeper ui compartibility
ugly but less work & less ugly than completely rewriting it.
If anyone else wants to, be my guest.
2020-11-15 20:47:22 +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
EmeraldSundisk
330da48518 Add files via upload 2020-11-14 15:38:33 -08:00
SandPoot
936bda44db upload gift.dm 2020-11-14 20:38:23 -03:00