320c91f4d3
Merge pull request #12742 from KeRSedChaplain/clockcultrework
...
Clockwork Cult rework
2020-08-01 00:17:11 -07:00
9e36d65a05
HAHAHAHA NOTHING TO SEE HERE
...
THIS VARIABLE HAS ALWAYS BEEN THERE WHAT DO YOU MEAN HAHAHAHAHA
2020-08-01 00:00:41 -04:00
7a0dff1f77
fixes the invisible slabs and buffs a couple scripture casting times
2020-07-31 23:03:59 -04:00
bc254eb31a
Merge pull request #12979 from Auris456852/master
...
Adds roboticist cartridge to the PDA vendor
2020-07-31 19:45:15 -07:00
053e18247b
Merge pull request #12966 from ike709/master
...
CentCom Galactic Ban DB
2020-07-31 19:44:40 -07:00
aa605ec007
Changes the death sound for Ratvar to have more oomph behind it
2020-07-31 21:02:12 -04:00
d1edbab264
Update life.dm
2020-07-31 14:39:40 -07:00
b9848dbaee
Merge pull request #12967 from Citadel-Station-13/silicons-patch-50
...
you need two hands free to fire the foam force crossbow! (no, you shouldn't.)
2020-07-31 14:22:11 -05:00
16fb4b3291
Merge pull request #12964 from timothyteakettle/monkeys-bleed-a-lot
...
monkeys stop bleeding nonstop
2020-07-31 14:21:57 -05:00
9020e59aa0
kevinz fix
2020-07-31 04:32:46 +03:00
2e3922d08e
Merge remote-tracking branch 'origin/master' into bloodsucker_life
2020-07-31 02:07:14 +03:00
b22ffd6b6e
Makes it properly work
2020-07-31 02:07:03 +03:00
03cff55017
Adds roboticist cartridge to the PDA vendor.
2020-07-30 23:31:31 +03: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
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
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
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
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
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
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
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
1f508ef15d
Adds Camo To AutoDrobe (fix)
...
Adds syndicate Camo to Autodrobe WITHOUT the armor bonuses.
2020-07-28 15:04:58 -04:00
8313485632
fix
2020-07-28 11:31:28 -07:00
6c83beea02
Merge pull request #12937 from Ghommie/Ghommie-cit834
...
Fixing new bugs and stuff.
2020-07-28 10:46:17 -07:00
cac1627d26
Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion
...
Ports RP flannel jackets and a winter coat
2020-07-28 10:45:54 -07:00
a5063a92b9
Merge pull request #12941 from timothyteakettle/alien-embeds-work
...
aliens can remove embeds now
2020-07-28 10:45:31 -07:00
c8960624d3
sorry artur
2020-07-28 18:37:01 +01:00
af02490739
still conflicts with clickdelays bluh whatever I'll fix it if its merged
2020-07-28 13:21:27 -04:00
silicons