diff --git a/code/datums/screentips/screentips.dm b/code/datums/screentips/screentips.dm index 94dedbeac9..38fc502bcf 100644 --- a/code/datums/screentips/screentips.dm +++ b/code/datums/screentips/screentips.dm @@ -1,4 +1,4 @@ -#define HINT_ICON_FILE 'icons/UI_Icons/screentips/cursor_hints.dmi' +#define HINT_ICON_FILE 'icons/ui_icons/screentips/cursor_hints.dmi' /// Stores the cursor hint icons for screentip context. GLOBAL_LIST_INIT_TYPED(screentip_context_icons, /image, prepare_screentip_context_icons()) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 1a0351c797..da36831eec 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -808,6 +808,12 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) attack_verb = list("cuddled", "petpatted", "wigglepurred") squeak_override = list('modular_citadel/sound/voice/merowr.ogg' = 1) +/obj/item/toy/plush/catgirl/fermis/chen + name = "securicat plushie" + desc = "The official stuffed companion to the medcat plushie!! It resembles a certain securicat. You get the impression she's encouraging you to be brave and protect those you care for." + icon_state = "chen" + attack_verb = list("snuggles", "meowhuggies", "wigglepurrs") + /obj/item/toy/plush/teddybear name = "teddy" desc = "It's a teddy bear!" diff --git a/code/modules/antagonists/abductor/machinery/camera.dm b/code/modules/antagonists/abductor/machinery/camera.dm index 4fb6bf5645..16c7f75ac9 100644 --- a/code/modules/antagonists/abductor/machinery/camera.dm +++ b/code/modules/antagonists/abductor/machinery/camera.dm @@ -2,13 +2,10 @@ name = "Human Observation Console" var/team_number = 0 networks = list("ss13", "abductor") - var/datum/action/innate/teleport_in/tele_in_action = /datum/action/innate/teleport_in - var/datum/action/innate/teleport_out/tele_out_action = /datum/action/innate/teleport_out - var/datum/action/innate/teleport_self/tele_self_action = /datum/action/innate/teleport_self - var/datum/action/innate/vest_mode_swap/vest_mode_action = /datum/action/innate/vest_mode_swap - var/datum/action/innate/vest_disguise_swap/vest_disguise_action = /datum/action/innate/vest_disguise_swap - var/datum/action/innate/set_droppoint/set_droppoint_action = /datum/action/innate/set_droppoint var/obj/machinery/abductor/console/console + /// We can't create our actions until after LateInitialize + /// So we instead do it on the first call to GrantActions + var/abduct_created = FALSE lock_override = TRUE icon = 'icons/obj/abductor.dmi' @@ -16,27 +13,28 @@ icon_keyboard = null resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF +/obj/machinery/computer/camera_advanced/abductor/Destroy() + if(console) + console.camera = null + console = null + return ..() + /obj/machinery/computer/camera_advanced/abductor/CreateEye() - ..() + . = ..() eyeobj.visible_icon = TRUE eyeobj.icon = 'icons/mob/cameramob.dmi' eyeobj.icon_state = "generic_camera" -/obj/machinery/computer/camera_advanced/abductor/Initialize(mapload) - . = ..() - - if(tele_in_action) - actions += new tele_in_action(src) - if(tele_out_action) - actions += new tele_out_action(src) - if(tele_self_action) - actions += new tele_self_action(src) - if(vest_mode_action) - actions += new vest_mode_action(src) - if(vest_disguise_action) - actions += new vest_disguise_action(src) - if(set_droppoint_action) - actions += new set_droppoint_action(src) +/obj/machinery/computer/camera_advanced/abductor/GrantActions(mob/living/carbon/user) + if(!abduct_created) + abduct_created = TRUE + actions += new /datum/action/innate/teleport_in(console.pad) + actions += new /datum/action/innate/teleport_out(console) + actions += new /datum/action/innate/teleport_self(console.pad) + actions += new /datum/action/innate/vest_mode_swap(console) + actions += new /datum/action/innate/vest_disguise_swap(console) + actions += new /datum/action/innate/set_droppoint(console) + ..() /obj/machinery/computer/camera_advanced/abductor/proc/IsScientist(mob/living/carbon/human/H) return HAS_TRAIT(H, TRAIT_ABDUCTOR_SCIENTIST_TRAINING) @@ -47,7 +45,7 @@ button_icon_state = "beam_down" /datum/action/innate/teleport_in/Activate() - if(QDELETED(owner) || !iscarbon(owner)) + if(QDELETED(target) || !iscarbon(owner)) return var/mob/camera/aiEye/remote/remote_eye = owner.remote_control var/obj/machinery/abductor/pad/P = target @@ -61,7 +59,7 @@ button_icon_state = "beam_up" /datum/action/innate/teleport_out/Activate() - if(QDELETED(owner) || !iscarbon(owner)) + if(QDELETED(target) || !iscarbon(owner)) return var/obj/machinery/abductor/console/console = target @@ -73,7 +71,7 @@ button_icon_state = "beam_down" /datum/action/innate/teleport_self/Activate() - if(QDELETED(owner) || !iscarbon(owner)) + if(QDELETED(target) || !iscarbon(owner)) return var/mob/camera/aiEye/remote/remote_eye = owner.remote_control var/obj/machinery/abductor/pad/P = target @@ -87,7 +85,7 @@ button_icon_state = "vest_mode" /datum/action/innate/vest_mode_swap/Activate() - if(QDELETED(owner) || !iscarbon(owner)) + if(QDELETED(target) || !iscarbon(owner)) return var/obj/machinery/abductor/console/console = target console.FlipVest() @@ -99,7 +97,7 @@ button_icon_state = "vest_disguise" /datum/action/innate/vest_disguise_swap/Activate() - if(QDELETED(owner) || !iscarbon(owner)) + if(QDELETED(target) || !iscarbon(owner)) return var/obj/machinery/abductor/console/console = target console.SelectDisguise(remote=1) @@ -110,7 +108,7 @@ button_icon_state = "set_drop" /datum/action/innate/set_droppoint/Activate() - if(QDELETED(owner) || !iscarbon(owner)) + if(QDELETED(target) || !iscarbon(owner)) return var/mob/camera/aiEye/remote/remote_eye = owner.remote_control diff --git a/code/modules/asset_cache/assets/jobs.dm b/code/modules/asset_cache/assets/jobs.dm index b391ab43ec..7b1e6ce8ac 100644 --- a/code/modules/asset_cache/assets/jobs.dm +++ b/code/modules/asset_cache/assets/jobs.dm @@ -2,5 +2,5 @@ name = "jobs" /datum/asset/spritesheet/jobs/register() - InsertAll("", 'icons/UI_Icons/tgui/jobs.dmi') + InsertAll("", 'icons/ui_icons/tgui/jobs.dmi') ..() diff --git a/icons/mob/clothing/taur_canine.dmi b/icons/mob/clothing/taur_canine.dmi index db88043fb2..d206c3df1a 100644 Binary files a/icons/mob/clothing/taur_canine.dmi and b/icons/mob/clothing/taur_canine.dmi differ diff --git a/icons/mob/clothing/taur_naga.dmi b/icons/mob/clothing/taur_naga.dmi index 3df8625bec..70fd030a2e 100644 Binary files a/icons/mob/clothing/taur_naga.dmi and b/icons/mob/clothing/taur_naga.dmi differ diff --git a/icons/mob/inhands/misc/plushes_lefthand.dmi b/icons/mob/inhands/misc/plushes_lefthand.dmi index 1a12cece7d..3f5326841b 100644 Binary files a/icons/mob/inhands/misc/plushes_lefthand.dmi and b/icons/mob/inhands/misc/plushes_lefthand.dmi differ diff --git a/icons/mob/inhands/misc/plushes_righthand.dmi b/icons/mob/inhands/misc/plushes_righthand.dmi index fab9101eb6..1d1e58b004 100644 Binary files a/icons/mob/inhands/misc/plushes_righthand.dmi and b/icons/mob/inhands/misc/plushes_righthand.dmi differ diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index aea6a40e86..d07671519f 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ