From 3dee7c96b6b5e08b2234b482014ca3de3419764d Mon Sep 17 00:00:00 2001 From: coiax Date: Sun, 26 Feb 2017 23:28:31 +0000 Subject: [PATCH] Drone shell changes (#24379) * Drone shell changes Fixes #24376. - Drone shells are now points of interest. - Derelict drone shells are now just dusty drone shells. * For GUN_HOG * Adds ushanka to derelict drones * Less compiling errors --- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 6 +++--- code/game/objects/structures/ghost_role_spawners.dm | 11 ----------- .../simple_animal/friendly/drone/drones_as_items.dm | 5 +++++ .../simple_animal/friendly/drone/extra_drone_types.dm | 9 +++++++++ 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 137dd2b0be9..1eec962d6a3 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -280,7 +280,7 @@ "ft" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/open/floor/plating/airless,/area/derelict/singularity_engine) "fu" = (/obj/item/stack/cable_coil/cut,/turf/open/floor/plasteel/airless{icon_state = "damaged5"},/area/derelict/singularity_engine) "fv" = (/obj/effect/spawner/lootdrop/crate_spawner,/turf/open/floor/plasteel/airless,/area/derelict/bridge/access) -"fw" = (/obj/effect/mob_spawn/derelict_drone,/turf/open/floor/plasteel/airless,/area/derelict/bridge/access) +"fw" = (/obj/item/drone_shell/dusty,/turf/open/floor/plasteel/airless,/area/derelict/bridge/access) "fx" = (/turf/open/floor/plasteel/airless,/area/derelict/bridge/access) "fy" = (/obj/structure/table,/obj/item/device/assembly/flash/handheld,/turf/open/floor/plasteel/airless,/area/derelict/bridge/access) "fz" = (/obj/structure/table,/obj/machinery/light/small{dir = 1},/obj/item/weapon/electronics/airlock,/turf/open/floor/plasteel/airless,/area/derelict/bridge/access) @@ -427,7 +427,7 @@ "ik" = (/obj/structure/chair,/turf/open/floor/plasteel/airless{icon_state = "damaged3"},/area/derelict/medical) "il" = (/obj/structure/table,/obj/effect/spawner/lootdrop/maintenance,/turf/open/floor/plating/airless,/area/derelict/medical) "im" = (/obj/item/weapon/storage/box/lights/mixed,/turf/open/floor/plating/airless,/area/derelict/singularity_engine) -"in" = (/obj/effect/mob_spawn/derelict_drone,/turf/open/floor/plating/airless,/area/derelict/singularity_engine) +"in" = (/obj/item/drone_shell/dusty,/turf/open/floor/plating/airless,/area/derelict/singularity_engine) "io" = (/obj/effect/spawner/lootdrop/maintenance,/turf/open/floor/plating/airless,/area/derelict/singularity_engine) "ip" = (/obj/item/stack/cable_coil/cut{amount = 2;dir = 2;icon_state = "coil_red2"},/turf/open/floor/plasteel/airless{icon_state = "damaged2"},/area/derelict/hallway/primary) "iq" = (/turf/open/floor/plasteel/airless{icon_state = "damaged4"},/area/ruin/unpowered/no_grav) @@ -720,7 +720,7 @@ "nR" = (/turf/open/floor/plasteel/airless,/area/derelict/se_solar) "nS" = (/obj/structure/reagent_dispensers/fueltank,/turf/open/floor/plasteel/airless,/area/derelict/se_solar) "nT" = (/obj/docking_port/stationary{dheight = 0;dir = 2;dwidth = 11;height = 22;id = "whiteship_z4";name = "KSS13: Derelict";width = 35},/turf/open/space,/area/space) -"nU" = (/obj/machinery/power/terminal{icon_state = "term";dir = 1},/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/effect/mob_spawn/derelict_drone,/turf/open/floor/plasteel/airless,/area/derelict/se_solar) +"nU" = (/obj/machinery/power/terminal{icon_state = "term";dir = 1},/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/item/drone_shell/dusty,/turf/open/floor/plasteel/airless,/area/derelict/se_solar) "nV" = (/turf/open/floor/plating/airless,/area/derelict/se_solar) "nW" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/open/floor/plasteel/airless,/area/derelict/se_solar) "nX" = (/obj/item/weapon/storage/toolbox/syndicate,/turf/open/floor/plasteel/airless,/area/derelict/se_solar) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 571711e47e7..af8e3bb509b 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -287,14 +287,3 @@ /obj/effect/mob_spawn/human/hotel_staff/Destroy() new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src)) ..() - -/obj/effect/mob_spawn/derelict_drone - name = "dust-caked drone shell" - desc = "A long-forgotten drone shell." - flavour_text = "This station sure is a mess. It's time to get to work." - mob_name = "a derelict drone" - mob_type = /mob/living/simple_animal/drone - icon = 'icons/mob/drone.dmi' - icon_state = "drone_maint_hat" - death = FALSE - roundstart = FALSE \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm index 67766e42663..ab4f02fa192 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm @@ -21,6 +21,11 @@ var/area/A = get_area(src) if(A) notify_ghosts("A drone shell has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE) + poi_list |= src + +/obj/item/drone_shell/Destroy() + poi_list -= src + . = ..() /obj/item/drone_shell/attack_ghost(mob/user) if(jobban_isbanned(user,"drone")) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index 4b7699a75f0..226cc3a9027 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -182,3 +182,12 @@ /mob/living/simple_animal/drone/cogscarab/ratvar_act() fully_heal(TRUE) + +/obj/item/drone_shell/dusty + name = "derelict drone shell" + desc = "A long-forgotten drone shell. It seems kind of... Space Russian." + drone_type = /mob/living/simple_animal/drone/derelict + +/mob/living/simple_animal/drone/derelict + name = "derelict drone" + default_hatmask = /obj/item/clothing/head/ushanka