4ab175d812
sigh
2020-07-28 12:10:34 -07:00
c720e800df
whew!
2020-07-28 12:08:02 -07: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
475d8ed6fb
Merge pull request #12950 from timothyteakettle/species-are-dumb
...
tail wagging fix
2020-07-28 10:15:17 -07:00
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
72972e1659
some species code fixes
2020-07-28 17:56:50 +01:00
0d85f0553b
bumps krav down to 25, only give martyr to syndie iaa
2020-07-28 09:30:26 -06:00
dcd2c11f4e
yay indicator
2020-07-28 20:43:38 +08:00
84e9f406c7
yay it fix time for indicator
2020-07-28 17:41:17 +08:00
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
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
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
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
b0f03eac12
ok
2020-07-27 21:06:03 -07:00
ffcfd21613
fix
2020-07-27 14:24:10 -07:00
5bf4afcade
sigh
2020-07-27 14:09:37 -07:00
67b518bf42
experimental
2020-07-27 13:09:54 -07:00
9f3e7755ae
two line fix
...
tin
2020-07-27 21:30:13 +02:00
bbda8dbf79
make detective the same, remove blood and paraplegic
2020-07-27 18:48:44 +01:00
8d9c94c087
aliens can remove embeds now
2020-07-27 17:59:05 +01:00
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
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
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
27aba092e0
aaaaaaaaaa
2020-07-27 08:20:03 -06:00
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
f1c242aadc
Fixing new bugs and stuff.
2020-07-27 14:16:01 +02:00
22efdbffcd
woops
2020-07-26 23:08:41 -07:00
e90671c846
Merge pull request #12927 from Ludox235/we-cant-have-nice-things
...
ZOMBIES. ACT LIKE ONE.
2020-07-26 23:00:33 -07:00
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
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
20d9c74f9f
Merge pull request #12876 from timothyteakettle/species-are-dumb
...
tidies up species files
2020-07-26 22:52:00 -07:00
67c002de7a
Merge pull request #12817 from kappa-sama/patch-34
...
boosts stimpak cost back up to 5 from 3
2020-07-26 22:51:24 -07:00
6329b2a760
a
2020-07-26 23:32:36 -04:00
dd6fefa43e
Merge pull request #12917 from Citadel-Station-13/silicons-patch-57
...
FIXES. STUNBATONS. FOR. THE LAST. TIME - WINGET IS A SLEEP() AND NO ONE REALIZED THAT MAKING BATONS MAKE PEOPLE -GLORF WOULD MAKE THEM BREAK UNDER LAG
2020-07-27 13:20:38 +12:00
5e3cb62790
Merge pull request #12903 from Sishen1542/zoom-zoom-go-boom-boom
...
removes zoomba/roomba borg sprites
2020-07-27 13:00:17 +12:00
308c52df00
ok
2020-07-26 17:14:38 -07:00
0b17c761e7
whew
2020-07-26 17:11:23 -07:00
349874e512
haha
2020-07-26 16:49:47 -07:00
3ee5611b1d
Update living_active_block.dm
2020-07-26 16:19:43 -07:00
cebd21696f
Update living_active_parry.dm
2020-07-26 16:18:12 -07:00
bf4b2dfbf5
ok
2020-07-26 15:59:56 -07:00
53482e6bd6
modifies the ark, aswell as changing a tiny bit of stuff for stable gateways
...
The ark no longer immediately activates when summoned. Instead, an cultist needs to activate it. Once on, it cannot be turned off again save by destroying it.
Also, the stable-gateway deactivation doafter now has an actual beam-animation.
2020-07-27 00:52:35 +02:00
e13b6d36da
Merge pull request #12895 from Hatterhat/bokken
...
Training Bokkens - "funny wood sticks for parrying and beating the shit out of people"
2020-07-26 15:52:35 -07:00
8aa20d10b8
Merge pull request #12863 from Citadel-Station-13/clownops
...
clown mobss are now allied to each other and clownops are now allied to clown mobs
2020-07-26 17:51:00 -05:00
silicons