Merge pull request #375 from RalseiDreemuurr/QoL-continue

Лайтсвитч в автолате + фикс путей вещей Элизиума
CeladonSS13 · Apr 5, 2024 · 11a0e3f · 11a0e3f
2 parents c6833bc + f254bd0
commit 11a0e3f
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 23 deletions.
diff --git a/html/changelogs/AutoChangeLog-pr-372.yml b/html/changelogs/AutoChangeLog-pr-372.yml
@@ -0,0 +1,5 @@
+author: Yata9arasu
+changes:
+  - {rscadd: Новые головы желелюдей}
+  - {rscdel: Старые головы желелюдей}
+delete-after: true
diff --git a/mod_celadon/QoL/_QoL.dme b/mod_celadon/QoL/_QoL.dme
@@ -3,3 +3,4 @@
 #include "code/binoculars.dm"
 #include "code/update_icons.dm"
 #include "code/hotkeyfix.dm"
+#include "code/lightswitch.dm"
diff --git a/mod_celadon/QoL/code/lightswitch.dm b/mod_celadon/QoL/code/lightswitch.dm
@@ -0,0 +1,7 @@
+/datum/design/lightswitch_frame
+	name = "Lightswitch Frame"
+	id = "lightswitch_frame"
+	build_type = AUTOLATHE
+	materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
+	build_path = /obj/item/wallframe/light_switch
+	category = list("initial", "Misc")
diff --git a/mod_celadon/elysium_stuff/_elysium_stuff.dme b/mod_celadon/elysium_stuff/_elysium_stuff.dme
@@ -2,6 +2,5 @@
 
 #include "code\armor.dm"
 #include "code\skimitar.dm"
-#include "code\ElysimMerch.dm"
+#include "code\elysimmerch.dm"
 #include "code\clothing.dm"
-
diff --git a/mod_celadon/elysium_stuff/code/ElysimMerch.dm b/mod_celadon/elysium_stuff/code/ElysimMerch.dm
@@ -1,18 +1,18 @@
 // Miscelanious
 
-/obj/structure/curtain/cloth/elysim 
-	icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
+/obj/structure/curtain/cloth/elysim
+	icon = 'mod_celadon/elysium_stuff/icons/obj/Elysim_patriots.dmi'
 	icon_type = "elysim_fancy"
 	icon_state = "elysim_fancy-open"
 
 /obj/item/banner/elysim
 	name = "Elysim banner"
 	desc = "The banner of Elysim, Strengthens the faith of those who deserve."
-	icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
+	icon = 'mod_celadon/elysium_stuff/icons/obj/Elysim_patriots.dmi'
 	icon_state = "banner_elysim"
 	item_state = "banner_elysim"
-	lefthand_file = 'mod_celadon/celadon_suits/icons/mob/elysim_banner_left.dmi'
-	righthand_file = 'mod_celadon/celadon_suits/icons/mob/elysim_banner_right.dmi'
+	lefthand_file = 'mod_celadon/elysium_stuff/icons/mob/elysim_banner_left.dmi'
+	righthand_file = 'mod_celadon/elysium_stuff/icons/mob/elysim_banner_right.dmi'
 	warcry = "Glory to the nation!"
 
 /obj/item/storage/book/bible/koran
@@ -30,46 +30,46 @@
 
 /obj/structure/sign/poster/elysim/random
 	name = "random elysim poster"
-	icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
+	icon = 'mod_celadon/elysium_stuff/icons/obj/Elysim_patriots.dmi'
 	icon_state = "random_elysim"
 	never_random = TRUE
 	random_basetype = /obj/structure/sign/poster/elysim
 
 /obj/structure/sign/poster/elysim/logo // \"Breathable, if it weren't so darn cold.\"
 	name = "Elysim"
 	desc = "Poster of Elysim Republic. The most common logo. Nothing noteworthy"
-	icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
+	icon = 'mod_celadon/elysium_stuff/icons/obj/Elysim_patriots.dmi'
 	icon_state = "poster-elysim"
 
 /obj/structure/sign/poster/elysim/protest
 	name = "DownSolFed"
 	desc = "Poster of Elysim Republic. \"This poster with its entire appearance screams No deals with traitors! \""
-	icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
+	icon = 'mod_celadon/elysium_stuff/icons/obj/Elysim_patriots.dmi'
 	icon_state = "poster-nosf"
 
 /obj/structure/sign/poster/elysim/sonofelysim
 	name = "Elysim Son"
 	desc = "Poster of the Elisima Republic depicting a stately man.The inscription reads \"God will direct his punishing hand! For the glory of Elysium!\""
-	icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
+	icon = 'mod_celadon/elysium_stuff/icons/obj/Elysim_patriots.dmi'
 	icon_state = "poster-son_elysim"
 
 /obj/structure/sign/poster/elysim/ak47
 	name = "No SolFed"
 	desc = "Poster of the Elysim Republic depicting iconic weapons from a previous era. \"Even a child is ready to protect his home!\""
-	icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
+	icon = 'mod_celadon/elysium_stuff/icons/obj/Elysim_patriots.dmi'
 	icon_state = "poster-ak47"
 
 /obj/structure/sign/elysim_wall_seal
 	name = "Seal of the Elysim government"
 	desc = "A seal emblazened with a gold trim depicting the burning star, sol."
-	icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
+	icon = 'mod_celadon/elysium_stuff/icons/obj/Elysim_patriots.dmi'
 	icon_state = "elysim-wall"
 	pixel_y = 27
 
 /obj/structure/sign/elysim
 	name = "\improper Elysim logo sign"
 	sign_change_name = "Rebel Logo - Elysim"
 	desc = "A sign with the Elysim logo on it. Glory to Human race!"
-	icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
+	icon = 'mod_celadon/elysium_stuff/icons/obj/Elysim_patriots.dmi'
 	icon_state = "elysim"
 	is_editable = TRUE
diff --git a/mod_celadon/elysium_stuff/code/armor.dm b/mod_celadon/elysium_stuff/code/armor.dm
@@ -3,8 +3,8 @@
 /obj/item/clothing/suit/armor/vest/inteq
 	name = "InteQ armor vest"
 	desc = "A modded InteQ Type II armored vest that provides decent protection against most types of damage."
-	icon = 'mod_celadon/celadon_suits/icons/obj/armor_celadon.dmi'
-	mob_overlay_icon = 'mod_celadon/celadon_suits/icons/mob/armor_celadon.dmi'
+	icon = 'mod_celadon/elysium_stuff/icons/obj/armor_celadon.dmi'
+	mob_overlay_icon = 'mod_celadon/elysium_stuff/icons/mob/armor_celadon.dmi'
 	icon_state = "armor_inteq"
 	item_state = "armor_inteq"
 	armor = list("melee" = 38, "bullet" = 33, "laser" = 33, "energy" = 43, "bomb" = 28, "bio" = 3, "rad" = 3, "fire" = 53, "acid" = 53)
@@ -13,7 +13,7 @@
 /obj/item/clothing/suit/armor/vest/elisium
 	name = "Кустарная броня"
 	desc = "Самодельная защита сваренная из кусков брони, скрепленных кожей. Просто, но надежно."
-	icon = 'mod_celadon/celadon_suits/icons/obj/accessories.dmi'
-	mob_overlay_icon = 'mod_celadon/celadon_suits/icons/mob/accessories.dmi'
+	icon = 'mod_celadon/elysium_stuff/icons/obj/accessories.dmi'
+	mob_overlay_icon = 'mod_celadon/elysium_stuff/icons/mob/accessories.dmi'
 	icon_state = "armor_plate"
 	item_state = "armor_plate"
diff --git a/mod_celadon/elysium_stuff/code/clothing.dm b/mod_celadon/elysium_stuff/code/clothing.dm
@@ -1,8 +1,8 @@
 /obj/item/bedsheet/elysim
 	name = "\improper Elysim bedsheet"
 	desc = "It has the Elysim logo on it ."
-	icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
-	mob_overlay_icon = 'mod_celadon/celadon_suits/icons/mob/bedsheet_elysium.dmi'
+	icon = 'mod_celadon/elysium_stuff/icons/obj/Elysim_patriots.dmi'
+	mob_overlay_icon = 'mod_celadon/elysium_stuff/icons/mob/bedsheet_elysium.dmi'
 	icon_state = "sheetelysim"
 	item_state = "sheetelysimback"
 	dream_messages = list("duty", "fatherland")
diff --git a/mod_celadon/elysium_stuff/code/skimitar.dm b/mod_celadon/elysium_stuff/code/skimitar.dm
@@ -3,9 +3,9 @@
 	desc = "Древнее традиционное Старбульское холодное оружие, которое пользовалось очень большой популярностью среди населения Старбула в 2430 годах по солу."
 	icon_state = "skimitar"
 	item_state = "skimitar"
-	icon = 'mod_celadon/celadon_suits/icons/obj/skimitar.dmi'
-	lefthand_file = 'mod_celadon/celadon_suits/icons/mob/swords_lefthand.dmi'
-	righthand_file = 'mod_celadon/celadon_suits/icons/mob/swords_righthand.dmi'
+	icon = 'mod_celadon/elysium_stuff/icons/obj/skimitar.dmi'
+	lefthand_file = 'mod_celadon/elysium_stuff/icons/mob/swords_lefthand.dmi'
+	righthand_file = 'mod_celadon/elysium_stuff/icons/mob/swords_righthand.dmi'
 	pickup_sound =  'sound/items/unsheath.ogg'
 	drop_sound = 'sound/items/handling/metal_drop.ogg'
 	force = 35