mirror of
https://github.com/Yawn-Wider/YWPolarisVore.git
synced 2026-08-24 13:37:16 +01:00
Merge branch 'voreupdate' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
This commit is contained in:
@@ -237,6 +237,8 @@ var/list/admin_verbs_debug = list(
|
||||
/client/proc/show_gm_status,
|
||||
/datum/admins/proc/change_weather,
|
||||
/datum/admins/proc/change_time,
|
||||
/client/proc/cmd_regenerate_asset_cache,
|
||||
/client/proc/cmd_clear_smart_asset_cache,
|
||||
/client/proc/admin_give_modifier,
|
||||
/client/proc/simple_DPS,
|
||||
/datum/admins/proc/view_feedback,
|
||||
@@ -391,6 +393,8 @@ var/list/admin_verbs_event_manager = list(
|
||||
/proc/release,
|
||||
/datum/admins/proc/change_weather,
|
||||
/datum/admins/proc/change_time,
|
||||
/client/proc/cmd_regenerate_asset_cache,
|
||||
/client/proc/cmd_clear_smart_asset_cache,
|
||||
/client/proc/admin_give_modifier,
|
||||
/client/proc/Jump,
|
||||
/client/proc/jumptomob,
|
||||
@@ -418,6 +422,8 @@ var/list/admin_verbs_event_manager = list(
|
||||
/client/proc/show_gm_status,
|
||||
/datum/admins/proc/change_weather,
|
||||
/datum/admins/proc/change_time,
|
||||
/client/proc/cmd_regenerate_asset_cache,
|
||||
/client/proc/cmd_clear_smart_asset_cache,
|
||||
/client/proc/admin_give_modifier,
|
||||
/datum/admins/proc/cmd_admin_dress,
|
||||
/client/proc/cmd_admin_gib_self,
|
||||
|
||||
@@ -283,6 +283,8 @@ var/list/admin_verbs_debug = list(
|
||||
/datum/admins/proc/set_uplink, //VOREStation Add,
|
||||
/datum/admins/proc/change_weather,
|
||||
/datum/admins/proc/change_time,
|
||||
/client/proc/cmd_regenerate_asset_cache,
|
||||
/client/proc/cmd_clear_smart_asset_cache,
|
||||
/client/proc/admin_give_modifier,
|
||||
/client/proc/simple_DPS,
|
||||
/datum/admins/proc/view_feedback,
|
||||
@@ -455,6 +457,8 @@ var/list/admin_verbs_event_manager = list(
|
||||
/proc/release,
|
||||
/datum/admins/proc/change_weather,
|
||||
/datum/admins/proc/change_time,
|
||||
/client/proc/cmd_regenerate_asset_cache,
|
||||
/client/proc/cmd_clear_smart_asset_cache,
|
||||
/client/proc/admin_give_modifier,
|
||||
/client/proc/Jump,
|
||||
/client/proc/jumptomob,
|
||||
@@ -482,6 +486,8 @@ var/list/admin_verbs_event_manager = list(
|
||||
// /client/proc/show_gm_status, // VOREStation Edit - We don't use SSgame_master yet.
|
||||
/datum/admins/proc/change_weather,
|
||||
/datum/admins/proc/change_time,
|
||||
/client/proc/cmd_regenerate_asset_cache,
|
||||
/client/proc/cmd_clear_smart_asset_cache,
|
||||
/client/proc/admin_give_modifier,
|
||||
/datum/admins/proc/cmd_admin_dress,
|
||||
/client/proc/cmd_admin_gib_self,
|
||||
|
||||
@@ -614,6 +614,12 @@
|
||||
add_verb(Tar, /mob/living/proc/eat_trash)
|
||||
add_verb(Tar, /mob/living/proc/toggle_trash_catching)
|
||||
|
||||
if("active_cloaking")
|
||||
var/mob/living/Tar = target
|
||||
if(!istype(Tar))
|
||||
return
|
||||
add_verb(Tar, /mob/living/proc/toggle_active_cloaking)
|
||||
|
||||
|
||||
////////INVENTORY//////////////
|
||||
|
||||
|
||||
@@ -695,3 +695,36 @@
|
||||
var/log = "[key_name(src)] changed [planet.name]'s time to [planet.current_time.show_time("hh:mm")]."
|
||||
message_admins(log)
|
||||
log_admin(log)
|
||||
|
||||
/client/proc/cmd_regenerate_asset_cache()
|
||||
set category = "Debug.Assets"
|
||||
set name = "Regenerate Asset Cache"
|
||||
set desc = "Clears the asset cache and regenerates it immediately."
|
||||
if(!CONFIG_GET(flag/cache_assets))
|
||||
to_chat(usr, span_warning("Asset caching is disabled in the config!"))
|
||||
return
|
||||
var/regenerated = 0
|
||||
for(var/datum/asset/A as() in subtypesof(/datum/asset))
|
||||
if(!initial(A.cross_round_cachable))
|
||||
continue
|
||||
if(A == initial(A._abstract))
|
||||
continue
|
||||
var/datum/asset/asset_datum = GLOB.asset_datums[A]
|
||||
asset_datum.regenerate()
|
||||
regenerated++
|
||||
to_chat(usr, span_notice("Regenerated [regenerated] asset\s."))
|
||||
|
||||
/client/proc/cmd_clear_smart_asset_cache()
|
||||
set category = "Debug.Assets"
|
||||
set name = "Clear Smart Asset Cache"
|
||||
set desc = "Clears the smart asset cache."
|
||||
if(!CONFIG_GET(flag/smart_cache_assets))
|
||||
to_chat(usr, span_warning("Smart asset caching is disabled in the config!"))
|
||||
return
|
||||
var/cleared = 0
|
||||
for(var/datum/asset/spritesheet_batched/A as() in subtypesof(/datum/asset/spritesheet_batched))
|
||||
if(A == initial(A._abstract))
|
||||
continue
|
||||
fdel("[ASSET_CROSS_ROUND_SMART_CACHE_DIRECTORY]/spritesheet_cache.[initial(A.name)].json")
|
||||
cleared++
|
||||
to_chat(usr, span_notice("Cleared [cleared] asset\s."))
|
||||
|
||||
@@ -411,14 +411,18 @@
|
||||
else if(href_list["addverb"])
|
||||
if(!check_rights(R_DEBUG)) return
|
||||
|
||||
var/mob/living/H = locate(href_list["addverb"])
|
||||
var/mob/H = locate(href_list["addverb"])
|
||||
|
||||
if(!istype(H))
|
||||
to_chat(usr, "This can only be done to instances of type /mob/living")
|
||||
if(!ismob(H))
|
||||
to_chat(usr, "This can only be done to instances of type /mob")
|
||||
return
|
||||
var/list/possibleverbs = list()
|
||||
possibleverbs += "Cancel" // One for the top...
|
||||
possibleverbs += typesof(/mob/proc,/mob/verb,/mob/living/proc,/mob/living/verb)
|
||||
possibleverbs += typesof(/mob/proc, /mob/verb)
|
||||
if(istype(H,/mob/observer/dead))
|
||||
possibleverbs += typesof(/mob/observer/dead/proc,/mob/observer/dead/verb)
|
||||
if(istype(H,/mob/living))
|
||||
possibleverbs += typesof(/mob/living/proc,/mob/living/verb)
|
||||
if(istype(H,/mob/living/carbon/human))
|
||||
possibleverbs += typesof(/mob/living/carbon/proc,/mob/living/carbon/verb,/mob/living/carbon/human/verb,/mob/living/carbon/human/proc)
|
||||
if(istype(H,/mob/living/silicon/robot))
|
||||
|
||||
Reference in New Issue
Block a user