Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …

…Hybrisa
cmss13-devs · May 20, 2024 · e88b6e0 · e88b6e0
2 parents 7113628 + a5601b9
commit e88b6e0
Show file tree

Hide file tree

Showing 22 changed files with 4,894 additions and 4,894 deletions.
diff --git a/code/game/machinery/colony_floodlights.dm b/code/game/machinery/colony_floodlights.dm
@@ -312,7 +312,7 @@
 // Hybrisa Streetlights
 /obj/structure/machinery/colony_floodlight/street
 	name = "Colony Streetlight"
-	icon = 'icons/obj/structures/props/64x64_zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/64x64_hybrisarandomprops.dmi'
 	icon_state = "street_off"
 	layer = ABOVE_XENO_LAYER
 
@@ -329,7 +329,7 @@
 	lum_value = 0
 	name = "traffic light"
 	desc = "A traffic light"
-	icon = 'icons/obj/structures/props/64x64_zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/64x64_hybrisarandomprops.dmi'
 	icon_state = "trafficlight"
 	bound_width = 32
 	bound_height = 32
@@ -349,7 +349,7 @@
 	lum_value = 0
 	name = "traffic light"
 	desc = "A traffic light"
-	icon = 'icons/obj/structures/props/64x64_zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/64x64_hybrisarandomprops.dmi'
 	icon_state = "trafficlight_alt"
 	bound_width = 32
 	bound_height = 32

diff --git a/code/game/machinery/doors/poddoor/poddoor.dm b/code/game/machinery/doors/poddoor/poddoor.dm
@@ -118,7 +118,7 @@
 
 // Hybrisa Shutters
 /obj/structure/machinery/door/poddoor/hybrisa
-	icon = 'icons/obj/structures/doors/zenithshutters.dmi'
+	icon = 'icons/obj/structures/doors/hybrisashutters.dmi'
 	icon_state = "almayer_pdoor1"
 	base_icon_state = "almayer_pdoor"
 	openspeed = 4

diff --git a/code/game/machinery/hybrsia_lights.dm b/code/game/machinery/hybrsia_lights.dm
@@ -205,7 +205,7 @@
 // Hybrisa Electrical Stuff
 /obj/structure/machinery/colony_electrified_fence_switch
 	name = "Colony Electrified Fence Switch"
-	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
 	icon_state = "panelnopower"
 	desc = "This switch controls the electrified fences. It only functions when there is power."
 	density = FALSE
@@ -279,7 +279,7 @@
 // Hybrisa Streetlights
 /obj/structure/machinery/colony_floodlight/street
 	name = "Colony Streetlight"
-	icon = 'icons/obj/structures/props/64x64_zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/64x64_hybrisarandomprops.dmi'
 	icon_state = "street_off"
 	layer = ABOVE_XENO_LAYER
 
@@ -297,7 +297,7 @@
 	lum_value = 0
 	name = "traffic light"
 	desc = "A traffic light"
-	icon = 'icons/obj/structures/props/64x64_zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/64x64_hybrisarandomprops.dmi'
 	icon_state = "trafficlight"
 	bound_width = 32
 	bound_height = 32
@@ -317,7 +317,7 @@
 	lum_value = 0
 	name = "traffic light"
 	desc = "A traffic light"
-	icon = 'icons/obj/structures/props/64x64_zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/64x64_hybrisarandomprops.dmi'
 	icon_state = "trafficlight_alt"
 	bound_width = 32
 	bound_height = 32
@@ -337,7 +337,7 @@
 
 /obj/structure/machinery/engineerconsole_switch
 	name = "Giant Alien Console"
-	icon = 'icons/obj/structures/props/64x64_zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/64x64_hybrisarandomprops.dmi'
 	icon_state = "engineerconsole"
 	desc = "A Giant Alien console of some kind, unlike anything you've ever seen before. Who knows the purpose of this strange technology..."
 	bound_height = 32
@@ -430,7 +430,7 @@ GLOBAL_LIST_INIT(ship_floodlights, list())
 	name = "circular light"
 	icon_state = "engineerlight_off"
 	desc = "A huge circular light"
-	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
 	density = FALSE
 	unslashable = TRUE
 	unacidable = TRUE

diff --git a/code/game/objects/effects/decals/hybrisa_decals.dm b/code/game/objects/effects/decals/hybrisa_decals.dm
@@ -189,5 +189,5 @@
 /obj/effect/hybrisa/decal/egg_base
 	name = "strange goop"
 	desc = null
-	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
 	icon_state = "egg_base"
diff --git a/code/game/objects/items/reagent_containers/food/drinks.dm b/code/game/objects/items/reagent_containers/food/drinks.dm
@@ -387,6 +387,6 @@
 /obj/item/reagent_container/food/drinks/coffee/cuppa_joes
 	name = "Cuppa Joe's coffee"
 	desc = "Have you got the CuppaJoe Smile? Stay perky! Freeze-dried CuppaJoe's Coffee."
-	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
 	icon_state = "coffeecuppajoe"
 	center_of_mass = "x=15;y=10"
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
@@ -208,21 +208,21 @@
 
 // Hybrisa
 /obj/item/trash/hybrisa
-	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
 	icon_state = "coffeecuppajoelid"
 
 // Cuppa Joe's Trash
 /obj/item/trash/hybrisa/cuppa_joes/lid
 	name = "Cuppa Joe's coffee cup lid"
 	desc = "Have you got the CuppaJoe Smile? Stay perky! Freeze-dried CuppaJoe's Coffee."
-	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
 	icon_state = "coffeecuppajoelid"
 	w_class = SIZE_TINY
 	throwforce = 1
 /obj/item/trash/hybrisa/cuppa_joes/empty_cup
 	name = "Empty Cuppa Joe's coffee cup"
 	desc = "Have you got the CuppaJoe Smile? Stay perky! Freeze-dried CuppaJoe's Coffee."
-	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
 	icon_state = "coffeecuppajoenolid"
 	w_class = SIZE_TINY
 	throwforce = 1
@@ -236,28 +236,28 @@
 /obj/item/trash/hybrisa/cuppa_joes_static/lid
 	name = "Cuppa Joe's coffee cup lid"
 	desc = "Have you got the CuppaJoe Smile? Stay perky! Freeze-dried CuppaJoe's Coffee."
-	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
 	icon_state = "coffeecuppajoelid"
 	w_class = SIZE_TINY
 	throwforce = 1
 /obj/item/trash/hybrisa/cuppa_joes_static/empty_cup
 	name = "Empty Cuppa Joe's coffee cup"
 	desc = "Have you got the CuppaJoe Smile? Stay perky! Freeze-dried CuppaJoe's Coffee."
-	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
 	icon_state = "coffeecuppajoenolid"
 	w_class = SIZE_TINY
 	throwforce = 1
 /obj/item/trash/hybrisa/cuppa_joes_static/empty_cup_stack
 	name = "Empty Cuppa Joe's coffee cup stack"
 	desc = "Have you got the CuppaJoe Smile? Stay perky! Freeze-dried CuppaJoe's Coffee."
-	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
 	icon_state = "coffeecuppajoestacknolid"
 	w_class = SIZE_TINY
 	throwforce = 1
 /obj/item/trash/hybrisa/cuppa_joes_static/lid_stack
 	name = "Cuppa Joe's coffee cup lid stack"
 	desc = "Have you got the CuppaJoe Smile? Stay perky! Freeze-dried CuppaJoe's Coffee."
-	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
 	icon_state = "coffeecuppajoelidstack"
 	w_class = SIZE_TINY
 	throwforce = 1
diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm
@@ -242,7 +242,7 @@ GLOBAL_LIST_INIT(all_fences, list())
 // Hybrisa Electric Fence
 /obj/structure/fence/electrified
 	name = "electrified fence "
-	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
 	icon_state = "highvoltagegrille_off"
 	basestate = "highvoltagegrille"
 	var/electrified = FALSE