diff --git a/code/game/objects/structures/droppod.dm b/code/game/objects/structures/droppod.dm index 3afef815848..3f9c3417d19 100644 --- a/code/game/objects/structures/droppod.dm +++ b/code/game/objects/structures/droppod.dm @@ -5,6 +5,7 @@ icon_state = "pod" density = TRUE anchored = TRUE + bound_height = 50 var/polite = FALSE // polite ones don't violently murder everything var/finished = FALSE @@ -40,6 +41,7 @@ sleep(4 SECONDS) // Wheeeeeee + plane = ABOVE_PLANE pixel_z = 300 alpha = 0 forceMove(T) @@ -50,6 +52,7 @@ animate(filters[filters.len], x=0, y=0, size=0, time=3 SECONDS, flags=ANIMATION_PARALLEL, easing=SINE_EASING|EASE_OUT) sleep(2 SECONDS) new /obj/effect/effect/smoke(T) + T.hotspot_expose(900) sleep(1 SECOND) filters = null @@ -72,6 +75,7 @@ L.gib() // Landed! Simmer + plane = initial(plane) icon_state = "[initial(icon_state)]" if(auto_open) @@ -108,8 +112,8 @@ if(do_after(user, 10 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE)) var/obj/item/stack/S = new /obj/item/stack/material/plasteel(loc) S.amount = 10 + playsound(user, O.usesound, 50, 1) qdel(src) - playsound(src, O.usesound, 50, 1) else to_chat(user, "\The [src] hasn't been opened yet. Do that first.") return ..() diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index ff22e219f44..c19b70a85dd 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1171,9 +1171,9 @@ var/datum/announcement/minor/admin_min_announcer = new log_admin("[key_name(usr)] spawned [seedtype] vines at ([usr.x],[usr.y],[usr.z])") /datum/admins/proc/spawn_atom(var/object as text) + set name = "Spawn" set category = "Debug" set desc = "(atom path) Spawn an atom" - set name = "Spawn" if(!check_rights(R_SPAWN)) return diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index c41116686cc..267871366b9 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1073,7 +1073,7 @@ Traitors and the like can also be revived with the previous role mostly intact. qdel(M) //Bye /client/proc/cmd_admin_droppod_spawn(var/object as text) - set name = "Drop Pod Spawn" + set name = "Drop Pod Atom" set desc = "Spawn a new atom/movable in a drop pod where you are." set category = "Fun" @@ -1094,7 +1094,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(matches.len==1) chosen = matches[1] else - chosen = tgui_input_list(usr, "Select an atom type", "Spawn Atom", matches) + chosen = tgui_input_list(usr, "Select a movable type:", "Spawn in Drop Pod", matches) if(!chosen) return @@ -1112,7 +1112,7 @@ Traitors and the like can also be revived with the previous role mostly intact. var/atom/movable/AM = new chosen(usr.loc) new /obj/structure/drop_pod/polite(get_turf(usr), AM, autoopen == "Yes" ? TRUE : FALSE) - feedback_add_details("admin_verb","DPS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + feedback_add_details("admin_verb","DPA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_droppod_deploy() set name = "Drop Pod Deploy" @@ -1122,7 +1122,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_SPAWN)) return - var/mob/living/L = tgui_input_list(usr, "Select the mob to drop:", "Drop!", living_mob_list) + var/mob/living/L = tgui_input_list(usr, "Select the mob to drop:", "Mob Picker", living_mob_list) if(!L) return