Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage ...

# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm

2019-09-28 00:16:11 -04:00

..

ammunition

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

guns

Merge remote-tracking branch 'upstream/master' into universal-damage

2019-09-28 00:16:11 -04:00

projectile

Makes Xenobiology Simpler. Removes Slimes (#12398)

2019-09-24 16:17:33 -07:00

ammunition.dm

Refactors reloading and adds new gun sounds to ballistics

2018-12-02 03:20:05 -05:00

firing.dm

Major Lavaland Update

2019-08-10 22:36:55 -04:00

gun_attachments.dm

Moved silencers, gave them their own folder

2018-11-19 09:52:25 +01:00

gun.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

projectile.dm

though-this-world-may-be-broken

2019-09-15 05:53:43 -04:00