Lin
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
kappa-sama
72cb4fb920
honk
2020-07-28 21:56:39 -04:00
Artur
ef39e62e39
Makes bloodsucker death not spam now actually working
2020-07-29 02:11:14 +03:00
Artur
e0d9c7972d
Makes it actually work
2020-07-29 01:50:40 +03:00
silicons
d8378e64be
Merge pull request #12942 from DeltaFire15/outfit-fix
...
Fixes the 'Naked' outfit
2020-07-28 13:26:23 -07:00
silicons
ab67ae3291
Merge pull request #12951 from timothyteakettle/haha-yes-blood
...
bloodsucker blood loss fix
2020-07-28 13:26:07 -07:00
Artur
09f2594c37
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-28 22:58:13 +03:00
DeltaFire
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
silicons
c87c2bd850
smh
2020-07-28 12:31:35 -07:00
silicons
78b6a60e80
oh
2020-07-28 12:25:27 -07:00
silicons
4ab175d812
sigh
2020-07-28 12:10:34 -07:00
silicons
c720e800df
whew!
2020-07-28 12:08:02 -07:00
Adelphon
1f508ef15d
Adds Camo To AutoDrobe (fix)
...
Adds syndicate Camo to Autodrobe WITHOUT the armor bonuses.
2020-07-28 15:04:58 -04:00
silicons
8313485632
fix
2020-07-28 11:31:28 -07:00
silicons
6c83beea02
Merge pull request #12937 from Ghommie/Ghommie-cit834
...
Fixing new bugs and stuff.
2020-07-28 10:46:17 -07:00
silicons
cac1627d26
Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion
...
Ports RP flannel jackets and a winter coat
2020-07-28 10:45:54 -07:00
silicons
a5063a92b9
Merge pull request #12941 from timothyteakettle/alien-embeds-work
...
aliens can remove embeds now
2020-07-28 10:45:31 -07:00
Timothy Teakettle
c8960624d3
sorry artur
2020-07-28 18:37:01 +01:00
Keate Senior
af02490739
still conflicts with clickdelays bluh whatever I'll fix it if its merged
2020-07-28 13:21:27 -04:00
silicons
475d8ed6fb
Merge pull request #12950 from timothyteakettle/species-are-dumb
...
tail wagging fix
2020-07-28 10:15:17 -07:00
Keate Senior
daed810c3a
I didn't get to see if it'd still conflict with the clickdelay testmerge
...
ugghh I shouldn't be coding when my second brain cell falls asleep but hey at least the change is incredibly small
2020-07-28 12:59:34 -04:00
Timothy Teakettle
72972e1659
some species code fixes
2020-07-28 17:56:50 +01:00
Sishen
0d85f0553b
bumps krav down to 25, only give martyr to syndie iaa
2020-07-28 09:30:26 -06:00
Seris02
dcd2c11f4e
yay indicator
2020-07-28 20:43:38 +08:00
Seris02
84e9f406c7
yay it fix time for indicator
2020-07-28 17:41:17 +08:00
Keate Senior
e8d4d5b053
Revert "Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834 """
...
This reverts commit 0e6fe357da
2020-07-28 05:00:13 -04:00
Keate Senior
0e6fe357da
Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834 ""
...
This reverts commit 4b876ef9fb
2020-07-28 04:59:58 -04:00
Keate Senior
4b876ef9fb
Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834 "
...
This reverts commit 7e1cab15ae
2020-07-28 04:07:41 -04:00
Keate Senior
7e1cab15ae
THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834
...
REVERT IF CLICKDELAYS ARE UN-TESTMERGED
2020-07-28 04:07:01 -04:00
Trilbyspaceclone
ccca78a1ca
Update spellcard.dm
2020-07-28 00:34:32 -04:00
Trilbyspaceclone
3a6d72af54
Update spellcard.dm
2020-07-28 00:20:14 -04:00
Trilbyspaceclone
c8fff28395
Update spellcard.dm
2020-07-28 00:12:00 -04:00
silicons
b0f03eac12
ok
2020-07-27 21:06:03 -07:00
silicons
ffcfd21613
fix
2020-07-27 14:24:10 -07:00
silicons
5bf4afcade
sigh
2020-07-27 14:09:37 -07:00
silicons
67b518bf42
experimental
2020-07-27 13:09:54 -07:00
DeltaFire
9f3e7755ae
two line fix
...
tin
2020-07-27 21:30:13 +02:00
Timothy Teakettle
bbda8dbf79
make detective the same, remove blood and paraplegic
2020-07-27 18:48:44 +01:00
Timothy Teakettle
8d9c94c087
aliens can remove embeds now
2020-07-27 17:59:05 +01:00
Lin
87eac49bbf
Merge pull request #12862 from Citadel-Station-13/silicons-patch-44
...
you can now shoot yourself with a gun by using disarm intent will this cause balance issues maybe do i care not really
2020-07-27 11:46:37 -05:00
Lin
2514f4111d
Merge pull request #12900 from Citadel-Station-13/silicons-patch-53
...
drops 1.5 second taser alt fire delay to normal fire rate (0.4 seconds)
2020-07-27 11:43:31 -05:00
Lin
ea861148b9
Merge pull request #12822 from Citadel-Station-13/silicons-patch-37
...
experimental change (testmerge this!): going from a higher slowdown to a lower slowdown will immediately allow you to move at the lower slowdown
2020-07-27 11:33:04 -05:00
Sishen
27aba092e0
aaaaaaaaaa
2020-07-27 08:20:03 -06:00
Ghom
4fad4ad969
Merge pull request #12888 from Citadel-Station-13/silicons-patch-50
...
sorry gamers, no more self healing with a medbeam
2020-07-27 15:27:07 +02:00
Ghommie
f1c242aadc
Fixing new bugs and stuff.
2020-07-27 14:16:01 +02:00
silicons
22efdbffcd
woops
2020-07-26 23:08:41 -07:00
silicons
e90671c846
Merge pull request #12927 from Ludox235/we-cant-have-nice-things
...
ZOMBIES. ACT LIKE ONE.
2020-07-26 23:00:33 -07:00
silicons
32b8528b16
Merge pull request #12921 from TheObserver-sys/LOOKGORDONATAG!
...
Adds tags to applicable clothing, stating the defenses and resistances said clothes have.
2020-07-26 22:59:55 -07:00
silicons
401e8cf967
Merge pull request #12901 from CameronWoof/trumpet-cargo
...
Adds spaceman's trumpet seeds to the exotic seeds crate
2020-07-26 22:56:59 -07:00
silicons
20d9c74f9f
Merge pull request #12876 from timothyteakettle/species-are-dumb
...
tidies up species files
2020-07-26 22:52:00 -07:00
