b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
894ea242b4
asset cache update. may fuck shit up
2020-07-30 14:28:01 +08:00
782e3c2ffb
copypaste phase complete, major:vendies
2020-07-30 14:17:35 +08:00
10fefca674
another batch. MAJOR: chem_master, pandemic
2020-07-30 14:06:20 +08:00
0805265412
yet another batch. MAJOR: APC
2020-07-30 12:54:53 +08:00
6356084fe9
this
2020-07-29 23:36:27 -04:00
ba0c77a8bd
fix
2020-07-29 20:13:39 -07:00
b8522a2ae0
ok
2020-07-29 20:04:47 -07:00
f02bc4a572
Update toy.dm
2020-07-29 19:49:11 -07:00
16722c47c3
CentCom Galactic Ban DB
2020-07-29 21:39:58 -05:00
caaedce6e2
end our suffering
2020-07-30 02:33:39 +01:00
55be55ce0f
Revert "end our suffering"
...
This reverts commit 4e1fcc4e08
2020-07-30 02:29:13 +01:00
4e1fcc4e08
end our suffering
2020-07-30 02:28:53 +01:00
940fe8240d
monkey blood fix
2020-07-30 01:57:09 +01:00
0772d6687f
ghost chilis fixed
2020-07-30 08:01:25 +08:00
c60e595d99
Merge pull request #12955 from Arturlang/bloodsucker_life
...
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-29 14:02:22 -07:00
41a711ff01
Merge pull request #12959 from Citadel-Station-13/AAAAAAA
...
FIXES LINTER ON MASTER
2020-07-29 15:59:20 -05:00
f901aa9d42
travis work
2020-07-29 21:48:47 +01:00
a7fe7f1317
Merge pull request #12953 from Adelphon/pog
...
Adds Camo To AutoDrobe (fix)
2020-07-29 15:48:45 -05:00
90d3cff53f
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 11:53:59 -07:00
ad3092d883
Merge branch 'master' into AAAAAAA
2020-07-29 11:13:33 -07:00
9a9993c7be
yep
2020-07-29 19:00:06 +01:00
d5ac2dcd74
debug remove
2020-07-29 18:26:35 +01:00
b5a16d8945
MORE CLOTHES
2020-07-29 18:20:46 +01:00
31963b32a4
subcategories cool
2020-07-29 17:14:07 +01:00
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
a9e84df7f4
fix
2020-07-29 01:17:39 -07:00
bc823b544f
sigh
2020-07-29 01:17:16 -07:00
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
9ff94e019b
Merge pull request #12924 from SiliconMain/analyzer
...
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
5d4bb48628
another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator
2020-07-29 15:10:01 +08:00
78312c23bf
sigh
2020-07-28 21:53:07 -07:00
1416fd08dc
updates clockwork armor /what is magic defense even for i don't get it/
2020-07-29 00:15:11 -04:00
5284fbbec0
various fixes to make the PR not conflict with clickdelays probably
2020-07-28 23:52:13 -04:00
bbffd41d55
Merge pull request #12883 from Citadel-Station-13/silicons-patch-49
...
beam rifles are now practical in emitters
2020-07-28 22:05:39 -05:00
c15d0de20d
subcategories work
2020-07-29 03:57:16 +01:00
a5dd08a054
Merge pull request #12734 from silicons/shoelaces
...
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
ae02a7348c
Merge pull request #12929 from Citadel-Station-13/silicons-patch-59
...
silicons (and all other nonhuman mobs) can now block (with the right items)
2020-07-28 21:48:14 -05:00
e8ab87c396
Merge pull request #12928 from Citadel-Station-13/silicons-patch-58
...
silicons (and any other nonhuman mob) can now parry
2020-07-28 21:48:03 -05:00
91dc8b96d0
Merge pull request #12932 from silicons/ok_2
...
perfect parries with an energy sword now reflect projectiles back at their shooter
2020-07-28 21:45:53 -05:00
18fa47e479
Merge pull request #12931 from Citadel-Station-13/silicons-patch-61
...
nerfs parrying bullets with a wooden stick following complaints
2020-07-28 21:45:36 -05:00
ef39e62e39
Makes bloodsucker death not spam now actually working
2020-07-29 02:11:14 +03:00
e0d9c7972d
Makes it actually work
2020-07-29 01:50:40 +03:00
d8378e64be
Merge pull request #12942 from DeltaFire15/outfit-fix
...
Fixes the 'Naked' outfit
2020-07-28 13:26:23 -07:00
ab67ae3291
Merge pull request #12951 from timothyteakettle/haha-yes-blood
...
bloodsucker blood loss fix
2020-07-28 13:26:07 -07:00
09f2594c37
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-28 22:58:13 +03:00
aa0670e34c
Updates the clockie delay structure
...
Prolonging prisms exist again. They can be built application-tier and take one minute to delay the shuttle by two minutes (So, basically, you end up with one minute more on the timer before it started). It costs 2000 power for the initial use, and 1000 additional power per time it was already used. Oh, and it creates a reeeaaally obvious effect pointing anyone towards the structure. So, good luck defending it.
Also fixes up some scripture sorting but that's minor.
2020-07-28 21:37:05 +02:00
c87c2bd850
smh
2020-07-28 12:31:35 -07:00
78b6a60e80
oh
2020-07-28 12:25:27 -07:00
Letter N