diff --git a/code/game/machinery/frame.dm b/code/game/machinery/frame.dm index 653b201750..09cbeb2e00 100644 --- a/code/game/machinery/frame.dm +++ b/code/game/machinery/frame.dm @@ -26,7 +26,7 @@ var/frame_size = 5 // Sheets of metal required to build. var/frame_class // Determines construction method. "machine", "computer", "alarm", or "display" var/circuit // Type path of the circuit board that comes built in with this frame. Null to require adding a circuit. - var/frame_style = FRAME_STYLE_WALL // "floor" or "wall" + var/frame_style = FRAME_STYLE_FLOOR // "floor" or "wall" var/x_offset // For wall frames: pixel_x var/y_offset // For wall frames: pixel_y diff --git a/icons/atmos/vent_pump.dmi b/icons/atmos/vent_pump.dmi index 8846103633..0cff6a8ffa 100644 Binary files a/icons/atmos/vent_pump.dmi and b/icons/atmos/vent_pump.dmi differ diff --git a/icons/atmos/vent_scrubber.dmi b/icons/atmos/vent_scrubber.dmi index 5a40660157..6b365d36c0 100644 Binary files a/icons/atmos/vent_scrubber.dmi and b/icons/atmos/vent_scrubber.dmi differ diff --git a/icons/obj/pipe-item.dmi b/icons/obj/pipe-item.dmi index 175147c74a..d49236c9dd 100644 Binary files a/icons/obj/pipe-item.dmi and b/icons/obj/pipe-item.dmi differ diff --git a/maps/southern_cross/job/outfits.dm b/maps/southern_cross/job/outfits.dm index 0d88ea3bb3..bca078490a 100644 --- a/maps/southern_cross/job/outfits.dm +++ b/maps/southern_cross/job/outfits.dm @@ -17,13 +17,13 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go id_type = /obj/item/weapon/card/id/civilian/explorer id_pda_assignment = "Explorer" -/decl/hierarchy/outfit/job/explorer/technician +/decl/hierarchy/outfit/job/explorer2/technician name = OUTFIT_JOB_NAME("Explorer Technician") belt = /obj/item/weapon/storage/belt/utility/full pda_slot = slot_l_store id_pda_assignment = "Explorer Technician" -/decl/hierarchy/outfit/job/explorer/medic +/decl/hierarchy/outfit/job/explorer2/medic name = OUTFIT_JOB_NAME("Explorer Medic") l_hand = /obj/item/weapon/storage/firstaid/regular pda_slot = slot_l_store diff --git a/maps/southern_cross/southern_cross_jobs.dm b/maps/southern_cross/southern_cross_jobs.dm index c476f6f544..ad73abb120 100644 --- a/maps/southern_cross/southern_cross_jobs.dm +++ b/maps/southern_cross/southern_cross_jobs.dm @@ -100,8 +100,8 @@ var/const/access_explorer = 43 minimal_access = list(access_pilot, access_explorer) outfit_type = /decl/hierarchy/outfit/job/explorer2 alt_titles = list( - "Explorer Technician" = /decl/hierarchy/outfit/job/explorer/technician, - "Explorer Medic" = /decl/hierarchy/outfit/job/explorer/medic) + "Explorer Technician" = /decl/hierarchy/outfit/job/explorer2/technician, + "Explorer Medic" = /decl/hierarchy/outfit/job/explorer2/medic) /datum/job/sar title = "Search and Rescue"