mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-16 09:34:52 +01:00
plane holder hard dels (#19374)
* plane holder hard dels * . * . * . * vac hard del * this * . * . --------- Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
@@ -1062,7 +1062,7 @@ ADMIN_VERB(spawn_atom, R_SPAWN, "Spawn", "(atom path) Spawn an atom", ADMIN_CATE
|
||||
log_and_message_admins("spawned [amount] x [chosen_path] at [AREACOORD(user.mob)]", user)
|
||||
feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||
|
||||
ADMIN_VERB(show_traitor_panel, R_ADMIN|R_FUN|R_EVENT, "Show Traitor Panel", "Edit mobs's memory and role", ADMIN_CATEGORY_EVENTS, mob/M in GLOB.mob_list)
|
||||
ADMIN_VERB_AND_CONTEXT_MENU(show_traitor_panel, R_ADMIN|R_FUN|R_EVENT, "Show Traitor Panel", "Edit mobs's memory and role", ADMIN_CATEGORY_EVENTS, mob/M in GLOB.mob_list)
|
||||
if(!istype(M))
|
||||
to_chat(user, "This can only be used on instances of type /mob")
|
||||
return
|
||||
|
||||
@@ -48,7 +48,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
|
||||
var/next_rock = 0
|
||||
var/archaeo_overlay = ""
|
||||
var/excav_overlay = ""
|
||||
var/obj/item/last_find
|
||||
var/last_find_name
|
||||
var/datum/artifact_find/artifact_find
|
||||
var/ignore_mapgen
|
||||
|
||||
@@ -692,10 +692,8 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
|
||||
//some find types delete the /obj/item/archaeological_find and replace it with something else, this handles when that happens
|
||||
//yuck
|
||||
var/display_name = "Something"
|
||||
if(!X)
|
||||
X = last_find
|
||||
if(X)
|
||||
display_name = X.name
|
||||
if(last_find_name)
|
||||
display_name = last_find_name
|
||||
|
||||
//This is affected by 'prob_delicate' in finds.dm. As of writing, this has been set to 0 because the suspension field is just one extra piece that makes
|
||||
//Xenoarch that much more confusing, and the intent of this PR is to make it more friendly to get into.
|
||||
|
||||
@@ -66,8 +66,7 @@
|
||||
|
||||
if(cam_screen)
|
||||
QDEL_NULL(cam_screen)
|
||||
if(cam_plane_masters)
|
||||
QDEL_LIST(cam_plane_masters)
|
||||
QDEL_LIST_NULL(cam_plane_masters)
|
||||
if(cam_background)
|
||||
QDEL_NULL(cam_background)
|
||||
|
||||
|
||||
@@ -105,6 +105,7 @@
|
||||
QDEL_NULL(cam_screen)
|
||||
QDEL_LIST(cam_plane_masters)
|
||||
QDEL_NULL(cam_background)
|
||||
local_skybox = null
|
||||
return ..()
|
||||
|
||||
/datum/tgui_module/appearance_changer/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
|
||||
|
||||
@@ -879,7 +879,7 @@
|
||||
|
||||
var/turf/simulated/mineral/T = get_turf(new_item)
|
||||
if(istype(T))
|
||||
T.last_find = new_item
|
||||
T.last_find_name = new_item.name
|
||||
if(secondary_item) //Is this part of a set?
|
||||
if(talkative)
|
||||
secondary_item.talking_atom = new(secondary_item)
|
||||
|
||||
Reference in New Issue
Block a user