diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index a4efbde1682..1acf135edc8 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -1620,6 +1620,7 @@ /obj/structure/sign/securearea{ pixel_x = -32 }, +/obj/machinery/suit_storage_unit/gamma, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "fW" = ( @@ -3547,6 +3548,12 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/grass, /area/centcom/control) +"nb" = ( +/obj/machinery/autolathe/upgraded/gamma, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/metal/fifty, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma/space) "nc" = ( /obj/machinery/door/airlock/centcom{ name = "Gamma Armory"; @@ -4076,18 +4083,12 @@ /area/centcom/gamma) "oJ" = ( /obj/structure/closet/secure_closet/guncabinet, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/gun/projectile/automatic/pistol{ - name = "pistol" - }, -/obj/item/gun/projectile/automatic/pistol{ - name = "pistol" - }, -/obj/item/gun/projectile/automatic/pistol{ - name = "pistol" - }, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/gun/projectile/automatic/proto, +/obj/item/gun/projectile/automatic/proto, +/obj/item/gun/projectile/automatic/proto, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "oN" = ( @@ -4258,14 +4259,6 @@ /obj/structure/flora/ausbushes, /turf/simulated/floor/grass, /area/centcom/specops) -"pk" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/gun/rocketlauncher, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) "pl" = ( /obj/structure/window/reinforced{ dir = 1 @@ -4317,9 +4310,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "pu" = ( -/obj/mecha/combat/durand/loaded{ - operation_req_access = list(1) - }, +/obj/mecha/combat/marauder/ares/loaded, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -4527,6 +4518,11 @@ }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"qf" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/gun/medbeam, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma/space) "qh" = ( /obj/structure/holowindow, /turf/simulated/floor/holofloor{ @@ -9964,6 +9960,12 @@ icon_state = "red" }, /area/holodeck/source_knightarena) +"LN" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = -24 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma/space) "LO" = ( /obj/machinery/autolathe/upgraded{ hacked = 1 @@ -25459,8 +25461,8 @@ th fm of oB -pf -pf +LN +nb pf fV of @@ -25717,7 +25719,7 @@ fm of oJ pf -pk +po pf pq of @@ -25974,7 +25976,7 @@ fm of oW pf -po +qf pf pu of diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index c148ca6e68f..946ecfca4bb 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -66,6 +66,21 @@ component_parts += new /obj/item/stack/sheet/glass(null) RefreshParts() +/obj/machinery/autolathe/upgraded/gamma/New() + . = ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/autolathe(null) + component_parts += new /obj/item/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/stack/sheet/glass(null) + RefreshParts() + +/obj/machinery/autolathe/upgraded/gamma/Initialize() + . = ..() + adjust_hacked(TRUE) + /obj/machinery/autolathe/Destroy() SStgui.close_uis(wires) QDEL_NULL(wires) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index f9be30ff841..b732986dd51 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -110,6 +110,15 @@ /obj/machinery/suit_storage_unit/security/hos/secure secure = TRUE +/obj/machinery/suit_storage_unit/gamma + name = "gamma shielded suit storage unit" + suit_type = /obj/item/clothing/suit/space/hardsuit/shielded/gamma + mask_type = /obj/item/clothing/mask/gas/sechailer/swat + req_access = list(ACCESS_SECURITY) + +/obj/machinery/suit_storage_unit/gamma/secure + secure = TRUE + /obj/machinery/suit_storage_unit/atmos name = "atmospherics suit storage unit" suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 4812f9f8282..4e719a32b9b 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -44,6 +44,29 @@ ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src) ME.attach(src) +/obj/mecha/combat/marauder/ares + name = "Ares" + desc = "Heavy-duty, combat exosuit, adapted from rejected early versions of the Marauder to serve as a biohazard containment exosuit. This model, albeit rare, can be found among civilian populations." + icon_state = "ares" + initial_icon = "ares" + operation_req_access = list(ACCESS_SECURITY) + max_integrity = 450 + armor = list(melee = 50, bullet = 40, laser = 20, energy = 20, bomb = 20, bio = 100, rad = 60, fire = 100, acid = 100) + max_temperature = 40000 + wreckage = /obj/structure/mecha_wreckage/ares + max_equip = 4 + +/obj/mecha/combat/marauder/ares/loaded/New() + ..() + var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster(src) + ME.attach(src) + /obj/mecha/combat/marauder/seraph desc = "Heavy-duty, command-type exosuit. This is a custom model, utilized only by high-ranking military personnel." name = "Seraph" diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 130b3689644..9b4a80cb9fd 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -128,6 +128,11 @@ name = "\improper Marauder wreckage" icon_state = "marauder-broken" +/obj/structure/mecha_wreckage/ares + name = "\improper Ares wreckage" + icon_state = "ares-broken" + desc = "The truth is you lost an expensive piece of Nanotrasen-issue equipment. That suit is going to come out of your pay, and you will remain in this corporation until you are five hundred and ten years old, which is the number of years it will take for you to pay for an Ares Biohazard Containment Exosuit you have lost!" + /obj/structure/mecha_wreckage/mauler name = "\improper Mauler wreckage" icon_state = "mauler-broken" diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index f5d7d500029..e4a5b029328 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -711,3 +711,24 @@ item_state = "syndie_helm" item_color = "syndi" armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 15, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100) + + +//////Security Version (Gamma armory only) + +/obj/item/clothing/suit/space/hardsuit/shielded/gamma + name = "shielded security hardsuit" + desc = "A more advanced version of the normal security hardsuit. Comes with built in energy shielding." + icon_state = "hardsuit-sec" + item_state = "sec-hardsuit" + armor = list("melee" = 35, "bullet" = 15, "laser" = 30, "energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/melee/baton,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/restraints/handcuffs) + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/gamma + +/obj/item/clothing/head/helmet/space/hardsuit/shielded/gamma + name = "shielded security hardsuit helmet" + desc = "A more advanced version of the normal security hardsuit helmet. Comes with built in energy shielding." + icon_state = "hardsuit0-sec" + item_state = "sec_helm" + item_color = "sec" + armor = list("melee" = 35, "bullet" = 15, "laser" = 30,"energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75) + diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 338cd24c6fe..7e4c0ac8cdd 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -79,7 +79,7 @@ //Saber SMG// /obj/item/gun/projectile/automatic/proto name = "\improper Nanotrasen Saber SMG" - desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors." + desc = "A rejected prototype three-round burst 9mm submachine gun, designated 'SABR'. Surplus of this model are bouncing around armories of Nanotrasen Space Stations. Has a threaded barrel for suppressors." icon_state = "saber" mag_type = /obj/item/ammo_box/magazine/smgm9mm origin_tech = "combat=4;materials=2" diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi index d5b4ecb0e66..9d5db73c394 100644 Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ