перенес ровер в другое место

ss220club · Nov 10, 2023 · e56b551 · e56b551
1 parent 1c1812d
commit e56b551
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 41 deletions.
diff --git a/modular_ss220/maps220/code/objects.dm b/modular_ss220/maps220/code/objects.dm
@@ -180,8 +180,7 @@
 	icon_opened = "tac_open"
 	open_door_sprite = "syndicate_door"
 
-/obj/structure/mecha_wreckage/durand/rover
-	icon_state = "darkdurand-broken"
+
 
 /obj/structure/closet/secure_closet/syndicate/medbay/populate_contents()
 	new /obj/item/storage/backpack/duffel/syndie/med/surgery
@@ -200,45 +199,6 @@
 	new /obj/item/clothing/shoes/sandal/white(src)
 	new /obj/item/storage/backpack/duffel/syndie(src)
 
-// Mecha
-/obj/mecha/combat/durand/rover
-	desc = "Combat exosuit, developed by syndicate from the Durand Mk. II by scraping unnecessary things, and adding some of their tech. Much more protected from any Nanotrasen hazards."
-	name = "Rover"
-	icon = 'modular_ss220/maps220/icons/mecha.dmi'
-	icon_state = "darkdurand"
-	initial_icon = "darkdurand"
-	armor = list(melee = 30, bullet = 40, laser = 50, energy = 50, bomb = 20, rad = 50, fire = 100, acid = 100)
-	operation_req_access = list(ACCESS_SYNDICATE)
-	wreckage = /obj/structure/mecha_wreckage/durand/rover
-	max_equip = 4
-	internal_damage_threshold = 35
-	starting_voice = /obj/item/mecha_modkit/voice/syndicate
-	destruction_sleep_duration = 1
-
-/obj/mecha/combat/durand/rover/GrantActions(mob/living/user, human_occupant = 0)
-	..()
-	thrusters_action.Grant(user, src)
-	defense_action.Grant(user, src)
-
-/obj/mecha/combat/durand/rover/RemoveActions(mob/living/user, human_occupant = 0)
-	..()
-	thrusters_action.Remove(user)
-	defense_action.Remove(user)
-
-/obj/mecha/combat/durand/rover/loaded/Initialize(mapload)
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/syndi
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/repair_droid
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
-	ME.attach(src)
-
-/obj/mecha/combat/durand/rover/loaded/add_cell()
-	cell = new /obj/item/stock_parts/cell/bluespace(src)
-
 // Mecha equipment
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/syndi
 	name = "\improper AC 2 \"Special\""

diff --git a/modular_ss220/maps220/icons/mecha.dmi b/modular_ss220/maps220/icons/mecha.dmi
diff --git a/modular_ss220/mecha_skins/code/mecha_preloaded.dm b/modular_ss220/mecha_skins/code/mecha_preloaded.dm
@@ -45,3 +45,43 @@
 
 /obj/mecha/combat/gygax/nt/add_cell()
 	cell = new /obj/item/stock_parts/cell/high/slime(src)
+
+//DURAND
+
+/obj/mecha/combat/durand/rover
+	desc = "Combat exosuit, developed by syndicate from the Durand Mk. II by scraping unnecessary things, and adding some of their tech. Much more protected from any Nanotrasen hazards."
+	name = "Rover"
+	icon = 'modular_ss220/mecha_skins/code/mecha.dmi'
+	icon_state = "darkdurand"
+	initial_icon = "darkdurand"
+	armor = list(melee = 30, bullet = 40, laser = 50, energy = 50, bomb = 20, rad = 50, fire = 100, acid = 100)
+	operation_req_access = list(ACCESS_SYNDICATE)
+	wreckage = /obj/structure/mecha_wreckage/durand/rover
+	max_equip = 4
+	internal_damage_threshold = 35
+	starting_voice = /obj/item/mecha_modkit/voice/syndicate
+	destruction_sleep_duration = 1
+
+/obj/mecha/combat/durand/rover/GrantActions(mob/living/user, human_occupant = 0)
+	..()
+	thrusters_action.Grant(user, src)
+	defense_action.Grant(user, src)
+
+/obj/mecha/combat/durand/rover/RemoveActions(mob/living/user, human_occupant = 0)
+	..()
+	thrusters_action.Remove(user)
+	defense_action.Remove(user)
+
+/obj/mecha/combat/durand/rover/loaded/Initialize(mapload)
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/syndi
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/repair_droid
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
+	ME.attach(src)
+
+/obj/mecha/combat/durand/rover/loaded/add_cell()
+	cell = new /obj/item/stock_parts/cell/bluespace(src)
diff --git a/modular_ss220/mecha_skins/code/paintkit_install.dm b/modular_ss220/mecha_skins/code/paintkit_install.dm
@@ -161,6 +161,11 @@
 	icon = 'modular_ss220/mecha_skins/code/mecha.dmi'
 	icon_state = "shire-broken"
 
+/obj/structure/mecha_wreckage/durand/rover
+	name = "\improper обломки Ровера. И как такой гигант пал?"
+	icon = 'modular_ss220/mecha_skins/code/mecha.dmi'
+	icon_state = "darkdurand-broken"
+
 //USELESS SHIT
 
 /obj/structure/mecha_wreckage/phazon/imperion