diff --git a/code/__DEFINES/footsteps.dm b/code/__DEFINES/footsteps.dm index 1c6d639ebce..924a4eb7379 100644 --- a/code/__DEFINES/footsteps.dm +++ b/code/__DEFINES/footsteps.dm @@ -7,6 +7,7 @@ #define FOOTSTEP_WATER "water" #define FOOTSTEP_LAVA "lava" #define FOOTSTEP_MEAT "meat" +#define FOOTSTEP_CATWALK "catwalk" //barefoot sounds #define FOOTSTEP_WOOD_BAREFOOT "woodbarefoot" #define FOOTSTEP_WOOD_CLAW "woodclaw" @@ -83,7 +84,13 @@ GLOBAL_LIST_INIT(footstep, list( 'sound/effects/footstep/lava2.ogg', 'sound/effects/footstep/lava3.ogg'), 100, 0), FOOTSTEP_MEAT = list(list( - 'sound/effects/meatslap.ogg'), 100, 0) + 'sound/effects/meatslap.ogg'), 100, 0), + FOOTSTEP_CATWALK = list(list( + 'sound/effects/footstep/catwalk1.ogg', + 'sound/effects/footstep/catwalk2.ogg', + 'sound/effects/footstep/catwalk3.ogg', + 'sound/effects/footstep/catwalk4.ogg', + 'sound/effects/footstep/catwalk5.ogg'), 100, 1), )) //bare footsteps lists GLOBAL_LIST_INIT(barefootstep, list( diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 269a67091b3..0407407b7c7 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -50,6 +50,8 @@ #define GAS_FILTER_LAYER 2.48 #define GAS_PUMP_LAYER 2.49 #define LOW_OBJ_LAYER 2.5 +///catwalk overlay of /turf/open/floor/plating/plating_catwalk +#define CATWALK_LAYER 2.51 #define LOW_SIGIL_LAYER 2.52 #define SIGIL_LAYER 2.54 #define HIGH_PIPE_LAYER 2.55 diff --git a/code/__DEFINES/~skyrat_defines/icon_smoothing.dm b/code/__DEFINES/~skyrat_defines/icon_smoothing.dm deleted file mode 100644 index 21d08b6b5ad..00000000000 --- a/code/__DEFINES/~skyrat_defines/icon_smoothing.dm +++ /dev/null @@ -1,2 +0,0 @@ -#define SMOOTH_GROUP_PLATED_CATWALK S_OBJ(73) ///obj/structure/lattice/catwalk/plated -#define SMOOTH_GROUP_NORMAL_CATWALK S_OBJ(74) ///obj/structure/lattice/catwalk diff --git a/code/__DEFINES/~skyrat_defines/planes_layers.dm b/code/__DEFINES/~skyrat_defines/planes_layers.dm deleted file mode 100644 index c8a1d3845d8..00000000000 --- a/code/__DEFINES/~skyrat_defines/planes_layers.dm +++ /dev/null @@ -1 +0,0 @@ -#define CATWALK_LAYER 2.465 diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 697682c5e03..84b74dd910a 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -6,11 +6,6 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ new/datum/stack_recipe("railing", /obj/structure/railing, 3, time = 18, window_checks = TRUE), \ new/datum/stack_recipe("tank holder", /obj/structure/tank_holder, 2, time = 5, one_per_turf = TRUE, on_floor = FALSE), \ new/datum/stack_recipe("ladder", /obj/structure/ladder/crafted, 15, time = 150, one_per_turf = TRUE, on_floor = FALSE), \ - //SKYRAT EDIT ADDITION BEGIN - new/datum/stack_recipe("catwalk", /obj/item/stack/catwalk/normal, 2, 2, 20), \ - new/datum/stack_recipe("plated catwalk", /obj/item/stack/catwalk/plated, 2, 2, 20), \ - new/datum/stack_recipe("dark plated catwalk", /obj/item/stack/catwalk/plated/dark, 2, 2, 20), \ - //SKYRAT EDIT ADDITION END )) /obj/item/stack/rods diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 0a82a99276f..087927aff95 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -84,8 +84,6 @@ /obj/structure/lattice/catwalk/deconstruction_hints(mob/user) return span_notice("The supporting rods look like they could be cut.") -//SKYRAT EDIT REMOVAL BEGIN - Moved To Modular -/* /obj/structure/lattice/catwalk/Move() var/turf/T = loc for(var/obj/structure/cable/C in T) @@ -97,8 +95,6 @@ for(var/obj/structure/cable/C in T) C.deconstruct() ..() -*/ -//SKYRAT EDIT REMOVAL END /obj/structure/lattice/lava name = "heatproof support lattice" diff --git a/code/game/turfs/open/floor/catwalk_plating.dm b/code/game/turfs/open/floor/catwalk_plating.dm new file mode 100644 index 00000000000..486ffba6400 --- /dev/null +++ b/code/game/turfs/open/floor/catwalk_plating.dm @@ -0,0 +1,42 @@ +/** + * ## catwalk flooring + * + * They show what's underneath their catwalk flooring (pipes and the like) + * you can crowbar it to interact with the underneath stuff without destroying the tile... + * unless you want to! + */ +/turf/open/floor/plating/catwalk_floor + icon = 'icons/turf/floors/catwalk_plating.dmi' + icon_state = "catwalk_below" + name = "catwalk floor" + desc = "Flooring that shows its contents underneath. Engineers love it!" + baseturfs = /turf/open/floor/plating + footstep = FOOTSTEP_CATWALK + barefootstep = FOOTSTEP_CATWALK + clawfootstep = FOOTSTEP_CATWALK + heavyfootstep = FOOTSTEP_CATWALK + var/covered = TRUE + +/turf/open/floor/plating/catwalk_floor/Initialize() + . = ..() + update_icon(UPDATE_OVERLAYS) + +/turf/open/floor/plating/catwalk_floor/update_overlays() + . = ..() + var/static/catwalk_overlay + if(isnull(catwalk_overlay)) + catwalk_overlay = iconstate2appearance(icon, "catwalk_above") + if(covered) + . += catwalk_overlay + +/turf/open/floor/plating/catwalk_floor/screwdriver_act(mob/living/user, obj/item/tool) + . = ..() + covered = !covered + user.balloon_alert(user, "[!covered ? "cover removed" : "cover added"]") + update_icon(UPDATE_OVERLAYS) + +/turf/open/floor/plating/catwalk_floor/pry_tile(obj/item/crowbar, mob/user, silent) + if(covered) + user.balloon_alert(user, "remove cover first!") + return FALSE + . = ..() diff --git a/icons/turf/floors/catwalk_plating.dmi b/icons/turf/floors/catwalk_plating.dmi new file mode 100644 index 00000000000..24954e4a175 Binary files /dev/null and b/icons/turf/floors/catwalk_plating.dmi differ diff --git a/modular_skyrat/modules/mapping/code/game/objects/items/catwalk_items.dm b/modular_skyrat/modules/mapping/code/game/objects/items/catwalk_items.dm deleted file mode 100644 index 10917bfcb1b..00000000000 --- a/modular_skyrat/modules/mapping/code/game/objects/items/catwalk_items.dm +++ /dev/null @@ -1,90 +0,0 @@ -/obj/item/stack/catwalk - name = "broken catwalk" - singular_name = "broken catwalk" - desc = "A broken catwalk. This should not exist." - icon = 'modular_skyrat/modules/mapping/icons/obj/items/catwalk_item.dmi' - icon_state = "catwalk" - w_class = WEIGHT_CLASS_NORMAL - force = 1 - throwforce = 1 - throw_speed = 3 - throw_range = 7 - max_amount = 60 - novariants = TRUE - var/catwalk_type - merge_type = /obj/item/stack/catwalk - -/obj/item/stack/catwalk/normal - name = "catwalk rods" - singular_name = "catwalk rod" - desc = "Rods that could be used to make a construction catwalk." - icon_state = "catwalk_normal" - catwalk_type = /obj/structure/lattice/catwalk - merge_type = /obj/item/stack/catwalk/normal - -/obj/item/stack/catwalk/plated - name = "plated catwalk rods" - singular_name = "plated catwalk rod" - desc = "Rods that could be used to make a plated catwalk." - icon_state = "catwalk_plated" - catwalk_type = /obj/structure/lattice/catwalk/plated - merge_type = /obj/item/stack/catwalk/plated - -/obj/item/stack/catwalk/plated/dark - name = "dark plated catwalk rods" - singular_name = "dark plated catwalk rod" - desc = "Rods that could be used to make a plated catwalk, with style." - icon_state = "catwalk_plated_dark" - catwalk_type = /obj/structure/lattice/catwalk/plated/dark - merge_type = /obj/item/stack/catwalk/plated/dark - -/obj/item/stack/catwalk/swarmer - name = "swarmer catwalk rods" - singular_name = "swarmer catwalk rod" - desc = "Rods that could be used to make a quite peculiar catwalk." - icon_state = "catwalk_swarmer" - catwalk_type = /obj/structure/lattice/catwalk/swarmer_catwalk - merge_type = /obj/item/stack/catwalk/swarmer - -/turf/open - var/can_be_latticed - -/turf/open/attackby(obj/item/C, mob/user, params) - if(istype(C, /obj/item/stack/catwalk)) - if(can_be_latticed) - var/obj/item/stack/catwalk/catitem = C - if(locate(/obj/structure/lattice/catwalk, src)) - return - if(locate(/obj/structure/lattice/catwalk/plated, src)) - return - if(locate(/obj/structure/lattice/catwalk/plated/dark, src)) - return - var/cost = 2 - var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) - if(L) - qdel(L) - cost = 1 - if(catitem.use(cost)) - new catitem.catwalk_type(src) - playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE) - to_chat(user, "You place down the catwalk.") - else - to_chat(user, "You need two rods to build a catwalk!") - return - to_chat(user, "You can't place down a catwalk in this spot!") - return ..() - -/turf/open/space - can_be_latticed = TRUE - -/turf/open/openspace - can_be_latticed = TRUE - -/turf/open/floor/plating - can_be_latticed = TRUE - -/turf/open/transparent/openspace - can_be_latticed = TRUE - -/turf/open/floor/circuit - can_be_latticed = TRUE diff --git a/modular_skyrat/modules/mapping/code/game/objects/structures/lattice.dm b/modular_skyrat/modules/mapping/code/game/objects/structures/lattice.dm deleted file mode 100644 index b161656b001..00000000000 --- a/modular_skyrat/modules/mapping/code/game/objects/structures/lattice.dm +++ /dev/null @@ -1,14 +0,0 @@ -//Moved from code/game/objects/structures/lattice.dm -/obj/structure/lattice/catwalk/Move() - var/turf/T = loc - if(isspaceturf(loc)) - for(var/obj/structure/cable/C in T) - C.deconstruct() - ..() - -/obj/structure/lattice/catwalk/deconstruct() - var/turf/T = loc - if(isspaceturf(loc)) - for(var/obj/structure/cable/C in T) - C.deconstruct() - ..() diff --git a/modular_skyrat/modules/mapping/code/game/turfs/plated_catwalk.dm b/modular_skyrat/modules/mapping/code/game/turfs/plated_catwalk.dm deleted file mode 100644 index cf6b315a1d0..00000000000 --- a/modular_skyrat/modules/mapping/code/game/turfs/plated_catwalk.dm +++ /dev/null @@ -1,33 +0,0 @@ -/obj/structure/disposalpipe - plane = FLOOR_PLANE - -/obj/structure/cable - plane = FLOOR_PLANE - -/obj/machinery/atmospherics/pipe - plane = FLOOR_PLANE - -/obj/structure/lattice/catwalk - smoothing_groups = list(SMOOTH_GROUP_NORMAL_CATWALK, SMOOTH_GROUP_OPEN_FLOOR) - canSmoothWith = list(SMOOTH_GROUP_NORMAL_CATWALK) - layer = CATWALK_LAYER - plane = FLOOR_PLANE - -/obj/structure/lattice/catwalk/Initialize() - . = ..() - if(isspaceturf(loc)) - layer = LATTICE_LAYER - -/obj/structure/lattice/catwalk/plated - name = "plated catwalk" - desc = "A durable catwalk for easier maintenance of pipes and wires. Cats hate this thing." - icon = 'modular_skyrat/modules/mapping/icons/turf/open/catwalk_plated.dmi' - icon_state = "catwalk_plated-0" - base_icon_state = "catwalk_plated" - smoothing_flags = SMOOTH_BITMASK - smoothing_groups = list(SMOOTH_GROUP_PLATED_CATWALK) - canSmoothWith = list(SMOOTH_GROUP_PLATED_CATWALK) - -/obj/structure/lattice/catwalk/plated/dark - name = "plated catwalk" - icon = 'modular_skyrat/modules/mapping/icons/turf/open/dark_catwalk_plated.dmi' diff --git a/modular_skyrat/modules/mapping/icons/obj/items/catwalk_item.dmi b/modular_skyrat/modules/mapping/icons/obj/items/catwalk_item.dmi deleted file mode 100644 index 35f5c93caa2..00000000000 Binary files a/modular_skyrat/modules/mapping/icons/obj/items/catwalk_item.dmi and /dev/null differ diff --git a/modular_skyrat/modules/mapping/icons/turf/open/catwalk_plated.dmi b/modular_skyrat/modules/mapping/icons/turf/open/catwalk_plated.dmi deleted file mode 100644 index cd09ad6e4aa..00000000000 Binary files a/modular_skyrat/modules/mapping/icons/turf/open/catwalk_plated.dmi and /dev/null differ diff --git a/modular_skyrat/modules/mapping/icons/turf/open/dark_catwalk_plated.dmi b/modular_skyrat/modules/mapping/icons/turf/open/dark_catwalk_plated.dmi deleted file mode 100644 index 9736bfa72d5..00000000000 Binary files a/modular_skyrat/modules/mapping/icons/turf/open/dark_catwalk_plated.dmi and /dev/null differ diff --git a/tgstation.dme b/tgstation.dme index 577a91cca4f..1b6c8da9bc3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -172,7 +172,6 @@ #include "code\__DEFINES\~skyrat_defines\factions.dm" #include "code\__DEFINES\~skyrat_defines\game_options.dm" #include "code\__DEFINES\~skyrat_defines\gun.dm" -#include "code\__DEFINES\~skyrat_defines\icon_smoothing.dm" #include "code\__DEFINES\~skyrat_defines\integrated_electronics.dm" #include "code\__DEFINES\~skyrat_defines\inventory.dm" #include "code\__DEFINES\~skyrat_defines\is_helpers.dm" @@ -186,7 +185,6 @@ #include "code\__DEFINES\~skyrat_defines\medical_defines.dm" #include "code\__DEFINES\~skyrat_defines\mining_traits.dm" #include "code\__DEFINES\~skyrat_defines\obj_flags.dm" -#include "code\__DEFINES\~skyrat_defines\planes_layers.dm" #include "code\__DEFINES\~skyrat_defines\preferences.dm" #include "code\__DEFINES\~skyrat_defines\projectiles.dm" #include "code\__DEFINES\~skyrat_defines\robot_defines.dm" @@ -1546,6 +1544,7 @@ #include "code\game\turfs\open\openspace.dm" #include "code\game\turfs\open\river.dm" #include "code\game\turfs\open\water.dm" +#include "code\game\turfs\open\floor\catwalk_plating.dm" #include "code\game\turfs\open\floor\fancy_floor.dm" #include "code\game\turfs\open\floor\hull.dm" #include "code\game\turfs\open\floor\iron_floor.dm" @@ -4251,7 +4250,6 @@ #include "modular_skyrat\modules\mapping\code\game\objects\fluff.dm" #include "modular_skyrat\modules\mapping\code\game\objects\effects\decals\turf_decals.dm" #include "modular_skyrat\modules\mapping\code\game\objects\effects\decals\vgdecals.dm" -#include "modular_skyrat\modules\mapping\code\game\objects\items\catwalk_items.dm" #include "modular_skyrat\modules\mapping\code\game\objects\items\spaceship_items.dm" #include "modular_skyrat\modules\mapping\code\game\objects\items\clothing\gloves\color.dm" #include "modular_skyrat\modules\mapping\code\game\objects\items\clothing\head\jobs.dm" @@ -4260,10 +4258,8 @@ #include "modular_skyrat\modules\mapping\code\game\objects\items\tools\tools.dm" #include "modular_skyrat\modules\mapping\code\game\objects\structures\furniture.dm" #include "modular_skyrat\modules\mapping\code\game\objects\structures\ghost_role_spawners.dm" -#include "modular_skyrat\modules\mapping\code\game\objects\structures\lattice.dm" #include "modular_skyrat\modules\mapping\code\game\objects\structures\plaques\static_plaques.dm" #include "modular_skyrat\modules\mapping\code\game\turfs\planet_turfs.dm" -#include "modular_skyrat\modules\mapping\code\game\turfs\plated_catwalk.dm" #include "modular_skyrat\modules\mapping\code\game\turfs\spaceship_turfs.dm" #include "modular_skyrat\modules\mapping\code\modules\dungeon.dm" #include "modular_skyrat\modules\mapping\code\modules\pool.dm"