Merge branch 'master' into overhaul-event-mob-selection

This commit is contained in:
mochi
2020-08-12 01:22:52 +02:00
253 changed files with 944 additions and 6418 deletions
@@ -948,8 +948,8 @@
category = list("Exosuit Equipment")
/datum/design/mech_grenade_launcher
name = "Exosuit Weapon (SGL-6 Grenade Launcher)"
desc = "Allows for the construction of SGL-6 Grenade Launcher."
name = "Exosuit Weapon (SGL-6 Flashbang Launcher)"
desc = "Allows for the construction of SGL-6 Flashbang Launcher."
id = "mech_grenade_launcher"
build_type = MECHFAB
req_tech = list("combat" = 4, "engineering" = 4)