From 7b4cc3c91bbb84b8884cf863e839d54ab1f0f835 Mon Sep 17 00:00:00 2001 From: Zenith <109559450+Zenith00000@users.noreply.github.com> Date: Thu, 23 May 2024 05:18:49 +0100 Subject: [PATCH] more fixes --- code/__DEFINES/layers.dm | 1 + code/game/machinery/hybrisa_lights.dm | 4 +-- code/game/objects/structures/hybrisa_props.dm | 32 +++++++------------ .../mob/living/simple_animal/friendly/rat.dm | 2 +- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index ee958d87f580..6075a574a062 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -136,6 +136,7 @@ //#define FLY_LAYER 5 #define RIPPLE_LAYER 5.1 +#define EXTERIOR_HIGHWALLMOUNT_LAYER 5.01 #define INTERIOR_DOOR_INSIDE_LAYER 5.19 #define INTERIOR_WALL_SOUTH_LAYER 5.2 #define INTERIOR_DOOR_LAYER 5.21 diff --git a/code/game/machinery/hybrisa_lights.dm b/code/game/machinery/hybrisa_lights.dm index fcc49cb7d4ed..ea03b5c18ff5 100644 --- a/code/game/machinery/hybrisa_lights.dm +++ b/code/game/machinery/hybrisa_lights.dm @@ -407,7 +407,7 @@ /obj/structure/machinery/engineerconsole_switch/proc/toggle_lights() for(var/obj/structure/machinery/colony_floodlight/engineer_circular/floodlight in floodlist) spawn(rand(10,60)) - turned_on = FALSE + floodlight.is_lit = !floodlight.is_lit if(!floodlight.damaged) if(floodlight.is_lit) //Shut it down floodlight.set_light(l_range = floodlight.lum_value,l_power = floodlight.light_power , l_color = floodlight.light_color) @@ -423,7 +423,7 @@ if(!ispowered) to_chat(user, "Nothing happens.") return FALSE - return FALSE + playsound(src,'sound/effects/EMPulse.ogg', 30, 1) toggle_lights() turned_on = !turned_on update_icon() diff --git a/code/game/objects/structures/hybrisa_props.dm b/code/game/objects/structures/hybrisa_props.dm index a3dd734eeb2f..42d764b6bebe 100644 --- a/code/game/objects/structures/hybrisa_props.dm +++ b/code/game/objects/structures/hybrisa_props.dm @@ -42,7 +42,6 @@ if(0 to 500) damage_state = 5 icon_state = "[initial(icon_state)]_damage_[damage_state]" - damage_state = 0 /obj/structure/prop/hybrisa/vehicles/proc/explode(dam, mob/M) src.visible_message(SPAN_DANGER("[src] blows apart!"), null, null, 1) @@ -1228,6 +1227,7 @@ /obj/structure/prop/hybrisa/misc/floorprops icon_state = "solidgrate1" + layer = HATCH_LAYER /obj/structure/prop/hybrisa/misc/floorprops/grate name = "solid metal grate" @@ -1524,71 +1524,57 @@ /obj/structure/prop/hybrisa/misc/fake/pipes name = "disposal pipe" - -/obj/structure/prop/hybrisa/misc/fake/pipes/pipe1 layer = TURF_LAYER +/obj/structure/prop/hybrisa/misc/fake/pipes/pipe1 icon_state = "pipe-s" /obj/structure/prop/hybrisa/misc/fake/pipes/pipe2 - layer = TURF_LAYER icon_state = "pipe-c" /obj/structure/prop/hybrisa/misc/fake/pipes/pipe3 - layer = TURF_LAYER icon_state = "pipe-j1" /obj/structure/prop/hybrisa/misc/fake/pipes/pipe4 - layer = TURF_LAYER icon_state = "pipe-y" /obj/structure/prop/hybrisa/misc/fake/pipes/pipe5 - layer = TURF_LAYER icon_state = "pipe-b" /obj/structure/prop/hybrisa/misc/fake/wire name = "power cable" - -/obj/structure/prop/hybrisa/misc/fake/wire/red layer = TURF_LAYER +/obj/structure/prop/hybrisa/misc/fake/wire/red icon_state = "intactred" /obj/structure/prop/hybrisa/misc/fake/wire/yellow - layer = TURF_LAYER icon_state = "intactyellow" /obj/structure/prop/hybrisa/misc/fake/wire/blue - layer = TURF_LAYER icon_state = "intactblue" /obj/structure/prop/hybrisa/misc/fake/heavydutywire name = "heavy duty wire" - -/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy1 layer = TURF_LAYER +/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy1 icon_state = "0-1" /obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy2 - layer = TURF_LAYER icon_state = "1-2" /obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy3 - layer = TURF_LAYER icon_state = "1-4" /obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy4 - layer = TURF_LAYER icon_state = "1-2-4" /obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy5 - layer = TURF_LAYER icon_state = "1-2-4-8" /obj/structure/prop/hybrisa/misc/fake/lattice name = "structural lattice" - + layer = TURF_LAYER /obj/structure/prop/hybrisa/misc/fake/lattice/full icon_state = "latticefull" - layer = TURF_LAYER // Cargo Containers extended @@ -1597,6 +1583,10 @@ desc = "a cargo container." icon = 'icons/obj/structures/props/containersextended.dmi' icon_state = "blackwyleft" + bound_height = 32 + bound_width = 64 + layer = ABOVE_MOB_LAYER + /obj/structure/cargo_container/hybrisa/containersextended/blueleft name = "cargo container" icon_state = "blueleft" @@ -1749,7 +1739,7 @@ density = TRUE health = 200 anchored = TRUE - layer = RIPPLE_LAYER + layer = EXTERIOR_HIGHWALLMOUNT_LAYER /obj/structure/prop/hybrisa/misc/buildinggreeblies/greeble1 icon_state = "buildingventbig2" @@ -2052,7 +2042,7 @@ icon = 'icons/obj/structures/props/hybrisa_lattice.dmi' icon_state = "lattice1" density = FALSE - layer = RIPPLE_LAYER + layer = EXTERIOR_HIGHWALLMOUNT_LAYER health = 6000 /obj/structure/prop/hybrisa/lattice_prop/lattice_1 icon_state = "lattice1" diff --git a/code/modules/mob/living/simple_animal/friendly/rat.dm b/code/modules/mob/living/simple_animal/friendly/rat.dm index 52d0f470208d..42f3978d9c54 100644 --- a/code/modules/mob/living/simple_animal/friendly/rat.dm +++ b/code/modules/mob/living/simple_animal/friendly/rat.dm @@ -20,7 +20,6 @@ response_disarm = "gently pushes aside the" response_harm = "stamps on the" density = FALSE - var/body_color //black, brown, gray and white, leave blank for random layer = ABOVE_LYING_MOB_LAYER min_oxy = 16 //Require atleast 16kPA oxygen minbodytemp = 223 //Below -50 Degrees Celcius @@ -28,6 +27,7 @@ universal_speak = FALSE universal_understand = TRUE holder_type = /obj/item/holder/rat + var/body_color //black, brown, gray and white, leave blank for random /mob/living/simple_animal/rat/Life(delta_time) ..()