From 55ce571f6ac432fc67ec22fe543b1eb5e890eef8 Mon Sep 17 00:00:00 2001 From: Zenith <109559450+Zenith00000@users.noreply.github.com> Date: Mon, 20 May 2024 04:45:38 +0100 Subject: [PATCH] more organization --- code/game/objects/structures/hybrisa_props.dm | 104 +++----- .../structures/props/hybrisarandomprops.dmi | Bin 214006 -> 214004 bytes .../LV759_Hybrisa_Prospera.dmm | 232 +++++++++--------- 3 files changed, 146 insertions(+), 190 deletions(-) diff --git a/code/game/objects/structures/hybrisa_props.dm b/code/game/objects/structures/hybrisa_props.dm index 6bac07351f29..138f4fe6cbbe 100644 --- a/code/game/objects/structures/hybrisa_props.dm +++ b/code/game/objects/structures/hybrisa_props.dm @@ -991,6 +991,7 @@ density = TRUE /obj/structure/prop/hybrisa/xenobiology/big + icon = 'icons/obj/structures/props/hybrisaxenocryogenics2.dmi' name = "specimen containment cell" desc = "A giant tube with a hulking monstrosity inside, is this thing alive?" icon_state = "bigqueencryo1" @@ -1606,54 +1607,9 @@ icon_state = "latticefull" layer = 2 -// Barriers - -/obj/structure/prop/hybrisa/misc/road - name = "road barrier" - desc = "A plastic barrier for blocking entry." - breakable = TRUE - debris = list(/obj/item/stack/sheet/mineral/plastic) - -/obj/structure/prop/hybrisa/misc/road/roadbarrierred - icon_state = "roadbarrier" - -/obj/structure/prop/hybrisa/misc/road/roadbarrierredlong - icon_state = "roadbarrier4" - -/obj/structure/prop/hybrisa/misc/road/roadbarrierblue - icon_state = "roadbarrier2" - -/obj/structure/prop/hybrisa/misc/road/roadbarrierbluelong - icon_state = "roadbarrier5" - -/obj/structure/prop/hybrisa/misc/road/roadbarrierwyblack - icon_state = "roadbarrier3" - -/obj/structure/prop/hybrisa/misc/road/roadbarrierwyblacklong - icon_state = "roadbarrier6" - -/obj/structure/prop/hybrisa/misc/road/roadbarrierwyblackjoined - icon_state = "roadbarrierjoined3" - -/obj/structure/prop/hybrisa/misc/road/roadbarrierjoined - icon_state = "roadbarrierjoined" - -/obj/structure/prop/hybrisa/misc/road/wood - name = "road barrier" - desc = "A wooden barrier for blocking entry." - icon_state = "roadbarrierwood" - breakable = TRUE - debris = list(/obj/item/stack/sheet/wood) - -/obj/structure/prop/hybrisa/misc/road/wood/roadbarrierwoodorange - icon_state = "roadbarrierwood" - -/obj/structure/prop/hybrisa/misc/road/wood/roadbarrierwoodblue - icon_state = "roadbarrierpolice" - // Cargo Containers extended -/obj/structure/prop/hybrisa/containersextended +/obj/structure/cargo_container/hybrisa/containersextended name = "cargo container" desc = "a cargo container." icon = 'icons/obj/structures/props/containersextended.dmi' @@ -1668,115 +1624,115 @@ unacidable = TRUE layer = 5 -/obj/structure/prop/hybrisa/containersextended/blueleft +/obj/structure/cargo_container/hybrisa/containersextended/blueleft name = "cargo container" icon_state = "blueleft" -/obj/structure/prop/hybrisa/containersextended/blueright +/obj/structure/cargo_container/hybrisa/containersextended/blueright name = "cargo container" icon_state = "blueright" -/obj/structure/prop/hybrisa/containersextended/greenleft +/obj/structure/cargo_container/hybrisa/containersextended/greenleft name = "cargo container" icon_state = "greenleft" -/obj/structure/prop/hybrisa/containersextended/greenright +/obj/structure/cargo_container/hybrisa/containersextended/greenright name = "cargo container" icon_state = "greenright" -/obj/structure/prop/hybrisa/containersextended/tanleft +/obj/structure/cargo_container/hybrisa/containersextended/tanleft name = "cargo container" icon_state = "tanleft" -/obj/structure/prop/hybrisa/containersextended/tanright +/obj/structure/cargo_container/hybrisa/containersextended/tanright name = "cargo container" icon_state = "tanright" -/obj/structure/prop/hybrisa/containersextended/redleft +/obj/structure/cargo_container/hybrisa/containersextended/redleft name = "cargo container" icon_state = "redleft" -/obj/structure/prop/hybrisa/containersextended/redright +/obj/structure/cargo_container/hybrisa/containersextended/redright name = "cargo container" icon_state = "redright" -/obj/structure/prop/hybrisa/containersextended/greywyleft +/obj/structure/cargo_container/hybrisa/containersextended/greywyleft name = "Weyland-Yutani cargo container" icon_state = "greywyleft" -/obj/structure/prop/hybrisa/containersextended/greywyright +/obj/structure/cargo_container/hybrisa/containersextended/greywyright name = "Weyland-Yutani cargo container" icon_state = "greywyright" -/obj/structure/prop/hybrisa/containersextended/lightgreywyleft +/obj/structure/cargo_container/hybrisa/containersextended/lightgreywyleft name = "Weyland-Yutani cargo container" icon_state = "lightgreywyleft" -/obj/structure/prop/hybrisa/containersextended/lightgreywyright +/obj/structure/cargo_container/hybrisa/containersextended/lightgreywyright name = "Weyland-Yutani cargo container" icon_state = "lightgreywyright" -/obj/structure/prop/hybrisa/containersextended/blackwyleft +/obj/structure/cargo_container/hybrisa/containersextended/blackwyleft name = "Weyland-Yutani cargo container" icon_state = "blackwyleft" -/obj/structure/prop/hybrisa/containersextended/blackwyright +/obj/structure/cargo_container/hybrisa/containersextended/blackwyright name = "Weyland-Yutani cargo container" icon_state = "blackwyright" -/obj/structure/prop/hybrisa/containersextended/whitewyleft +/obj/structure/cargo_container/hybrisa/containersextended/whitewyleft name = "Weyland-Yutani cargo container" icon_state = "whitewyleft" -/obj/structure/prop/hybrisa/containersextended/whitewyright +/obj/structure/cargo_container/hybrisa/containersextended/whitewyright name = "Weyland-Yutani cargo container" icon_state = "whitewyright" -/obj/structure/prop/hybrisa/containersextended/tanwywingsleft +/obj/structure/cargo_container/hybrisa/containersextended/tanwywingsleft name = "cargo container" icon_state = "tanwywingsleft" -/obj/structure/prop/hybrisa/containersextended/tanwywingsright +/obj/structure/cargo_container/hybrisa/containersextended/tanwywingsright name = "cargo container" icon_state = "tanwywingsright" -/obj/structure/prop/hybrisa/containersextended/greenwywingsleft +/obj/structure/cargo_container/hybrisa/containersextended/greenwywingsleft name = "cargo container" icon_state = "greenwywingsleft" -/obj/structure/prop/hybrisa/containersextended/greenwywingsright +/obj/structure/cargo_container/hybrisa/containersextended/greenwywingsright name = "cargo container" icon_state = "greenwywingsright" -/obj/structure/prop/hybrisa/containersextended/bluewywingsleft +/obj/structure/cargo_container/hybrisa/containersextended/bluewywingsleft name = "cargo container" icon_state = "bluewywingsleft" -/obj/structure/prop/hybrisa/containersextended/bluewywingsright +/obj/structure/cargo_container/hybrisa/containersextended/bluewywingsright name = "cargo container" icon_state = "bluewywingsright" -/obj/structure/prop/hybrisa/containersextended/redwywingsleft +/obj/structure/cargo_container/hybrisa/containersextended/redwywingsleft name = "cargo container" icon_state = "redwywingsleft" -/obj/structure/prop/hybrisa/containersextended/redwywingsright +/obj/structure/cargo_container/hybrisa/containersextended/redwywingsright name = "cargo container" icon_state = "redwywingsright" -/obj/structure/prop/hybrisa/containersextended/medicalleft +/obj/structure/cargo_container/hybrisa/containersextended/medicalleft name = "medical cargo containers" icon_state = "medicalleft" -/obj/structure/prop/hybrisa/containersextended/medicalright +/obj/structure/cargo_container/hybrisa/containersextended/medicalright name = "medical cargo containers" icon_state = "medicalright" -/obj/structure/prop/hybrisa/containersextended/emptymedicalleft +/obj/structure/cargo_container/hybrisa/containersextended/emptymedicalleft name = "medical cargo container" icon_state = "emptymedicalleft" -/obj/structure/prop/hybrisa/containersextended/emptymedicalright +/obj/structure/cargo_container/hybrisa/containersextended/emptymedicalright name = "medical cargo container" icon_state = "emptymedicalright" diff --git a/icons/obj/structures/props/hybrisarandomprops.dmi b/icons/obj/structures/props/hybrisarandomprops.dmi index 16b50893161d8a49dcb7cb4123ffd205aa033d13..b04d7d81d859d9cd1b1176db4112b9e0e6c90dca 100644 GIT binary patch delta 1488 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