diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm index de360b6ecb8..5b73e73b902 100644 --- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm +++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm @@ -949,7 +949,7 @@ "MT" = ( /obj/effect/turf_decal/box/white/corners, /obj/structure/closet/crate/secure/weapon, -/obj/item/gun/energy/e_gun/mini, +/obj/item/knife/combat, /turf/open/floor/iron/dark/airless, /area/shuttle/ruin/caravan/freighter2) "Nl" = ( diff --git a/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm b/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm index 43640452bb2..eb3d1ca2ba4 100644 --- a/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm +++ b/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm @@ -238,6 +238,11 @@ }, /turf/open/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered) +"pv" = ( +/obj/effect/turf_decal/bot_red, +/obj/machinery/suit_storage_unit/nuke_med, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/unpowered) "qL" = ( /obj/machinery/door/window/brigdoor/left/directional/west{ req_access = list("syndicate"); @@ -271,11 +276,6 @@ /obj/effect/turf_decal/syndicateemblem/middle/middle, /turf/open/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered) -"ur" = ( -/obj/structure/lattice, -/obj/machinery/status_display/ai/directional/north, -/turf/template_noop, -/area/template_noop) "us" = ( /obj/effect/spawner/random/engineering/tool, /obj/machinery/light/directional/west, @@ -718,12 +718,6 @@ "Yj" = ( /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/unpowered) -"YL" = ( -/obj/structure/rack, -/obj/item/clothing/suit/space/syndicate/black/red, -/obj/item/clothing/head/helmet/space/syndicate/black/red, -/turf/open/floor/mineral/plastitanium/red/airless, -/area/ruin/space/unpowered) "YN" = ( /obj/structure/table, /obj/item/reagent_containers/pill/morphine{ @@ -936,7 +930,7 @@ la Da LP Nv -Da +pv Pq uE vK @@ -1233,8 +1227,8 @@ la Pq zg yL -YL -Pq +KM +KM sL KM DM @@ -1260,8 +1254,8 @@ la Pq Pq Pq -Pq -Pq +KM +la KM la DM @@ -1288,8 +1282,8 @@ la la la la -Pq -ur +la +KM Jd KM KJ @@ -1315,7 +1309,7 @@ la la la la -Pq +la KM KM KM diff --git a/_maps/RandomRuins/SpaceRuins/the_faceoff.dmm b/_maps/RandomRuins/SpaceRuins/the_faceoff.dmm index 8c0513af5b6..6728403529f 100644 --- a/_maps/RandomRuins/SpaceRuins/the_faceoff.dmm +++ b/_maps/RandomRuins/SpaceRuins/the_faceoff.dmm @@ -393,6 +393,20 @@ /obj/item/flashlight/lantern, /turf/open/floor/iron/dark/airless, /area/ruin/space) +"ou" = ( +/obj/structure/closet/syndicate, +/obj/item/clothing/under/syndicate, +/obj/item/pickaxe, +/obj/effect/decal/cleanable/fuel_pool, +/obj/effect/decal/cleanable/fuel_pool, +/obj/item/flashlight/lantern, +/obj/item/clothing/suit/hooded/explorer/syndicate{ + pixel_x = 8; + pixel_y = -2 + }, +/obj/item/clothing/mask/gas/syndicate, +/turf/open/floor/iron/dark/airless, +/area/ruin/space) "pl" = ( /obj/item/ammo_casing/a357/spent{ dir = 8; @@ -619,8 +633,8 @@ /obj/effect/mapping_helpers/broken_floor, /obj/effect/mob_spawn/corpse/human/nanotrasensoldier, /obj/effect/decal/cleanable/blood, -/obj/item/gun/energy/e_gun/mini, /obj/effect/decal/cleanable/blood/gibs/limb, +/obj/item/gun/energy/e_gun/mini, /turf/open/floor/iron/dark/smooth_large/airless, /area/ruin/space) "xT" = ( @@ -762,8 +776,8 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/full, -/obj/item/grenade/c4, /mob/living/simple_animal/hostile/mining_drone, +/obj/item/grenade/c4, /turf/open/misc/asteroid/basalt/airless, /area/ruin/space) "Do" = ( @@ -825,21 +839,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/airless, /area/ruin/space) -"Gf" = ( -/obj/structure/closet/syndicate, -/obj/item/clothing/suit/space/syndicate/black/red{ - pixel_y = -2; - pixel_x = 8 - }, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/head/helmet/space/syndicate/black/red, -/obj/item/pickaxe, -/obj/effect/decal/cleanable/fuel_pool, -/obj/effect/decal/cleanable/fuel_pool, -/obj/item/flashlight/lantern, -/turf/open/floor/iron/dark/airless, -/area/ruin/space) "Gi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/portable_atmospherics/canister/air, @@ -877,16 +876,17 @@ /area/ruin/space) "HI" = ( /obj/structure/closet/syndicate, -/obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/under/syndicate, -/obj/item/clothing/suit/space/syndicate/black/red{ - pixel_y = -4 - }, /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/pickaxe, /obj/effect/decal/cleanable/fuel_pool, /obj/effect/decal/cleanable/fuel_pool, /obj/item/flashlight/lantern, +/obj/item/clothing/suit/hooded/explorer/syndicate{ + pixel_y = -2; + pixel_x = 8 + }, +/obj/item/clothing/mask/gas/syndicate, /turf/open/floor/iron/dark/airless, /area/ruin/space) "IF" = ( @@ -2008,7 +2008,7 @@ Cf Cf Er ED -Gf +ou qO ED FV diff --git a/_maps/RandomRuins/SpaceRuins/waystation.dmm b/_maps/RandomRuins/SpaceRuins/waystation.dmm index d893fe99847..38b24193b04 100644 --- a/_maps/RandomRuins/SpaceRuins/waystation.dmm +++ b/_maps/RandomRuins/SpaceRuins/waystation.dmm @@ -545,7 +545,6 @@ pin = /obj/item/firing_pin/explorer }, /obj/item/ammo_box/magazine/wt550m9, -/obj/item/ammo_box/magazine/wt550m9, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/waystation/securestorage) "jV" = ( diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 1755294e417..926c5ba63d8 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -152,6 +152,10 @@ helmet_type = /obj/item/clothing/head/utility/radiation storage_type = /obj/item/geiger_counter +/obj/machinery/suit_storage_unit/nuke_med + suit_type = /obj/item/clothing/suit/space/syndicate/black/med + helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black/med + /obj/machinery/suit_storage_unit/open state_open = TRUE density = FALSE diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index ec3c10cdcef..4dcbc91c1f5 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -150,10 +150,10 @@ set_armor(/datum/armor/none) user.visible_message(span_notice("[user] adjusts their [src] for ceremonial use."), span_notice("You adjust your [src] for ceremonial use.")) else - slot_flags = initial(slot_flags) + slot_flags = initial(slot_flags) set_armor(initial(armor_type)) user.visible_message(span_notice("[user] adjusts their [src] for defensive use."), span_notice("You adjust your [src] for defensive use.")) - + /datum/armor/cloak_goliath melee = 35 bullet = 10 @@ -337,3 +337,28 @@ user.heal_ordered_damage(heal_amount, damage_heal_order) user.visible_message(span_notice("[user] suddenly revives, as their armor swirls with demonic energy!"), span_notice("You suddenly feel invigorated!")) playsound(user.loc, 'sound/magic/clockwork/ratvar_attack.ogg', 50) + +/obj/item/clothing/suit/hooded/explorer/syndicate + name = "syndicate explorer suit" + desc = "An armoured suit for exploring harsh environments, dyed in the sinister red and black of the Syndicate. This one seems better armored than the ones Nanotrasen gives out." + icon_state = "explorer_syndicate" + icon = 'icons/obj/clothing/suits/utility.dmi' + worn_icon = 'icons/mob/clothing/suits/utility.dmi' + hoodtype = /obj/item/clothing/head/hooded/explorer/syndicate + armor_type = /datum/armor/hooded_explorer_syndicate + +/datum/armor/hooded_explorer_syndicate + melee = 30 + bullet = 15 + laser = 25 + energy = 35 + bomb = 50 + fire = 60 + acid = 60 + +/obj/item/clothing/head/hooded/explorer/syndicate + name = "syndicate explorer hood" + desc = "An armoured hood for exploring harsh environments." + icon_state = "explorer_syndicate" + armor_type = /datum/armor/hooded_explorer_syndicate + diff --git a/icons/mob/clothing/head/utility.dmi b/icons/mob/clothing/head/utility.dmi index 58f9ab613d4..85b0b17b66b 100644 Binary files a/icons/mob/clothing/head/utility.dmi and b/icons/mob/clothing/head/utility.dmi differ diff --git a/icons/mob/clothing/suits/utility.dmi b/icons/mob/clothing/suits/utility.dmi index 539eb8594d8..6300eb8e067 100644 Binary files a/icons/mob/clothing/suits/utility.dmi and b/icons/mob/clothing/suits/utility.dmi differ diff --git a/icons/obj/clothing/head/utility.dmi b/icons/obj/clothing/head/utility.dmi index 26b9cf9b036..2d8f274c94e 100644 Binary files a/icons/obj/clothing/head/utility.dmi and b/icons/obj/clothing/head/utility.dmi differ diff --git a/icons/obj/clothing/suits/utility.dmi b/icons/obj/clothing/suits/utility.dmi index 7c8ce468350..d7bb4e9bfa6 100644 Binary files a/icons/obj/clothing/suits/utility.dmi and b/icons/obj/clothing/suits/utility.dmi differ