Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)

This commit is contained in:
SandPoot
2022-04-09 00:03:13 -03:00
428 changed files with 8031 additions and 7608 deletions
@@ -58,13 +58,13 @@
name = "Dark Gygax Exosuit"
desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent \
for hit-and-run style attacks. Features an incendiary carbine, flash bang launcher, teleporter, ion thrusters and a Tesla energy array."
item = /obj/mecha/combat/gygax/dark/loaded
item = /obj/vehicle/sealed/mecha/combat/gygax/dark/loaded
cost = 80
/datum/uplink_item/support/honker
name = "Dark H.O.N.K."
desc = "A clown combat mech equipped with bombanana peel and tearstache grenade launchers, as well as the ubiquitous HoNkER BlAsT 5000."
item = /obj/mecha/combat/honker/dark/loaded
item = /obj/vehicle/sealed/mecha/combat/honker/dark/loaded
cost = 80
purchasable_from = UPLINK_CLOWN_OPS
@@ -72,5 +72,5 @@
name = "Mauler Exosuit"
desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring \
and deployable smoke. Comes equipped with an LMG, scattershot carbine, missile rack, an antiprojectile armor booster and a Tesla energy array."
item = /obj/mecha/combat/marauder/mauler/loaded
item = /obj/vehicle/sealed/mecha/combat/marauder/mauler/loaded
cost = 140