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
df8421d7d3
Automatic changelog generation for PR #12896 [ci skip]
2020-07-26 19:21:31 -05:00
b5e21e5555
Merge pull request #12896 from timothyteakettle/jar-fixes
...
makes some small tweaks to pet carriers / bluespace jars
2020-07-26 17:21:28 -07:00
de7992d499
Automatic changelog compile [ci skip]
2020-07-27 00:10:46 +00:00
316d3e8e7e
Automatic changelog generation for PR #12895 [ci skip]
2020-07-26 17:52:39 -05: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
905e177e76
Automatic changelog generation for PR #12863 [ci skip]
2020-07-26 17:51:04 -05: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
aabb60b5c5
shit damn boys its another fucking day
2020-07-26 17:42:24 -05:00
db995ca9b6
Automatic changelog generation for PR #12893 [ci skip]
2020-07-26 17:27:27 -05:00
6514fced3c
Merge pull request #12893 from timothyteakettle/picklefix
...
pickles don't die until their contents is released
2020-07-26 17:27:23 -05:00
c36bf1b5ed
Merge pull request #12871 from Citadel-Station-13/silicons-patch-47
...
ports some tg changes to make clients properly garbage collect
2020-07-26 17:26:38 -05:00
6b12563abe
Merge pull request #12881 from Citadel-Station-13/silicons-patch-48
...
since it's a little hard to fix the actual issue let's just make the projectile safety check that's causing stuff to freeze when something goes wrong more lenient so things don't freeze and people don't think anything is wrong
2020-07-26 17:26:19 -05:00
04b6d854f8
Merge pull request #12914 from Citadel-Station-13/silicons-patch-56
...
forensic scanners no longer pick up color in blood dna
2020-07-26 17:24:33 -05:00
4b56dc65af
Merge pull request #12897 from Citadel-Station-13/silicons-patch-51
...
fixes clothes repairs
2020-07-26 17:24:21 -05:00
ea737d63dd
Merge pull request #12904 from Citadel-Station-13/silicons-patch-54
...
proper fix for every borg being able to have mops, but doesn't remove the upgrade entirely
2020-07-26 17:22:47 -05:00
b3722d0a43
Merge pull request #12913 from Citadel-Station-13/silicons-patch-55
...
atmos microoptimizations
2020-07-26 17:22:03 -05:00
6bf53859d2
wow maybe i should make it compile first
2020-07-26 14:42:45 -05:00
af08e8a37f
altclick for fucked up parries! also bugfixes
2020-07-26 13:02:56 -05:00
05ee056f25
Automatic changelog compile [ci skip]
2020-07-26 00:10:51 +00:00
ee02d70afd
Automatic changelog generation for PR #12872 [ci skip]
2020-07-25 17:40:18 -05:00
91081ef24c
Merge pull request #12872 from Iatots/hairball
...
Adds depth to the lick wounds mechanic.
2020-07-25 15:40:15 -07:00
ad5f47ea8f
Update scanner.dm
2020-07-25 15:29:44 -07:00
bf273cffdd
burnt bokken backsprite, wound tweak
2020-07-25 16:18:26 -05:00
75213ceef2
Update LINDA_turf_tile.dm
2020-07-25 13:58:38 -07:00
fa5fd08be3
parry tweaks
2020-07-25 15:37:21 -05:00
76016c75f9
yes
2020-07-25 21:27:32 +01:00
49f0a765a0
Automatic changelog generation for PR #12877 [ci skip]
2020-07-25 14:08:11 -05:00
774bceb266
Merge pull request #12877 from dapnee/meta-dab
...
What if Meta Arrivals Weren't An Eye Sore?
2020-07-25 12:08:08 -07:00
8a360db492
Automatic changelog generation for PR #12909 [ci skip]
2020-07-25 13:31:13 -05:00
892053e3d9
Merge pull request #12909 from DeltaFire15/death-machine-broke
...
[FUCK] Fixes organ decay
2020-07-25 13:31:10 -05:00
b9ce2e497d
bare wound bonus, wound malus
2020-07-25 13:10:35 -05:00
f28c98590a
lowered parry windows! attack verbs!
2020-07-25 13:03:15 -05:00
db823ac16c
fixes the organ bitfields
2020-07-25 19:13:08 +02:00
eb6cb1151c
i forgot the actual defining feature
2020-07-25 06:59:31 -05:00
d8a91d9ffa
Update robot_upgrades.dm
2020-07-25 02:35:53 -07:00
04feb3c4a5
borg
2020-07-25 03:22:48 -06:00
47d63296d0
slight buff? may be overreaching
2020-07-25 00:09:53 -05:00
89dd937a9c
placeholder marker beacon
2020-07-24 21:35:55 -05:00
4d83060ba1
Update clothing.dm
2020-07-24 19:29:29 -07:00
47998153cd
tweaks
2020-07-25 03:25:28 +01:00
14fba6a056
funny parry sticks
2020-07-24 21:19:01 -05:00
e273d327bd
yeah
2020-07-25 01:11:04 +01:00
571beb24b0
Automatic changelog compile [ci skip]
2020-07-25 00:11:03 +00:00
a31e160227
this return stone keeps the null tigers away
2020-07-24 16:06:35 +02:00
b6437a4ada
Update code/game/objects/items/plushes.dm
...
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
2020-07-24 15:23:11 +02:00
83c6dc65ba
Update code/modules/reagents/chemistry/reagents/other_reagents.dm
...
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
2020-07-24 15:22:56 +02:00
2eade6c149
Update code/modules/reagents/chemistry/reagents/other_reagents.dm
...
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
2020-07-24 15:22:38 +02:00
a9c51fc624
Update other_reagents.dm
2020-07-24 08:40:48 +02:00
ec2bd9b876
Update plushes.dm
2020-07-24 08:40:25 +02:00
BlackMajor