mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 03:55:11 +01:00
Refactors and sorts Nuclear Bombs and Cinematics. Fixes and unit tests nuke cinematics, and re-adds a missing malf ai cinematic. (#13802)
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
This commit is contained in:
@@ -253,8 +253,8 @@
|
||||
if(!newtime)
|
||||
return
|
||||
N.timer_set = newtime
|
||||
N.set_safety()
|
||||
N.set_active()
|
||||
N.toggle_nuke_safety()
|
||||
N.toggle_nuke_armed()
|
||||
|
||||
log_admin("[key_name(usr)] [N.timing ? "activated" : "deactivated"] a nuke at [AREACOORD(N)].")
|
||||
message_admins("[ADMIN_LOOKUPFLW(usr)] [N.timing ? "activated" : "deactivated"] a nuke at [ADMIN_VERBOSEJMP(N)].")
|
||||
@@ -323,4 +323,3 @@
|
||||
message_admins("[key_name_admin(usr)] added mob ability [ability_type] to mob [marked_mob].")
|
||||
log_admin("[key_name(usr)] added mob ability [ability_type] to mob [marked_mob].")
|
||||
SSblackbox.record_feedback("tally", "admin_verb", 1, "Add Mob Ability") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||
|
||||
|
||||
@@ -3,9 +3,12 @@
|
||||
set category = "Admin.Fun"
|
||||
set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
|
||||
set hidden = TRUE
|
||||
|
||||
if(!SSticker)
|
||||
return
|
||||
|
||||
var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as null|anything in sort_list(subtypesof(/datum/cinematic), /proc/cmp_typepaths_asc)
|
||||
if(choice)
|
||||
Cinematic(initial(choice.id),world,null)
|
||||
var/datum/cinematic/choice = tgui_input_list(usr, "Chose a cinematic to play to everyone in the server.", "Choose Cinematic", sort_list(subtypesof(/datum/cinematic), /proc/cmp_typepaths_asc))
|
||||
if(!choice || !ispath(choice, /datum/cinematic))
|
||||
return
|
||||
|
||||
play_cinematic(choice, world)
|
||||
|
||||
Reference in New Issue
Block a user