Metal Gear Sloth a1aec5a579 Merge remote-tracking branch 'upstream/master' into weapon_anims ...

# Conflicts:
#	Resources/Prototypes/MeleeWeaponAnimations/default.yml

2020-06-24 20:42:16 +10:00

..

Buildings

Added collision mask for vending machines, piano and computers (#1153)

2020-06-19 15:12:10 +02:00

Effects

Update Resources/Prototypes/Entities/Effects/weapon_arc.yml

2020-06-24 20:08:56 +10:00

Fluids

Puddle icon fix. (#1175)

2020-06-21 21:56:15 +02:00

Items

Food trash is optional by default. Fix FoodBase not having a FoodComponent.

2020-06-21 23:02:58 +02:00

Markers

Timed spawners (#1196)

2020-06-23 20:24:25 +02:00

Mobs

Merge pull request #1184 from ShadowCommander/UnarmedAttack

2020-06-23 08:17:32 -07:00

Weapons

Weapon Tweaks (#1186)

2020-06-23 14:04:19 +02:00

chemistry.yml

Making improper nouns lower case. (#1020)

2020-06-04 18:45:07 +02:00

janitor.yml

Making improper nouns lower case. (#1020)

2020-06-04 18:45:07 +02:00

kitchen.yml

Making improper nouns lower case. (#1020)

2020-06-04 18:45:07 +02:00

potted_plants.yml

You can now hide small items in potted plants.

2020-05-27 15:17:29 +02:00

research.yml

Add Anchorable to several objects (#1115)

2020-06-13 03:29:45 +02:00