You have enabled text popup limiting.")
- else
- to_chat(usr, "You have disabled text popup limiting.")
- return
-
-/client/verb/toggle_ghost_pda()
- set name = "Show/Hide GhostPDA"
- set category = "Preferences"
- set desc = "Toggle seeing PDA messages as an observer."
- prefs.toggles ^= PREFTOGGLE_CHAT_GHOSTPDA
- to_chat(src, "As a ghost, you will now [(prefs.toggles & PREFTOGGLE_CHAT_GHOSTPDA) ? "see all PDA messages" : "no longer see PDA messages"].")
- prefs.save_preferences(src)
- SSblackbox.record_feedback("tally", "toggle_verbs", 1, "Toggle Ghost PDA") //If you are copy-pasting this, ensure the 4th parameter is unique to the new proc!
+/datum/preference_toggle/toggle_ghost_pda
+ name = "Toggle Ghost PDA messages"
+ description = "Toggle seeing PDA messages as an observer"
+ preftoggle_bitflag = PREFTOGGLE_CHAT_GHOSTPDA
+ preftoggle_toggle = PREFTOGGLE_TOGGLE1
+ preftoggle_category = PREFTOGGLE_CATEGORY_GHOST
+ enable_message = "As a ghost, you will now see all PDA messages."
+ disable_message = "As a ghost, you will no longer see PDA messages."
+ blackbox_message = "Toggle Ghost PDA"
/client/verb/silence_current_midi()
set name = "Silence Current Midi"
- set category = "Preferences"
+ set category = "Special Verbs"
set desc = "Silence the current admin midi playing"
usr.stop_sound_channel(CHANNEL_ADMIN)
to_chat(src, "The current admin midi has been silenced")
+/datum/preference_toggle/toggle_runechat
+ name = "Toggle Runechat"
+ description = "Toggle seeing Runechat messages"
+ preftoggle_bitflag = PREFTOGGLE_2_RUNECHAT
+ preftoggle_toggle = PREFTOGGLE_TOGGLE2
+ preftoggle_category = PREFTOGGLE_CATEGORY_GENERAL
+ enable_message = "You will now see runechat."
+ disable_message = "You will no longer see runechat."
+ blackbox_message = "Toggle Runechat"
+
+/datum/preference_toggle/toggle_ghost_death_notifs
+ name = "Toggle Ghost Death Notifications"
+ description = "Toggle a notification when a player dies"
+ preftoggle_bitflag = PREFTOGGLE_2_DEATHMESSAGE
+ preftoggle_toggle = PREFTOGGLE_TOGGLE2
+ preftoggle_category = PREFTOGGLE_CATEGORY_GHOST
+ enable_message = "You will now see a notification in deadchat when a player dies."
+ disable_message = "You will no longer see a notification in deadchat when a player dies."
+ blackbox_message = "Toggle Death Notifications"
+
+/datum/preference_toggle/toggle_reverb
+ name = "Toggle Reverb"
+ description = "Toggles Reverb on specific sounds"
+ preftoggle_bitflag = PREFTOGGLE_2_REVERB_DISABLE
+ preftoggle_toggle = PREFTOGGLE_TOGGLE2
+ preftoggle_category = PREFTOGGLE_CATEGORY_GENERAL
+ enable_message = "You will now get reverb on some in game sounds."
+ disable_message = "You will no longer get reverb on some in game sounds."
+ blackbox_message = "Toggle reverb"
+
+/datum/preference_toggle/toggle_simple_stat_panel
+ name = "Toggle item outlines"
+ description = "Toggles seeing item outlines on hover"
+ preftoggle_bitflag = PREFTOGGLE_2_SEE_ITEM_OUTLINES
+ preftoggle_toggle = PREFTOGGLE_TOGGLE2
+ preftoggle_category = PREFTOGGLE_CATEGORY_LIVING
+ enable_message = "You no longer see item outlines when hovering over an item with your mouse."
+ disable_message = "You now see item outlines when hovering over an item with your mouse."
+ blackbox_message = "Toggle item outlines"
+
+/datum/preference_toggle/toggle_anonmode
+ name = "Toggle Anonymous Mode"
+ description = "Toggles showing your key in various parts of the game (deadchat, end round, etc)"
+ preftoggle_bitflag = PREFTOGGLE_2_ANON
+ preftoggle_toggle = PREFTOGGLE_TOGGLE2
+ preftoggle_category = PREFTOGGLE_CATEGORY_GENERAL
+ enable_message = "Your key will no longer be shown in certain events (end round reports, deadchat, etc)."
+ disable_message = "Your key will now will be shown in certain events (end round reports, deadchat, etc)."
+ blackbox_message = "Toggle Anon mode"
+
+/datum/preference_toggle/toggle_typing_indicator
+ name = "Toggle Typing Indicator"
+ description = "Hides the typing indicator"
+ preftoggle_bitflag = PREFTOGGLE_SHOW_TYPING
+ preftoggle_toggle = PREFTOGGLE_TOGGLE1
+ preftoggle_category = PREFTOGGLE_CATEGORY_LIVING
+ enable_message = "You will no longer display a typing indicator."
+ disable_message = "You will now display a typing indicator."
+ blackbox_message = "Toggle Typing Indicator (Speech)"
+
+/datum/preference_toggle/toggle_typing_indicator/set_toggles(client/user)
+ . = ..()
+ if(user.prefs.toggles & PREFTOGGLE_SHOW_TYPING)
+ if(istype(usr))
+ usr.set_typing_indicator(FALSE)
+
+/datum/preference_toggle/toggle_admin_logs
+ name = "Toggle Admin Log Messages"
+ description = "Disables admin log messages"
+ preftoggle_bitflag = PREFTOGGLE_CHAT_NO_ADMINLOGS
+ preftoggle_toggle = PREFTOGGLE_TOGGLE1
+ preftoggle_category = PREFTOGGLE_CATEGORY_ADMIN
+ rights_required = R_ADMIN
+ enable_message = "Admin logs disabled."
+ disable_message = "Admin logs re-enabled."
+ blackbox_message = "Admin logs toggled"
+
+/datum/preference_toggle/toggle_mhelp_notification
+ name = "Toggle Mentor Ticket Messages"
+ description = "Disables mentor ticket notifications"
+ preftoggle_bitflag = PREFTOGGLE_CHAT_NO_MENTORTICKETLOGS
+ preftoggle_toggle = PREFTOGGLE_TOGGLE1
+ preftoggle_category = PREFTOGGLE_CATEGORY_ADMIN
+ rights_required = R_MENTOR | R_ADMIN
+ enable_message = "You now won't get mentor ticket messages."
+ disable_message = "You now will get mentor ticket messages."
+ blackbox_message = "Mentor ticket notification toggled"
+
+/datum/preference_toggle/toggle_ahelp_notification
+ name = "Toggle Admin Ticket Messages"
+ description = "Disables admin ticket notifications"
+ preftoggle_bitflag = PREFTOGGLE_CHAT_NO_TICKETLOGS
+ preftoggle_toggle = PREFTOGGLE_TOGGLE1
+ preftoggle_category = PREFTOGGLE_CATEGORY_ADMIN
+ rights_required = R_ADMIN
+ enable_message = "You now won't get admin ticket messages."
+ disable_message = "You now will get admin ticket messages."
+ blackbox_message = "Admin ticket notification toggled"
+
+/datum/preference_toggle/toggle_debug_logs
+ name = "Toggle Debug Log Messages"
+ description = "Disables debug notifications (Runtimes, ghost role notifications, weird checks that weren't removed)"
+ preftoggle_bitflag = PREFTOGGLE_CHAT_DEBUGLOGS
+ preftoggle_toggle = PREFTOGGLE_TOGGLE1
+ preftoggle_category = PREFTOGGLE_CATEGORY_ADMIN
+ rights_required = R_VIEWRUNTIMES | R_DEBUG
+ enable_message = "You now won't get debug logs."
+ disable_message = "You now will get debug logs."
+ blackbox_message = "Debug logs toggled"
+
+/datum/preference_toggle/toggle_mctabs
+ name = "Toggle MC tab"
+ description = "Toggles MC tab visibility"
+ preftoggle_bitflag = PREFTOGGLE_2_MC_TAB
+ preftoggle_toggle = PREFTOGGLE_TOGGLE2
+ preftoggle_category = PREFTOGGLE_CATEGORY_ADMIN
+ rights_required = R_VIEWRUNTIMES | R_DEBUG
+ enable_message = "You'll now see subsystem information in the verb panel."
+ disable_message = "You'll no longer see subsystem information in the verb panel."
+ blackbox_message = "MC tabs toggled"
+
+/datum/preference_toggle/special_toggle
+ preftoggle_toggle = PREFTOGGLE_SPECIAL
+
+/datum/preference_toggle/special_toggle/set_toggles(client/user)
+ SSblackbox.record_feedback("tally", "toggle_verbs", 1, blackbox_message)
+ user.prefs.save_preferences(user)
+
+// /datum/preference_toggle/special_toggle/toggle_adminsound_mutes
+// name = "Manage Admin Sound Mutes"
+// description = "Manage admins that you wont hear played audio from"
+// preftoggle_category = PREFTOGGLE_CATEGORY_GENERAL
+// blackbox_message = "MC tabs toggled"
+
+// /datum/preference_toggle/special_toggle/toggle_adminsound_mutes/set_toggles(client/user)
+// if(!length(user.prefs.admin_sound_ckey_ignore))
+// to_chat(usr, "You have no admins with muted sounds.")
+// return
+
+// var/choice = input(usr, "Select an admin to unmute sounds from.", "Pick an admin") as null|anything in user.prefs.admin_sound_ckey_ignore
+// if(!choice)
+// return
+
+// user.prefs.admin_sound_ckey_ignore -= choice
+// to_chat(usr, "You will now hear sounds from [choice] again.")
+// return ..()
+
+/datum/preference_toggle/special_toggle/set_ooc_color
+ name = "Set Your OOC Color"
+ description = "Pick a custom OOC color"
+ preftoggle_category = PREFTOGGLE_CATEGORY_ADMIN
+ rights_required = R_ADMIN | R_DEBUG
+ blackbox_message = "Set Own OOC"
+
+/datum/preference_toggle/special_toggle/set_ooc_color/set_toggles(client/user)
+ var/new_ooccolor = input(usr, "Please select your OOC color.", "OOC color", user.prefs.ooccolor) as color|null
+ if(new_ooccolor)
+ user.prefs.ooccolor = new_ooccolor
+ to_chat(usr, "Your OOC color has been set to [new_ooccolor].")
+ else
+ user.prefs.ooccolor = initial(user.prefs.ooccolor)
+ to_chat(usr, "Your OOC color has been reset.")
+ return ..()
+
+/datum/preference_toggle/special_toggle/set_attack_logs
+ name = "Change Attack Log settings"
+ description = "Changes what attack logs you see, ranges from all attacklogs to no attacklogs"
+ preftoggle_category = PREFTOGGLE_CATEGORY_ADMIN
+ rights_required = R_ADMIN
+ blackbox_message = "changed attack log settings"
+
+/datum/preference_toggle/special_toggle/set_attack_logs/set_toggles(client/user)
+ var/static/list/attack_log_settings = list("All attack logs" = ATKLOG_ALL, "Almost all attack logs" = ATKLOG_ALMOSTALL, "Most attack logs" = ATKLOG_MOST, "Few attack logs" = ATKLOG_FEW, "No attack logs" = ATKLOG_NONE)
+ var/input = input(usr, "Please select your Attack Log settings.") as null|anything in attack_log_settings
+ if(!input)
+ return
+ var/attack_log_type = attack_log_settings[input]
+ switch(attack_log_type)
+ if(ATKLOG_ALL)
+ user.prefs.atklog = ATKLOG_ALL
+ to_chat(usr, "Your attack logs preference is now: show ALL attack logs")
+ if(ATKLOG_ALMOSTALL)
+ user.prefs.atklog = ATKLOG_ALMOSTALL
+ to_chat(usr, "Your attack logs preference is now: show ALMOST ALL attack logs (notable exceptions: NPCs attacking other NPCs, vampire bites, equipping/stripping, people pushing each other over)")
+ if(ATKLOG_MOST)
+ user.prefs.atklog = ATKLOG_MOST
+ to_chat(usr, "Your attack logs preference is now: show MOST attack logs (like ALMOST ALL, except that it also hides player v. NPC combat, and certain areas like lavaland syndie base and thunderdome)")
+ if(ATKLOG_FEW)
+ user.prefs.atklog = ATKLOG_FEW
+ to_chat(usr, "Your attack logs preference is now: show FEW attack logs (only the most important stuff: attacks on SSDs, use of explosives, messing with the engine, gibbing, AI wiping, forcefeeding, acid sprays, and organ extraction)")
+ if(ATKLOG_NONE)
+ user.prefs.atklog = ATKLOG_NONE
+ to_chat(usr, "Your attack logs preference is now: show NO attack logs")
+ return ..()
+
+/datum/preference_toggle/toggle_attack_animations
+ name = "Toggle Attack Animations"
+ description = "Toggle seeing an attack animation"
+ preftoggle_bitflag = PREFTOGGLE_2_ITEMATTACK
+ preftoggle_toggle = PREFTOGGLE_TOGGLE2
+ preftoggle_category = PREFTOGGLE_CATEGORY_LIVING
+ enable_message = "You will now see attack animations."
+ disable_message = "You will no longer see attack animations."
+
+/datum/preference_toggle/toggleprayers
+ name = "Toggle Prayers"
+ description = "Toggles seeing prayers"
+ preftoggle_bitflag = PREFTOGGLE_CHAT_PRAYER
+ preftoggle_toggle = PREFTOGGLE_TOGGLE1
+ preftoggle_category = PREFTOGGLE_CATEGORY_ADMIN
+ rights_required = R_ADMIN
+ enable_message = "You will now see prayerchat."
+ disable_message = "You will no longer see prayerchat."
+ blackbox_message = "Toggle Prayers"
+
+/datum/preference_toggle/toggle_prayers_notify
+ name = "Toggle Prayers Notify"
+ description = "Toggles hearing prayers notify"
+ preftoggle_bitflag = SOUND_PRAYERNOTIFY
+ preftoggle_toggle = PREFTOGGLE_SOUND
+ preftoggle_category = PREFTOGGLE_CATEGORY_ADMIN
+ rights_required = R_ADMIN
+ enable_message = "You will now hear when prayers are made."
+ disable_message = "You will no longer hear when prayers are made."
+ blackbox_message = "Toggle Prayer Sound"
+
+/datum/preference_toggle/toggle_karma_reminder
+ name = "Toggle End Round Karma Reminder"
+ description = "Toggles displaying end of round karma reminder"
+ preftoggle_bitflag = PREFTOGGLE_DISABLE_KARMA_REMINDER
+ preftoggle_toggle = PREFTOGGLE_TOGGLE1
+ preftoggle_category = PREFTOGGLE_CATEGORY_GENERAL
+ enable_message = "You will now see the end of round karma reminder."
+ disable_message = "You will no longer see the end of round karma reminder."
+ blackbox_message = "Toggle Karma Reminder"
+
+/datum/preference_toggle/toggle_parallax_multiz
+ name = "Toggle Parallax Multi-Z"
+ description = "Toggle seeing an attack animation"
+ preftoggle_bitflag = PREFTOGGLE_2_PARALLAX_MULTIZ
+ preftoggle_toggle = PREFTOGGLE_TOGGLE2
+ preftoggle_category = PREFTOGGLE_CATEGORY_GENERAL
+ enable_message = "You will now see 3D effect of multi-z parallax."
+ disable_message = "You will no longer see 3D effect of multi-z parallax."
+ blackbox_message = "Toggle Parallax Multi-Z"
+
+/datum/preference_toggle/toggle_parallax_multiz/set_toggles(client/user)
+ . = ..()
+ var/datum/hud/my_hud = usr?.hud_used
+ if(!my_hud)
+ return
-/client/verb/toggle_runechat()
- set name = "Enable/Disable Runechat"
- set category = "Preferences"
- set desc = "Toggle runechat messages"
- prefs.toggles2 ^= PREFTOGGLE_2_RUNECHAT
- prefs.save_preferences(src)
- to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_RUNECHAT) ? "now see" : "no longer see"] floating chat messages.")
-
-/client/verb/toggle_death_messages()
- set name = "Show/Hide Death Notifications"
- set category = "Preferences"
- set desc = "Toggle player death notifications"
- prefs.toggles2 ^= PREFTOGGLE_2_DEATHMESSAGE
- prefs.save_preferences(src)
- to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_DEATHMESSAGE) ? "now" : "no longer"] see a notification in deadchat when a player dies.")
-
-/client/verb/toggle_item_outlines()
- set name = "Show/Hide Item Outlines"
- set category = "Preferences"
- set desc = "Toggles seeing item outlines on hover."
- prefs.toggles2 ^= PREFTOGGLE_2_SEE_ITEM_OUTLINES
- prefs.save_preferences(src)
- to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_SEE_ITEM_OUTLINES) ? "now" : "no longer"] see item outlines on hover.")
-
-/client/verb/toggle_reverb()
- set name = "Enable/Disable Reverb"
- set category = "Preferences"
- set desc = "Toggle ingame reverb effects"
- prefs.toggles2 ^= PREFTOGGLE_2_REVERB_DISABLE
- prefs.save_preferences(src)
- to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_REVERB_DISABLE) ? "no longer" : "now"] get reverb on ingame sounds.")
-
-/mob/verb/toggle_anonmode()
- set name = "Toggle Anonymous Mode"
- set category = "Preferences"
- set desc = "Toggles showing your key in various parts of the game (deadchat, end round, etc)."
- client.prefs.toggles2 ^= PREFTOGGLE_2_ANON
- to_chat(src, "Your key will [(client.prefs.toggles2 & PREFTOGGLE_2_ANON) ? "no longer" : "now"] be shown in certain events (end round reports, deadchat, etc).")
- client.prefs.save_preferences(src)
-
-/client/proc/toggle_mctabs()
- set name = "Show/Hide MC Tabs"
- set category = "Preferences"
- set desc = "Shows or hides the MC tabs."
- prefs.toggles2 ^= PREFTOGGLE_2_MC_TABS
- prefs.save_preferences(src)
- to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_MC_TABS) ? "now" : "no longer"] see the MC tabs on the top right.")
+ for(var/group_key as anything in my_hud.master_groups)
+ var/datum/plane_master_group/group = my_hud.master_groups[group_key]
+ group.transform_lower_turfs(my_hud, my_hud.current_plane_offset)
+/datum/preference_toggle/toggle_vote_popup
+ name = "Toggle Vote Popup"
+ description = "Toggles the popup of the voting window on the screen when voting starts (Now working only with map votes)"
+ preftoggle_bitflag = PREFTOGGLE_2_DISABLE_VOTE_POPUPS
+ preftoggle_toggle = PREFTOGGLE_TOGGLE2
+ preftoggle_category = PREFTOGGLE_CATEGORY_GENERAL
+ enable_message = "You will now receive popups when vote starts."
+ disable_message = "You will no longer receive popups when vote starts."
+ blackbox_message = "Toggle Vote Popup"
+
+/datum/preference_toggle/toggle_emote_indicator
+ name = "Toggle Emote Typing Indicator"
+ description = "Toggles showing an indicator when you are typing an emote."
+ preftoggle_bitflag = PREFTOGGLE_2_EMOTE_BUBBLE
+ preftoggle_toggle = PREFTOGGLE_TOGGLE2
+ preftoggle_category = PREFTOGGLE_CATEGORY_GENERAL
+ enable_message = "You will now display a typing indicator for emotes."
+ disable_message = "You will no longer display a typing indicator for emotes."
+ blackbox_message = "Toggle Typing Indicator (Emote)"
+
+/datum/preference_toggle/toggle_tgui_input
+ name = "Toggle TGUI Input"
+ description = "Switches inputs between the TGUI and the standard one"
+ preftoggle_bitflag = PREFTOGGLE_2_DISABLE_TGUI_INPUT
+ preftoggle_toggle = PREFTOGGLE_TOGGLE2
+ preftoggle_category = PREFTOGGLE_CATEGORY_GENERAL
+ enable_message = "You will no longer use TGUI Input."
+ disable_message = "You will now use TGUI Input."
+ blackbox_message = "Toggle TGUI Input"
+
+/datum/preference_toggle/toggle_strip_tgui_size
+ name = "Toggle TGUI strip menu size"
+ description = "Toggles TGUI strip menu size between miniature and full-size."
+ preftoggle_bitflag = PREFTOGGLE_2_BIG_STRIP_MENU
+ preftoggle_toggle = PREFTOGGLE_TOGGLE2
+ preftoggle_category = PREFTOGGLE_CATEGORY_GENERAL
+ enable_message = "You will see full-size TGUI strip menu."
+ disable_message = "You will see minuature TGUI strip menu."
+ blackbox_message = "Toggle TGUI strip menu size"
diff --git a/code/modules/client/preference/preferences_volume_mixer.dm b/code/modules/client/preference/preferences_volume_mixer.dm
index 65aaec51374..ef9c4d697ae 100644
--- a/code/modules/client/preference/preferences_volume_mixer.dm
+++ b/code/modules/client/preference/preferences_volume_mixer.dm
@@ -95,7 +95,7 @@
/client/verb/volume_mixer()
set name = "Open Volume Mixer"
- set category = "Preferences"
+ set category = null
set hidden = TRUE
var/datum/ui_module/volume_mixer/VM = new()
diff --git a/code/modules/client/view.dm b/code/modules/client/view.dm
index 27bfb54060e..22f68cfb0ef 100644
--- a/code/modules/client/view.dm
+++ b/code/modules/client/view.dm
@@ -4,9 +4,6 @@
* Also includes
*/
-/* Defines */
-#define CUSTOM_VIEWRANGES list(1, 2, 3, 4, 5, 6, "RESET")
-
/* Viewmods */
/client
var/list/ViewMods = list()
@@ -75,18 +72,3 @@
/* Client verbs */
/proc/viewNum_to_text(view)
return "[(view * 2) + 1]x[(view * 2) + 1]"
-
-/client/verb/set_view_range(view_range as null|anything in CUSTOM_VIEWRANGES)
- set name = "Set View Range"
- set category = "Preferences"
-
- if(!view_range)
- return
-
- RemoveViewMod("custom")
- if(view_range == "RESET")
- to_chat(src, "View range reset.")
- return
-
- to_chat(src, "View range set to [viewNum_to_text(view_range)]")
- AddViewMod("custom", view_range)
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index bf21d8465f5..deb0faf5f4f 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -189,11 +189,11 @@
owner = user
if(istype(owner) && slot == ITEM_SLOT_GLOVES)
owner.dirslash_enabled = TRUE
- owner.verbs += /obj/item/clothing/gloves/fingerless/rapid/proc/dirslash_enabling
+ add_verb(owner, /obj/item/clothing/gloves/fingerless/rapid/proc/dirslash_enabling)
. = ..()
/obj/item/clothing/gloves/fingerless/rapid/dropped(mob/user, slot, silent = FALSE)
- owner.verbs -= /obj/item/clothing/gloves/fingerless/rapid/proc/dirslash_enabling
+ remove_verb(owner, /obj/item/clothing/gloves/fingerless/rapid/proc/dirslash_enabling)
owner.dirslash_enabled = initial(owner.dirslash_enabled)
. = ..()
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index d4a26e9b3be..17428f6eaf6 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -16,6 +16,7 @@
name = "welding helmet"
desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye."
icon_state = "welding"
+ base_icon_state = "welding"
flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
item_state = "welding"
materials = list(MAT_METAL=1750, MAT_GLASS=400)
@@ -27,6 +28,7 @@
actions_types = list(/datum/action/item_action/toggle)
visor_flags_inv = HIDEMASK|HIDEHEADSETS|HIDEGLASSES|HIDENAME
resistance_flags = FIRE_PROOF
+ /// Name icon_state, which is used for painting
var/paint = null
sprite_sheets = list(
@@ -37,7 +39,7 @@
SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
@@ -60,41 +62,49 @@
desc = "A white welding helmet with a character written across it."
icon_state = "welding_white"
+/obj/item/clothing/head/welding/bigbrother
+ name = "big brother decal welding helmet"
+ desc = "A welding helmet with lines and red protective glass."
+ icon_state = "welding_bigbrother"
+
+/obj/item/clothing/head/welding/slavic
+ name = "slavic decal welding helmet"
+ desc = "A welding helmet with lines and yellow protective glass."
+ icon_state = "welding_slavic"
+
/obj/item/clothing/head/welding/attack_self(mob/user)
weldingvisortoggle(user)
/obj/item/clothing/head/welding/attackby(obj/item/I, mob/living/user)
if(istype(I, /obj/item/toy/crayon/spraycan))
- if(icon_state != "welding")
- to_chat(user, "Похоже, тут уже есть слой краски!")
+ adjust_paint(user, I)
+ else if(istype(I, /obj/item/soap) && paint)
+ adjust_paint()
+ else return ..()
+
+/obj/item/clothing/head/welding/update_icon_state()
+ icon_state = paint ? paint : base_icon_state
+ return ..()
+
+/obj/item/clothing/head/welding/proc/adjust_paint(mob/living/user = null, obj/item/toy/crayon/spraycan/spray = null)
+ if(spray && user)
+ if(paint)
+ to_chat(user, span_warning("Похоже, тут уже есть слой краски!"))
return
- var/obj/item/toy/crayon/spraycan/C = I
- if(C.capped)
- to_chat(user, "Вы не можете раскрасить [src], если крышка на банке закрыта!")
+ if(!spray.can_paint(src, user))
return
- var/list/weld_icons = list("Flame" = image(icon = src.icon, icon_state = "welding_redflame"),
- "Blue Flame" = image(icon = src.icon, icon_state = "welding_blueflame"),
- "White Flame" = image(icon = src.icon, icon_state = "welding_white"))
- var/list/weld = list("Flame" = "welding_redflame",
- "Blue Flame" = "welding_blueflame",
- "White Flame" = "welding_white")
+ var/list/weld_icons = null
+ for(var/weld_icon in spray.weld_icons)
+ weld_icons += list("[weld_icon]" = image(icon = src.icon, icon_state = spray.weld_icons[weld_icon]))
var/choice = show_radial_menu(user, src, weld_icons)
- if(!choice || I.loc != user || !Adjacent(user))
+ if(!choice || spray.loc != user)
return
- if(C.uses <= 0)
- to_chat(user, "Не похоже что бы осталось достаточно краски.")
- return
- icon_state = weld[choice]
- paint = weld[choice]
- C.uses--
- update_icon()
- if(istype(I, /obj/item/soap) && (icon_state != initial(icon_state)))
- icon_state = initial(icon_state)
- paint = null
- update_icon()
+ spray.draw_paint(user)
+ paint = spray.weld_icons[choice]
else
- return ..()
-
+ paint = null
+ update_icon(UPDATE_ICON_STATE)
+ update_equipped_item(update_speedmods = FALSE)
/*
* Cakehat
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index ad9fac1f52a..e801374f3d0 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -64,28 +64,6 @@
return TRUE
return FALSE
-/obj/item/clothing/mask/muzzle/Topic(href, href_list)
- ..()
- if(href_list["locked"])
- var/mob/living/carbon/wearer = locate(href_list["locked"])
- var/success = 0
- if(ishuman(usr))
- visible_message("[usr] tries to [locked ? "unlock" : "lock"] [wearer]'s [name].", \
- "[usr] tries to [locked ? "unlock" : "lock"] [wearer]'s [name].")
- if(do_after(usr, POCKET_STRIP_DELAY, wearer, NONE))
- if(locked)
- success = do_unlock(usr)
- else
- success = do_lock(usr)
- if(success)
- visible_message("[usr] [locked ? "locks" : "unlocks"] [wearer]'s [name].", \
- "[usr] [locked ? "locks" : "unlocks"] [wearer]'s [name].")
- if(usr.machine == wearer && in_range(src, usr))
- wearer.show_inv(usr)
- else
- to_chat(usr, "You lack the ability to manipulate the lock.")
-
-
/obj/item/clothing/mask/muzzle/tapegag
name = "tape gag"
desc = "MHPMHHH!"
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 085b9153268..169027531f9 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -213,7 +213,7 @@ log transactions
if("change_security_level")
if(authenticated_account)
- var/new_sec_level = max(min(text2num(params["new_security_level"]), 2), 0)
+ var/new_sec_level = max(min(params["new_security_level"], 2), 0)
authenticated_account.security_level = new_sec_level
if("attempt_auth")
diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm
index e1e49288d4a..28f2a21bf21 100644
--- a/code/modules/economy/EFTPOS.dm
+++ b/code/modules/economy/EFTPOS.dm
@@ -167,56 +167,56 @@
switch(action)
if("change_code")
if(world.timeofday < last_change + change_delay)
- to_chat(usr, "[bicon(src)] Wait before next access code change.")
+ to_chat(user, "[bicon(src)] Wait before next access code change.")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 30, 1)
return
last_change = world.timeofday
if(access_code)
var/attempt_code = tgui_input_number(user, "Re-enter the current EFTPOS access code:", "Confirm old EFTPOS code", max_value = 9999, min_value = 1000)
- if(!Adjacent(usr))
+ if(!Adjacent(user))
return
if(attempt_code != access_code)
- to_chat(usr, "[bicon(src)] Incorrect code entered.")
+ to_chat(user, "[bicon(src)] Incorrect code entered.")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 30, 0)
return
var/trycode = tgui_input_number(user, "Enter a new access code for this device:", "Enter new EFTPOS code", max_value = 9999, min_value = 1000)
- if(!Adjacent(usr) || !isnull(trycode))
+ if(!Adjacent(user) || !isnull(trycode))
return
access_code = trycode
- print_reference(usr)
+ print_reference(user)
if("link_account")
if(duty_mode)
//запрещает редактировать это поле на служебном устройстве
- to_chat(usr, "[bicon(src)] Feature not available on this device.")
+ to_chat(user, "[bicon(src)] Feature not available on this device.")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 30, 1)
return
if(!linked_db)
reconnect_database()
if(linked_db)
- var/attempt_account_num = tgui_input_number(user, "Enter account number to pay EFTPOS charges into:", "New account number", max_value = 9999999, min_value = 1000000)
+ var/attempt_account_num = tgui_input_number(user, "Enter account number to pay EFTPOS charges into:", "New account number", max_value = 999999, min_value = 100000)
if(!attempt_account_num)
return
var/attempt_pin = tgui_input_number(user, "Enter pin code", "Account pin", max_value = 99999, min_value = 10000)
- if(!Adjacent(usr) || !attempt_pin)
+ if(!Adjacent(user) || !attempt_pin)
return
linked_account = attempt_account_access(attempt_account_num, attempt_pin, 2)
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 30, 0)
else
- to_chat(usr, "[bicon(src)] Server Error #523 Accounts Database Is Unreachable. Please retry and if the issue persists contact Nanotrasen IT support.")
+ to_chat(user, "[bicon(src)] Server Error #523 Accounts Database Is Unreachable. Please retry and if the issue persists contact Nanotrasen IT support.")
playsound(src, 'sound/machines/terminal_alert.ogg', 30, 0)
if("trans_purpose")
if (duty_mode)
- to_chat(usr, "[bicon(src)] Feature not available on this device.")
+ to_chat(user, "[bicon(src)] Feature not available on this device.")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 30, 1)
return
var/purpose = tgui_input_text(user, "Enter reason for EFTPOS transaction", "Transaction purpose", transaction_purpose, encode = FALSE)
- if(!Adjacent(usr) || !purpose)
+ if(!Adjacent(user) || isnull(purpose))
return
transaction_purpose = purpose
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 30, 0)
if("trans_value")
var/try_num = tgui_input_number(user, "Enter amount for EFTPOS transaction", "Transaction amount", transaction_amount)
- if(!Adjacent(usr) || !isnull(try_num))
+ if(!Adjacent(user) || isnull(try_num))
return
transaction_amount = try_num
if("toggle_lock")
@@ -224,7 +224,7 @@
//но для этого нужно eftpos.js редактировать, заодно и все input перевести на tgui
if(transaction_locked && !transaction_paid)
//выход из режима оплаты c помощью карты или если код 0 (приоритетный выход)
- var/list/access = usr.get_access()
+ var/list/access = user.get_access()
if((ACCESS_CENT_COMMANDER in access) || (ACCESS_CAPTAIN in access) || (ACCESS_HOP in access) || !access_code)
transaction_locked = 0
transaction_paid = 0
@@ -232,10 +232,10 @@
return
//выход с проверкой кода доступа
var/attempt_code = tgui_input_number(user, "Enter EFTPOS access code", "Reset Transaction", max_value = 9999, min_value = 1000)
- if(!Adjacent(usr))
+ if(!Adjacent(user))
return
if(attempt_code != access_code)
- to_chat(usr, "[bicon(src)] That is not a valid code!")
+ to_chat(user, "[bicon(src)] That is not a valid code!")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 30, 0)
return
transaction_locked = 0
@@ -246,30 +246,30 @@
//завершение оплаты с печатью чека
transaction_locked = 0
transaction_paid = 0
- print_check(usr)
+ print_check(user)
return
if(linked_account && !transaction_locked)
//переводит EFTPOS в режим оплаты, если введен аккаунт получателя
transaction_locked = 1
playsound(src, 'sound/machines/terminal_prompt.ogg', 30, 0)
else
- to_chat(usr, "[bicon(src)] Client Error #401 No Account Linked To Device.")
+ to_chat(user, "[bicon(src)] Client Error #401 No Account Linked To Device.")
playsound(src, 'sound/machines/terminal_alert.ogg', 30, 0)
if("scan_card")
- var/obj/item/active_hand = usr.get_active_hand()
- var/obj/item/card/id/id_card = active_hand.GetID()
+ var/obj/item/active_hand = user.get_active_hand()
+ var/obj/item/card/id/id_card = active_hand?.GetID()
if(!istype(id_card))
return
- scan_card(id_card, usr)
+ scan_card(id_card, user)
if("reset")
//reset the access code - requires HoP/captain access
- var/list/access = usr.get_access()
+ var/list/access = user.get_access()
if((ACCESS_CENT_COMMANDER in access) || (ACCESS_CAPTAIN in access) || (ACCESS_HOP in access))
access_code = 0
- to_chat(usr, "[bicon(src)] Access code reset to 0.")
+ to_chat(user, "[bicon(src)] Access code reset to 0.")
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 30, 0)
else
- to_chat(usr, "[bicon(src)] Not allowed ID access.")
+ to_chat(user, "[bicon(src)] Not allowed ID access.")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 30, 1)
/obj/item/eftpos/proc/scan_card(obj/item/card/id/id_card, mob/user)
@@ -302,7 +302,7 @@
card_account = attempt_account_access(id_card.associated_account_number, pin_needed = FALSE)
else
var/attempt_pin = tgui_input_number(user, "Enter pin code", "EFTPOS transaction", max_value = 9999, min_value = 1000)
- if(!attempt_pin || Adjacent(user))
+ if(!attempt_pin || !Adjacent(user))
return
card_account = attempt_account_access(id_card.associated_account_number, attempt_pin, 2)
if(!card_account || card_account.suspended)
@@ -322,5 +322,5 @@
visible_message("[bicon(src)] The [src] chimes.")
playsound(src, 'sound/machines/chime.ogg', 50, 0)
else
- to_chat(usr, "[bicon(src)] Server Error #523 Accounts Database Is Unreachable. Please retry and if the issue persists contact Nanotrasen IT support.")
+ to_chat(user, "[bicon(src)] Server Error #523 Accounts Database Is Unreachable. Please retry and if the issue persists contact Nanotrasen IT support.")
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
diff --git a/code/modules/economy/utils.dm b/code/modules/economy/utils.dm
index b0c3c7e01d3..2de596b732a 100644
--- a/code/modules/economy/utils.dm
+++ b/code/modules/economy/utils.dm
@@ -57,7 +57,7 @@
// Prevents people from figuring out acct is empty at high security levels
if(customer_account.security_level)
// If card requires pin authentication (ie seclevel 1 or 2)
- var/attempt_pin = tgui_input_number(M, "Enter pin code", "Vendor Transaction")
+ var/attempt_pin = tgui_input_number(M, "Enter pin code", "Vendor Transaction", 111111, 999999, 111111)
if(!attempt_account_access(customer_account.account_number, attempt_pin, 2))
to_chat(M, "Unable to access account: incorrect credentials.")
return FALSE
diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm
index 7a137d600c5..c114e786e1e 100644
--- a/code/modules/events/communications_blackout.dm
+++ b/code/modules/events/communications_blackout.dm
@@ -1,18 +1,26 @@
+/datum/event/communications_blackout
+ var/syndicate = FALSE
+
+
/datum/event/communications_blackout/announce(false_alarm)
- var/alert = pick( "Обнаружены ионосферные аномалии. Неизбежен временный сбой связи. Пожалуйста, свяжитесь с вашим*%fj 00)`5 vc-БЗЗЗ", \
- "Обнаружены ионосферные аномалии. Неизбежен временный сбо*3mga;b4;'1v?-БЗЗЗЗ", \
- "Обнаружены ионосферные аномалии. Неизбежен време#MCi46:5.;@63-БЗЗЗЗЗ", \
- "Обнаружены ионосфе'fZ\\kg5_0-БЗЗЗЗЗ", \
- "Обнаруж:%? MCayj^j<.3-БЗЗЗЗЗ", \
- "#4nd%;f4y6,>?%-БЗЗЗЗЗЗЗ")
+ var/alert = syndicate ? "Обнаружено враждебное вмешательство в работу телекоммуникаций." : "Обнаружены ионосферные аномалии."
+
+ var/alert_text = pick(list(
+ "[alert] Неизбежен временный сбой связи. Пожалуйста, свяжитесь с вашим*%fj 00)`5 vc-БЗЗЗ",
+ "[alert] Неизбежен временный сбо*3mga;b4;'1v?-БЗЗЗЗ",
+ "[alert] Неизбежен време#MCi46:5.;@63-БЗЗЗЗЗ",
+ "[copytext(alert, 1, 18)]'fZ\\kg5_0-БЗЗЗЗЗ",
+ "[copytext(alert, 1, 7)]:%? MCayj^j<.3-БЗЗЗЗЗ",
+ "#4nd%;f4y6,>?%-БЗЗЗЗЗЗЗ"
+ ))
+
+ var/list/awared_ones = active_ais()
+ for(var/mob/living/silicon/ai/AI as anything in awared_ones) //AIs are always aware of communication blackouts.
+ to_chat(AI, "
[alert_text]
")
- for(var/mob/living/silicon/ai/A in GLOB.player_list) //AIs are always aware of communication blackouts.
- to_chat(A, "
")
- to_chat(A, "[alert]")
- to_chat(A, "
")
+ if(syndicate || false_alarm || prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts.
+ GLOB.event_announcement.Announce(alert_text)
- if(false_alarm || prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts.
- GLOB.event_announcement.Announce(alert)
/datum/event/communications_blackout/start()
var/time = rand(1800, 3000)
@@ -25,6 +33,11 @@
addtimer(CALLBACK(src, PROC_REF(toggle_monitors)), time)
GLOB.communications_blackout = TRUE
+
/datum/event/communications_blackout/proc/toggle_monitors()
GLOB.communications_blackout = FALSE
return
+
+
+/datum/event/communications_blackout/syndicate
+ syndicate = TRUE
diff --git a/code/modules/events/event_procs.dm b/code/modules/events/event_procs.dm
index bd29b7e3d07..c960ed16b9e 100644
--- a/code/modules/events/event_procs.dm
+++ b/code/modules/events/event_procs.dm
@@ -1,11 +1,11 @@
-/client/proc/forceEvent(var/type in SSevents.allEvents)
+/client/proc/forceEvent()
set name = "Trigger Event"
- set category = "Debug"
+ set category = "Event"
if(!check_rights(R_EVENT))
return
-
+ var/type = tgui_input_list(src, "Выберите событие для запуска", "Выбор события", SSevents.allEvents)
if(ispath(type))
new type(new /datum/event_meta(EVENT_LEVEL_MAJOR))
message_admins("[key_name_admin(usr)] has triggered an event. ([type])")
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index fe1fad91376..a4620acf640 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -1,14 +1,18 @@
#define ION_NOANNOUNCEMENT -1
#define ION_RANDOM 0
#define ION_ANNOUNCE 1
+#define ION_SYNDICATE 2
+
/datum/event/ion_storm
var/botEmagChance = 10
var/announceEvent = ION_NOANNOUNCEMENT // -1 means don't announce, 0 means have it randomly announce, 1 means
var/ionMessage = null
var/ionAnnounceChance = 33
+ var/location_name = null
announceWhen = 1
+
/datum/event/ion_storm/New(datum/event_meta/EM, skeleton = FALSE, botEmagChance = 10, announceEvent = ION_NOANNOUNCEMENT, ionMessage = null, ionAnnounceChance = 33)
src.botEmagChance = botEmagChance
src.announceEvent = announceEvent
@@ -16,10 +20,18 @@
src.ionAnnounceChance = ionAnnounceChance
..()
+
/datum/event/ion_storm/announce(false_alarm)
- if(announceEvent == ION_ANNOUNCE || (announceEvent == ION_RANDOM && prob(ionAnnounceChance)) || false_alarm)
+ if(announceEvent == ION_SYNDICATE)
+ GLOB.event_announcement.Announce("Неестественная ионная активность была замечена на станции. Пожалуйста, проверьте всё оборудование, управляемое ИИ, на наличие ошибок. Дополнительная информация была загружена и распечатана на всех консолях связи.", "ВНИМАНИЕ: ОБНАРУЖЕНА АНОМАЛИЯ.", 'sound/AI/ionstorm.ogg')
+ var/message = "Malicious Interference with standard AI-Subsystems detected. Investigation recommended.
"
+ message += (location_name ? "Signal traced to [location_name].
" : "Signal untracable.
")
+ print_command_report(message, "Classified [command_name()] Update", FALSE)
+
+ else if(false_alarm || announceEvent == ION_ANNOUNCE || (announceEvent == ION_RANDOM && prob(ionAnnounceChance)))
GLOB.event_announcement.Announce("Вблизи станции обнаружена ионная буря. Пожалуйста, проверьте всё оборудование, управляемое ИИ, на наличие ошибок.", "ВНИМАНИЕ: ОБНАРУЖЕНА АНОМАЛИЯ.", 'sound/AI/ionstorm.ogg')
+
/datum/event/ion_storm/start()
//AI laws
for(var/mob/living/silicon/ai/ai_player as anything in GLOB.ai_list)
@@ -36,8 +48,10 @@
if(botEmagChance)
for(var/mob/living/simple_animal/bot/bot as anything in GLOB.bots_list)
- if(prob(botEmagChance))
- bot.emag_act()
+ if(!prob(botEmagChance))
+ continue
+ bot.emag_act()
+
/proc/generate_ion_law(ionMessage)
if(ionMessage)
@@ -47,6 +61,7 @@
message = uppertext(generate_static_ion_law())
return message
+
/proc/generate_static_ion_law()
var/iondepartment = pick_list("ion_laws.json", "отделы")
var/list/players = list()
@@ -181,6 +196,8 @@
)
return pick(laws)
+
#undef ION_NOANNOUNCEMENT
#undef ION_RANDOM
#undef ION_ANNOUNCE
+#undef ION_SYNDICATE
diff --git a/code/modules/holiday/holiday.dm b/code/modules/holiday/holiday.dm
index 7f35b5f0eb2..647450e3c95 100644
--- a/code/modules/holiday/holiday.dm
+++ b/code/modules/holiday/holiday.dm
@@ -350,7 +350,7 @@ GLOBAL_VAR_INIT(new_year_celebration, FALSE)
/client/proc/Set_Holiday(T as text|null)
- set name = ".Set Holiday"
+ set name = "Set Holiday"
set category = "Event"
set desc = "Force-set the Holiday variable to make the game think it's a certain day."
if(!check_rights(R_SERVER)) return
diff --git a/code/modules/input/input.dm b/code/modules/input/input.dm
deleted file mode 100644
index fd3e7d54bf4..00000000000
--- a/code/modules/input/input.dm
+++ /dev/null
@@ -1,161 +0,0 @@
-/datum/proc/key_down(key, client/C)
- return
-
-/datum/proc/key_up(key, client/C)
- return
-
-/datum/proc/key_loop(client/C)
- return
-
-/client/key_loop()
- mob.input_focus?.key_loop(src)
-
-/client
- var/list/macro_sets
-
-/// This proc sets the built in BYOND macros for keypresses to pass inputs on to the rebindable input system or the legacy system
-/// If you plan on ripping out the legacy system, see the set_macros() proc at the following commit: https://github.com/S34NW/Paradise/commit/83a0a0b0c633807cc5a88a630f623cec24e16027
-/client/proc/set_macros()
- set waitfor = FALSE
- var/static/list/default_macro_sets
-
- if(!default_macro_sets) //If you ever remove legacy input mode, you can simplify this a lot
- default_macro_sets = list(
- "default" = list(
- "Any" = "\"KeyDown \[\[*\]\]\"", // Passes any key down to the rebindable input system
- "Any+UP" = "\"KeyUp \[\[*\]\]\"", // Passes any key up to the rebindable input system
- "Tab" = "\".winset \\\"mainwindow.macro=legacy input.focus=true input.border=sunken\\\"\"", // Swaps us to legacy mode, forces input to the input bar, sets the input bar colour to salmon pink
- "Back" = "\".winset \\\"input.focus=true ? input.text=\\\"\"" // This makes it so backspace can remove default inputs
- ),
- "legacy" = list(
- "Tab" = "\".winset \\\"mainwindow.macro=default map.focus=true input.border=line\\\"\"", // Swaps us to rebind mode, moves input away from input bar, sets input bar to white
- "Back" = "\".winset \\\"input.focus=true ? input.text=\\\"\"" // This makes it so backspace can remove default inputs
- ),
- )
-
- var/list/legacy_default = default_macro_sets["legacy"]
-
- /// This list defines the keys in legacy mode that get passed on to the rebindable input system
- /// It cannot be bigger since, while typing, the keys would be passed to whatever they are set in the rebind input system
- var/list/static/legacy_keys = list(
- "North", "East", "South", "West",
- "Northeast", "Southeast", "Northwest", "Southwest",
- "Insert", "Delete",
- "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12",
- )
-
- // We use the static list to make only the keys in it passed to legacy mode
- for(var/i in 1 to length(legacy_keys))
- var/key = legacy_keys[i]
- legacy_default[key] = "\"KeyDown [key]\""
- legacy_default["[key]+UP"] = "\"KeyUp [key]\""
-
- macro_sets = default_macro_sets
-
- //This next bit is black magic, if we only had one input system it could be much shorter
- for(var/i in 1 to length(macro_sets))
- var/setname = macro_sets[i]
- if(setname != "default")
- winclone(src, "default", setname)
- var/list/macro_set = macro_sets[setname]
- for(var/k in 1 to length(macro_set))
- var/key = macro_set[k]
- var/command = macro_set[key]
- winset(src, "[setname]-[key]", "parent=[setname];name=[key];command=[command]")
- winset(src, null, "input.border=line") //screw you, we start in hotkey mode now
- macro_sets = null //not needed anymore, bye have a great time
-
-/client/verb/KeyDown(_key as text)
- set instant = TRUE
- set hidden = TRUE
-
- var/datum/input_data/ID = input_data
- var/cache = ID.client_keysend_amount++
- if(ID.keysend_tripped && ID.next_keysend_trip_reset <= world.time)
- ID.keysend_tripped = FALSE
- if(ID.next_keysend_reset <= world.time)
- ID.client_keysend_amount = 0
- ID.next_keysend_reset = world.time + (1 SECONDS)
-
- // The "tripped" system is to confirm that flooding is still happening after one spike
- // not entirely sure how byond commands interact in relation to lag
- // don't want to kick people if a lag spike results in a huge flood of commands being sent
- if(cache >= MAX_KEYPRESS_AUTOKICK)
- if(!ID.keysend_tripped)
- ID.keysend_tripped = TRUE
- ID.next_keysend_trip_reset = world.time + (2 SECONDS)
- else
- log_and_message_admins("was just autokicked for flooding keysends; likely abuse but potentially lagspike, or a controller plugged into their PC.")
- qdel(src)
- return
-
- // Check if the key is short enough to even be a real key
- if(length(_key) > MAX_KEYPRESS_COMMANDLENGTH)
- to_chat(src, "Invalid KeyDown detected! You have been disconnected from the server automatically.")
- log_and_message_admins("just attempted to send an invalid keypress. Keymessage was over [MAX_KEYPRESS_COMMANDLENGTH] characters, autokicking due to likely abuse.")
- qdel(src)
- return
-
- if(length(ID.keys_held) > HELD_KEY_BUFFER_LENGTH)
- return
-
- // The time a key was pressed isn't actually used anywhere (as of 2019-9-10) but this allows easier access usage/checking
- ID.keys_held[_key] = world.time
-
- var/move_dir = movement_kb_dirs[_key]
- if(move_dir && !ID.move_lock)
- SSinput.processing[src] = world.time
- ID.desired_move_dir |= move_dir
- if(!(ID.desired_move_dir_sub & move_dir))
- ID.desired_move_dir_add |= move_dir
-
- var/alt_mod = ID.keys_held["Alt"] ? "Alt" : ""
- var/ctrl_mod = ID.keys_held["Ctrl"] ? "Ctrl" : ""
- var/shift_mod = ID.keys_held["Shift"] ? "Shift" : ""
- var/full_key
- switch(_key)
- if("Alt", "Ctrl", "Shift")
- full_key = "[alt_mod][ctrl_mod][shift_mod]"
- else
- if(alt_mod || ctrl_mod || shift_mod)
- full_key = "[alt_mod][ctrl_mod][shift_mod][_key]"
- ID.key_combos_held[_key] = full_key
- else
- full_key = _key
-
- var/list/kbs = active_keybindings[full_key]
- if(LAZYLEN(kbs))
- var/keycount = 0
- for(var/kb in kbs)
- var/datum/keybinding/KB = kb
- KB.down(src)
- if(++keycount >= MAX_COMMANDS_PER_KEY)
- break
-
- mob.input_focus?.key_down(_key, src)
-
-/client/verb/KeyUp(_key as text)
- set instant = TRUE
- set hidden = TRUE
-
- var/datum/input_data/ID = input_data
- var/key_combo = ID.key_combos_held[_key]
- if(key_combo)
- ID.key_combos_held -= _key
- KeyUp(key_combo)
-
- ID.keys_held -= _key
-
- var/move_dir = movement_kb_dirs[_key]
- if(move_dir)
- ID.desired_move_dir &= ~move_dir
- if(!(ID.desired_move_dir_add & move_dir))
- ID.desired_move_dir_sub |= move_dir
-
- var/list/kbs = active_keybindings[_key]
- if(LAZYLEN(kbs))
- for(var/kb in kbs)
- var/datum/keybinding/KB = kb
- KB.up(src)
-
- mob.input_focus?.key_up(_key, src)
diff --git a/code/modules/input/keybindings.dm b/code/modules/input/keybindings.dm
deleted file mode 100644
index 7f064cf64ad..00000000000
--- a/code/modules/input/keybindings.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-/client/proc/update_active_keybindings()
- active_keybindings = list()
- movement_kb_dirs = list()
-
- for(var/key in prefs?.keybindings)
- for(var/kb in prefs.keybindings[key])
- var/datum/keybinding/KB = kb
- if(!KB.can_use(src, mob))
- continue
- if(istype(KB, /datum/keybinding/movement))
- var/datum/keybinding/movement/KBM = KB
- movement_kb_dirs[key] = KBM.move_dir
- else
- active_keybindings[key] += list(KB)
-
- if(!mob) // Clients can join before world/new is setup, so we gotta mob check em
- return active_keybindings
- for(var/datum/action/action as anything in mob.actions)
- if(action.button?.linked_keybind?.binded_to)
- var/datum/keybinding/mob/trigger_action_button/linked_bind = action.button.linked_keybind
- active_keybindings[linked_bind.binded_to] += list(linked_bind)
-
- return active_keybindings
diff --git a/code/modules/input/movement.dm b/code/modules/input/movement.dm
deleted file mode 100644
index 2f221e61eb2..00000000000
--- a/code/modules/input/movement.dm
+++ /dev/null
@@ -1,21 +0,0 @@
-#define NORTH_SOUTH (NORTH | SOUTH)
-#define EAST_WEST (EAST | WEST)
-
-/// Key loop to check for movement keys held and move in the desired direction.
-/atom/movable/key_loop(client/C)
- var/datum/input_data/ID = C.input_data
- if(!ID)
- return
-
- var/direction = (ID.desired_move_dir | ID.desired_move_dir_add) & ~ID.desired_move_dir_sub //bitflag fun at no extra cost
-
- // Pressing two opposite directions will cancel both out
- if((direction & NORTH_SOUTH) >= NORTH_SOUTH)
- direction &= ~NORTH_SOUTH
- if((direction & EAST_WEST) >= EAST_WEST)
- direction &= ~EAST_WEST
-
- C.Move(get_step(src, direction), direction)
-
-#undef NORTH_SOUTH
-#undef EAST_WEST
diff --git a/code/modules/instruments/objs/items/_instrument.dm b/code/modules/instruments/objs/items/_instrument.dm
index f5cb6748e2f..2f0bf2d403f 100644
--- a/code/modules/instruments/objs/items/_instrument.dm
+++ b/code/modules/instruments/objs/items/_instrument.dm
@@ -30,6 +30,9 @@
/obj/item/instrument/attack_self(mob/user)
ui_interact(user)
+/obj/item/instrument/ui_state(mob/user)
+ return GLOB.inventory_state
+
/obj/item/instrument/ui_data(mob/user)
return song.ui_data(user)
@@ -38,10 +41,10 @@
return
song.ui_interact(user, ui)
-/obj/item/instrument/ui_act(action, params)
+/obj/item/instrument/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
- return song.ui_act(action, params)
+ return song.ui_act(action, params, ui, state)
/**
* Whether the instrument should stop playing
diff --git a/code/modules/instruments/objs/structures/_musician.dm b/code/modules/instruments/objs/structures/_musician.dm
index de17cf3f9c2..1f631e27fd1 100644
--- a/code/modules/instruments/objs/structures/_musician.dm
+++ b/code/modules/instruments/objs/structures/_musician.dm
@@ -27,10 +27,10 @@
/obj/structure/musician/ui_interact(mob/user, datum/tgui/ui = null)
song.ui_interact(user, ui)
-/obj/structure/musician/ui_act(action, params)
+/obj/structure/musician/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
- return song.ui_act(action, params)
+ return song.ui_act(action, params, ui, state)
/obj/structure/musician/wrench_act(mob/living/user, obj/item/I)
default_unfasten_wrench(user, I, 40)
diff --git a/code/modules/instruments/songs/_song_ui.dm b/code/modules/instruments/songs/_song_ui.dm
index 01b950e7e76..7d13daadb01 100644
--- a/code/modules/instruments/songs/_song_ui.dm
+++ b/code/modules/instruments/songs/_song_ui.dm
@@ -44,6 +44,9 @@
return data
+/datum/song/ui_state(mob/user)
+ return parent.ui_state(user)
+
/datum/song/ui_interact(mob/user, datum/tgui/ui = null)
ui = SStgui.try_update_ui(user, parent, ui)
if(!ui)
@@ -51,8 +54,9 @@
ui.open()
ui.set_autoupdate(FALSE) // NO!!! Don't auto-update this!!
-/datum/song/ui_act(action, params)
+/datum/song/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = TRUE
+ var/mob/user = ui.user
switch(action)
if("newsong")
lines = new()
@@ -60,10 +64,10 @@
name = ""
if("import")
var/t = ""
- t = tgui_input_text(usr, "Please paste the entire song, formatted:", parent.name, max_length = (MUSIC_MAXLINECHARS * MUSIC_MAXLINES), multiline = TRUE)
- if(!in_range(parent, usr))
+ t = tgui_input_text(user, "Please paste the entire song, formatted:", parent.name, max_length = (MUSIC_MAXLINECHARS * MUSIC_MAXLINES), multiline = TRUE)
+ if(!t || !(state.can_use_topic(parent, user) == UI_INTERACTIVE))
return
- parse_song(t)
+ parse_song(t, user)
return FALSE
if("help")
help = !help
@@ -76,10 +80,10 @@
if("tempo")
tempo = sanitize_tempo(text2num(params["new"]))
if("play")
- INVOKE_ASYNC(src, PROC_REF(start_playing), usr)
+ INVOKE_ASYNC(src, PROC_REF(start_playing), user)
if("newline")
- var/newline = tgui_input_text(usr, "Enter your line:", parent.name, max_length = MUSIC_MAXLINECHARS)
- if(!newline || !in_range(parent, usr))
+ var/newline = tgui_input_text(user, "Enter your line:", parent.name, max_length = MUSIC_MAXLINECHARS)
+ if(!newline || !state.can_use_topic(parent, user))
return
if(length(newline) > MUSIC_MAXLINECHARS)
newline = copytext(newline, 1, MUSIC_MAXLINECHARS)
@@ -91,8 +95,8 @@
lines.Cut(num, num + 1)
if("modifyline")
var/num = round(text2num(params["line"]))
- var/content = tgui_input_text(usr, "Enter your line:", parent.name, lines[num], max_length = MUSIC_MAXLINECHARS)
- if(!content || !in_range(parent, usr))
+ var/content = tgui_input_text(user, "Enter your line:", parent.name, lines[num], max_length = MUSIC_MAXLINECHARS)
+ if(!content || !(state.can_use_topic(parent, user) == UI_INTERACTIVE))
return
if(num > length(lines) || num < 1)
return
@@ -139,12 +143,12 @@
set_dropoff_volume(initial(sustain_dropoff_volume), TRUE)
else
return FALSE
- parent.add_fingerprint(usr)
+ parent.add_fingerprint(user)
/**
* Parses a song the user has input into lines and stores them.
*/
-/datum/song/proc/parse_song(text)
+/datum/song/proc/parse_song(text, mob/user)
set waitfor = FALSE
//split into lines
stop_playing()
@@ -158,12 +162,12 @@
else
tempo = sanitize_tempo(5) // default 120 BPM
if(length(lines) > MUSIC_MAXLINES)
- to_chat(usr, "Too many lines!")
+ to_chat(user, "Too many lines!")
lines.Cut(MUSIC_MAXLINES + 1)
var/linenum = 1
for(var/l in lines)
if(length_char(l) > MUSIC_MAXLINECHARS)
- to_chat(usr, "Line [linenum] too long!")
+ to_chat(user, "Line [linenum] too long!")
lines.Remove(l)
else
linenum++
diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm
index 723f698c974..1b4dd53ab03 100644
--- a/code/modules/karma/karma.dm
+++ b/code/modules/karma/karma.dm
@@ -1,3 +1,5 @@
+//#define KARMA_ENABLE
+
/* KARMA
Everything karma related is here.
Part of karma purchase is handled in client_procs.dm */
@@ -112,6 +114,7 @@ GLOBAL_LIST_EMPTY(karma_spenders)
return FALSE
return TRUE
+#ifdef KARMA_ENABLE
/mob/verb/spend_karma_list()
set name = "Award Karma"
@@ -210,3 +213,5 @@ GLOBAL_LIST_EMPTY(karma_spenders)
currentkarma = (text2num(totalkarma) - text2num(karmaspent))
return currentkarma
+
+#endif
diff --git a/code/modules/keybindings/bindings_atom.dm b/code/modules/keybindings/bindings_atom.dm
new file mode 100644
index 00000000000..0f87544c5fd
--- /dev/null
+++ b/code/modules/keybindings/bindings_atom.dm
@@ -0,0 +1,46 @@
+// You might be wondering why this isn't client level. If focus is null, we don't want you to move.
+// Only way to do that is to tie the behavior into the focus's keyLoop().
+
+/atom/movable/keyLoop(client/user)
+ // Clients don't go null randomly. They do go null unexpectedly though, when they're poked in particular ways
+ // keyLoop is called by a for loop over mobs. We're guarenteed that all the mobs have clients at the START
+ // But the move of one mob might poke the client of another, so we do this
+ if(!user)
+ return FALSE
+ var/movement_dir = user.intended_direction | user.next_move_dir_add
+ // If we're not movin anywhere, we aren't movin anywhere
+ // Safe because nothing adds to movement_dir after this moment
+ if(!movement_dir)
+ // No input == our removal would have done nothing
+ // So we can safely forget about it
+ user.next_move_dir_sub = NONE
+ return FALSE
+
+ if(user.next_move_dir_sub)
+ movement_dir &= ~user.next_move_dir_sub
+ // Sanity checks in case you hold left and right and up to make sure you only go up
+ if((movement_dir & NORTH) && (movement_dir & SOUTH))
+ movement_dir &= ~(NORTH|SOUTH)
+ if((movement_dir & EAST) && (movement_dir & WEST))
+ movement_dir &= ~(EAST|WEST)
+
+ if(user.dir != NORTH && movement_dir) //If we're not moving, don't compensate, as byond will auto-fill dir otherwise
+ movement_dir = turn(movement_dir, -dir2angle(user.dir)) //By doing this we ensure that our input direction is offset by the client (camera) direction
+
+ //turn without moving while using the movement lock key, unless something wants to ignore it and move anyway
+ if(user.movement_locked && !(SEND_SIGNAL(src, COMSIG_MOVABLE_KEYBIND_FACE_DIR, movement_dir) & COMSIG_IGNORE_MOVEMENT_LOCK))
+ keybind_face_direction(movement_dir)
+ // Null check cause of the signal above
+ else if(user)
+ user.Move(get_step(src, movement_dir), movement_dir)
+ return !!movement_dir //true if there was actually any player input
+
+ return FALSE
+
+
+/client/proc/calculate_move_dir()
+ var/movement_dir = NONE
+ for(var/_key in keys_held)
+ movement_dir |= movement_keys[_key]
+ intended_direction = movement_dir
+
diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm
new file mode 100644
index 00000000000..5b6801a80fb
--- /dev/null
+++ b/code/modules/keybindings/bindings_client.dm
@@ -0,0 +1,101 @@
+// Clients aren't datums so we have to define these procs indpendently.
+// These verbs are called for all key press and release events
+/client/verb/KeyDown(_key as text)
+ set instant = TRUE
+ set hidden = TRUE
+
+ client_keysend_amount += 1
+
+ var/cache = client_keysend_amount
+
+ if(keysend_tripped && next_keysend_trip_reset <= world.time)
+ keysend_tripped = FALSE
+
+ if(next_keysend_reset <= world.time)
+ client_keysend_amount = 0
+ next_keysend_reset = world.time + (1 SECONDS)
+
+ //The "tripped" system is to confirm that flooding is still happening after one spike
+ //not entirely sure how byond commands interact in relation to lag
+ //don't want to kick people if a lag spike results in a huge flood of commands being sent
+ if(cache >= MAX_KEYPRESS_AUTOKICK)
+ if(!keysend_tripped)
+ keysend_tripped = TRUE
+ next_keysend_trip_reset = world.time + (2 SECONDS)
+ else
+ to_chat(src, span_userdanger("Flooding keysends! This could have been caused by lag, or due to a plugged-in game controller. You have been disconnected from the server automatically."))
+ log_and_message_admins("was just autokicked for flooding keysends; likely abuse but potentially lagspike, or a controller plugged into their PC.")
+ qdel(src)
+ return
+
+ ///Check if the key is short enough to even be a real key
+ if(LAZYLEN(_key) > MAX_KEYPRESS_COMMANDLENGTH)
+ to_chat(src, span_userdanger("Invalid KeyDown detected! You have been disconnected from the server automatically."))
+ log_and_message_admins("just attempted to send an invalid keypress. Keymessage was over [MAX_KEYPRESS_COMMANDLENGTH] characters, autokicking due to likely abuse.")
+ qdel(src)
+ return
+
+ if(length(keys_held) >= HELD_KEY_BUFFER_LENGTH && !keys_held[_key])
+ KeyUp(keys_held[1]) //We are going over the number of possible held keys, so let's remove the first one.
+
+ //the time a key was pressed isn't actually used anywhere (as of 2019-9-10) but this allows easier access usage/checking
+ keys_held[_key] = world.time
+ var/movement = movement_keys[_key]
+ if(movement)
+ calculate_move_dir()
+ if(!movement_locked && !(next_move_dir_sub & movement))
+ next_move_dir_add |= movement
+
+ // Client-level keybindings are ones anyone should be able to do at any time
+ // Things like taking screenshots, hitting tab, and adminhelps.
+ var/AltMod = keys_held["Alt"] ? "Alt" : ""
+ var/CtrlMod = keys_held["Ctrl"] ? "Ctrl" : ""
+ var/ShiftMod = keys_held["Shift"] ? "Shift" : ""
+ var/full_key
+ switch(_key)
+ if("Alt", "Ctrl", "Shift")
+ full_key = "[AltMod][CtrlMod][ShiftMod]"
+ else
+ if(AltMod || CtrlMod || ShiftMod)
+ full_key = "[AltMod][CtrlMod][ShiftMod][_key]"
+ key_combos_held[_key] = full_key
+ else
+ full_key = _key
+
+ var/keycount = 0
+ for(var/datum/keybinding/keybinding as anything in active_keybindings[full_key])
+ keycount++
+ if(keybinding.can_use(src) && keybinding.down(src) && keycount >= MAX_COMMANDS_PER_KEY)
+ break
+
+ mob.focus?.key_down(_key, src, full_key)
+
+
+/client/verb/KeyUp(_key as text)
+ set instant = TRUE
+ set hidden = TRUE
+
+ var/key_combo = key_combos_held[_key]
+ if(key_combo)
+ key_combos_held -= _key
+ KeyUp(key_combo)
+
+ if(!keys_held[_key])
+ return
+
+ keys_held -= _key
+
+ var/movement = movement_keys[_key]
+ if(movement)
+ calculate_move_dir()
+ if(!movement_locked && !(next_move_dir_add & movement))
+ next_move_dir_sub |= movement
+
+ // We don't do full key for release, because for mod keys you
+ // can hold different keys and releasing any should be handled by the key binding specifically
+ for(var/datum/keybinding/keybinding as anything in active_keybindings[_key])
+ if(keybinding.can_use(src) && keybinding.up(src))
+ break
+
+ mob.focus?.key_up(_key, src)
+
diff --git a/code/modules/keybindings/focus.dm b/code/modules/keybindings/focus.dm
new file mode 100644
index 00000000000..c68ee227951
--- /dev/null
+++ b/code/modules/keybindings/focus.dm
@@ -0,0 +1,6 @@
+/mob/proc/set_focus(datum/new_focus)
+ if(focus == new_focus)
+ return
+ focus = new_focus
+ reset_perspective(focus) //Maybe this should be done manually? You figure it out, reader
+
diff --git a/code/modules/keybindings/readme.md b/code/modules/keybindings/readme.md
new file mode 100644
index 00000000000..f57d8d55ffa
--- /dev/null
+++ b/code/modules/keybindings/readme.md
@@ -0,0 +1,42 @@
+# In-code keypress handling system
+
+This whole system is heavily based off of forum_account's keyboard library.
+Thanks to forum_account for saving the day, the library can be found
+[here](https://secure.byond.com/developer/Forum_account/Keyboard)!
+
+.dmf macros have some very serious shortcomings. For example, they do not allow reusing parts
+of one macro in another, so giving cyborgs their own shortcuts to swap active module couldn't
+inherit the movement that all mobs should have anyways. The webclient only supports one macro,
+so having more than one was problematic. Additionally each keybind has to call an actual
+verb, which meant a lot of hidden verbs that just call one other proc. Also our existing
+macro was really bad and tied unrelated behavior into `Northeast()`, `Southeast()`, `Northwest()`,
+and `Southwest()`.
+
+The basic premise of this system is to not screw with .dmf macro setup at all and handle
+pressing those keys in the code instead. We have every key call `client.keyDown()`
+or `client.keyUp()` with the pressed key as an argument. Certain keys get processed
+directly by the client because they should be doable at any time, then we call
+`keyDown()` or `keyUp()` on the client's holder and the client's mob's focus.
+By default `mob.focus` is the mob itself, but you can set it to any datum to give control of a
+client's keypresses to another object. This would be a good way to handle a menu or driving
+a mech. You can also set it to null to disregard input from a certain user.
+
+Movement is handled by having each client call `client.keyLoop()` every game tick.
+As above, this calls holder and `focus.keyLoop()`. `atom/movable/keyLoop()` handles movement
+Try to keep the calculations in this proc light. It runs every tick for every client after all!
+
+You can also tell which keys are being held down now. Each client a list of keys pressed called
+`keys_held`. Each entry is a key as a text string associated with the world.time when it was
+pressed.
+
+No client-set keybindings at this time, but it shouldn't be too hard if someone wants.
+
+Notes about certain keys:
+
+* `Tab` has client-sided behavior but acts normally
+* `T`, `O`, and `M` move focus to the input when pressed. This fires the keyUp macro right away.
+* `\` needs to be escaped in the dmf so any usage is `\\`
+
+You cannot `TICK_CHECK` or check `world.tick_usage` inside of procs called by key down and up
+events. They happen outside of a byond tick and have no meaning there. Key looping
+works correctly since it's part of a subsystem, not direct input.
\ No newline at end of file
diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm
new file mode 100644
index 00000000000..470527553ba
--- /dev/null
+++ b/code/modules/keybindings/setup.dm
@@ -0,0 +1,84 @@
+// Set a client's focus to an object and override these procs on that object to let it handle keypresses
+
+/datum/proc/key_down(key, client/user, full_key) // Called when a key is pressed down initially
+ SHOULD_CALL_PARENT(TRUE)
+ return
+
+
+/datum/proc/key_up(key, client/user) // Called when a key is released
+ return
+
+
+/datum/proc/keyLoop(client/user) // Called once every frame
+ set waitfor = FALSE
+ return
+
+
+/client/proc/set_macros()
+ set waitfor = FALSE
+
+ //Reset the buffer
+ client_reset_held_keys()
+
+ erase_all_macros()
+
+ var/list/macro_sets = SSinput.macro_set
+ for(var/i in 1 to length(macro_sets))
+ var/setname = macro_sets[i]
+ if(setname != "default")
+ winclone(src, "default", setname)
+ var/list/macro_set = macro_sets[setname]
+ for(var/k in 1 to length(macro_set))
+ var/key = macro_set[k]
+ var/command = macro_set[key]
+ winset(src, "[setname]-[key]", "parent=[setname];name=[key];command=[command]")
+
+ winset(src, null, "input.border=line") //screw you, we start in hotkey mode now
+
+ calculate_move_dir()
+
+
+// removes all the existing macros
+/client/proc/erase_all_macros()
+ var/erase_output = ""
+ var/list/macro_set = params2list(winget(src, "default.*", "command")) // The third arg doesnt matter here as we're just removing them all
+ for(var/k in 1 to length(macro_set))
+ var/list/split_name = splittext(macro_set[k], ".")
+ var/macro_name = "[split_name[1]].[split_name[2]]" // [3] is "command"
+ erase_output = "[erase_output];[macro_name].parent=null"
+ winset(src, null, erase_output)
+
+
+/// Manually clears any held keys, in case due to lag or other undefined behavior a key gets stuck.
+/client/proc/client_reset_held_keys()
+ for(var/key in keys_held)
+ KeyUp(key)
+
+ //In case one got stuck and the previous loop didn't clean it, somehow.
+ for(var/key in key_combos_held)
+ KeyUp(key_combos_held[key])
+
+
+/client/proc/update_active_keybindings()
+ active_keybindings = list()
+ movement_keys = list()
+
+ for(var/key in prefs?.keybindings)
+ for(var/datum/keybinding/keybinding as anything in prefs.keybindings[key])
+ if(!keybinding.can_use(src, mob))
+ continue
+ if(istype(keybinding, /datum/keybinding/movement))
+ var/datum/keybinding/movement/move_keybinding = keybinding
+ movement_keys[key] = move_keybinding.move_dir
+ else
+ active_keybindings[key] += list(keybinding)
+ calculate_move_dir()
+ if(!mob) // Clients can join before world/new is setup, so we gotta mob check em
+ return active_keybindings
+ for(var/datum/action/action as anything in mob.actions)
+ if(action.button?.linked_keybind?.binded_to)
+ var/datum/keybinding/mob/trigger_action_button/linked_bind = action.button.linked_keybind
+ active_keybindings[linked_bind.binded_to] += list(linked_bind)
+
+ return active_keybindings
+
diff --git a/code/modules/map_fluff/event.dm b/code/modules/map_fluff/event.dm
index a3ab5bf7593..d569c46558b 100644
--- a/code/modules/map_fluff/event.dm
+++ b/code/modules/map_fluff/event.dm
@@ -39,3 +39,16 @@
company_short = "NT"
starsys_name = "Epsilon Eridani"
admin_only = TRUE
+
+/datum/map/delta_old
+ name = "Delta Legacy"
+ map_path = "_maps/map_files/event/Station/delta_old.dmm"
+ lavaland_path = "_maps/map_files/Delta/Lavaland.dmm"
+
+ station_name = "NSS Kerberos"
+ station_short = "Kerberos"
+ dock_name = "NAV Trurl"
+ company_name = "Nanotrasen"
+ company_short = "NT"
+ starsys_name = "Epsilon Eridani"
+ admin_only = TRUE
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index 78fcaa19ca3..1a4097c2e66 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -191,9 +191,9 @@
if(istype(MA, src))
return FALSE
if(has_explaination_verb)
- H.verbs |= /mob/living/carbon/human/proc/martial_arts_help
+ add_verb(H, /mob/living/carbon/human/proc/martial_arts_help)
if(has_dirslash)
- H.verbs |= /mob/living/carbon/human/proc/dirslash_enabling
+ add_verb(H, /mob/living/carbon/human/proc/dirslash_enabling)
H.dirslash_enabled = TRUE
temporary = make_temporary
H.mind.known_martial_arts.Add(src)
@@ -208,12 +208,12 @@
deltimer(combo_timer)
H.mind.known_martial_arts.Remove(MA)
H.mind.martial_art = get_highest_weight(H)
- remove_verbs(H)
+ remove_martial_art_verbs(H)
return TRUE
-/datum/martial_art/proc/remove_verbs(mob/living/carbon/human/old_human)
- old_human.verbs -= /mob/living/carbon/human/proc/martial_arts_help
- old_human.verbs -= /mob/living/carbon/human/proc/dirslash_enabling
+/datum/martial_art/proc/remove_martial_art_verbs(mob/living/carbon/human/old_human)
+ remove_verb(old_human, /mob/living/carbon/human/proc/martial_arts_help)
+ remove_verb(old_human, /mob/living/carbon/human/proc/dirslash_enabling)
old_human.dirslash_enabled = initial(old_human.dirslash_enabled)
return TRUE
diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm
index 1368f3700ec..c4967a6cf64 100644
--- a/code/modules/mining/abandonedcrates.dm
+++ b/code/modules/mining/abandonedcrates.dm
@@ -214,7 +214,9 @@
add_attack_logs(user, src, "emag-bombed")
boom(user)
-/obj/structure/closet/crate/secure/loot/togglelock(mob/user)
+/obj/structure/closet/crate/secure/loot/togglelock(mob/living/user)
+ if(!istype(user))
+ return
if(locked)
boom(user)
else
diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm
index 2851146f02a..c803cf5878b 100644
--- a/code/modules/mining/lavaland/loot/colossus_loot.dm
+++ b/code/modules/mining/lavaland/loot/colossus_loot.dm
@@ -285,7 +285,7 @@
. = ..()
ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT)
AddElement(/datum/element/simple_flying)
- verbs -= /mob/verb/me_verb
+ remove_verb(src, /mob/verb/me_verb)
var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
medsensor.add_hud_to(src)
diff --git a/code/modules/mining/lavaland/loot/hierophant_loot.dm b/code/modules/mining/lavaland/loot/hierophant_loot.dm
index bd711f38cd9..41cd9bf791d 100644
--- a/code/modules/mining/lavaland/loot/hierophant_loot.dm
+++ b/code/modules/mining/lavaland/loot/hierophant_loot.dm
@@ -392,7 +392,6 @@
stat_allowed = UNCONSCIOUS
action_icon_state = "hierophant_talisman_heal"
action_background_icon_state = "bg_hierophant_talisman"
- panel = "Hierophant Talisman"
/obj/effect/proc_holder/spell/hierophant_talisman_heal/create_new_targeting()
var/datum/spell_targeting/targeted/T = new()
@@ -432,7 +431,6 @@
centcom_cancast = FALSE
action_icon_state = "hierophant_talisman_teleport"
action_background_icon_state = "bg_hierophant_talisman"
- panel = "Hierophant Talisman"
/obj/effect/proc_holder/spell/hierophant_talisman_teleport/create_new_targeting()
var/datum/spell_targeting/click/T = new()
@@ -485,7 +483,6 @@
stat_allowed = UNCONSCIOUS
action_icon_state = "hierophant_talisman_message"
action_background_icon_state = "bg_hierophant_talisman"
- panel = "Hierophant Talisman"
/obj/effect/proc_holder/spell/hierophant_talisman_message/create_new_targeting()
var/datum/spell_targeting/click/T = new()
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 76e6284a761..d2ff4cd36de 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -46,13 +46,13 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
add_sight(SEE_TURFS|SEE_MOBS|SEE_OBJS|SEE_SELF)
set_invis_see(SEE_INVISIBLE_OBSERVER_AI_EYE)
- verbs += list(
+ add_verb(src, list(
/mob/dead/observer/proc/dead_tele,
/mob/dead/observer/proc/open_spawners_menu,
/mob/dead/observer/proc/emote_spin_ghost,
/mob/dead/observer/proc/emote_flip_ghost,
/mob/dead/observer/proc/open_minigames_menu,
- )
+ ))
// Our new boo spell.
AddSpell(new /obj/effect/proc_holder/spell/boo(null))
@@ -184,6 +184,7 @@ Works together with spawning an observer, noted above.
else
GLOB.non_respawnable_keys[ckey] = 1
ghost.key = key
+ ghost.client?.init_verbs()
SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, ghost)
return ghost
@@ -273,12 +274,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
abstract_move(destination)//Get out of closets and such as a ghost
-/mob/dead/observer/Stat()
- ..()
- statpanel("Status")
- if(client.statpanel == "Status")
- show_stat_emergency_shuttle_eta()
- stat(null, "Respawnability: [(src in GLOB.respawnable_list) ? "Yes" : "No"]")
+/mob/dead/observer/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+ status_tab_data[++status_tab_data.len] = list("Respawnability:", "[(src in GLOB.respawnable_list) ? "Yes" : "No"]")
/mob/dead/observer/verb/reenter_corpse()
set category = "Ghost"
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 66cd2eed652..b1916518549 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -52,7 +52,7 @@
/mob/living/carbon/alien/New()
..()
create_reagents(1000)
- verbs += /mob/living/verb/mob_sleep
+ add_verb(src, /mob/living/verb/mob_sleep)
night_vision_action = new
night_vision_action.Grant(src)
@@ -82,14 +82,13 @@
)
-/mob/living/carbon/alien/Stat()
- ..()
- statpanel("Status")
- stat(null, "Intent: [a_intent]")
- stat(null, "Move Mode: [m_intent]")
- show_stat_emergency_shuttle_eta()
+/mob/living/carbon/alien/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+ status_tab_data[++status_tab_data.len] = list("Intent:", "[a_intent]")
+ status_tab_data[++status_tab_data.len] = list("Move Mode:", "[m_intent]")
if(can_evolve)
- stat(null, "Evolution progress: [evolution_points]/[max_evolution_points]")
+ status_tab_data[++status_tab_data.len] = list("Evolution progress: [evolution_points]/[max_evolution_points]")
/mob/living/carbon/alien/get_default_language()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 93644f559a5..abbd051f1bd 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -14,6 +14,15 @@
var/pounce_cooldown_time = 3 SECONDS
var/leap_on_click = FALSE
+GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list(
+ /datum/strippable_item/hand/left,
+ /datum/strippable_item/hand/right,
+ /datum/strippable_item/mob_item_slot/handcuffs,
+ /datum/strippable_item/mob_item_slot/legcuffs,
+ /datum/strippable_item/mob_item_slot/pocket/left,
+ /datum/strippable_item/mob_item_slot/pocket/right,
+)))
+
//This is fine right now, if we're adding organ specific damage this needs to be updated
/mob/living/carbon/alien/humanoid/New()
@@ -25,6 +34,7 @@
..()
AddSpell(new /obj/effect/proc_holder/spell/alien_spell/regurgitate)
AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW, 0.5, -11)
+ AddElement(/datum/element/strippable, GLOB.strippable_alien_humanoid_items)
update_icons()
@@ -68,48 +78,6 @@
take_overall_damage(b_loss, f_loss)
-/mob/living/carbon/alien/humanoid/show_inv(mob/user as mob)
- user.set_machine(src)
-
- var/dat = {"
- Close
- "}
-
- var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 500)
- popup.set_content(dat)
- popup.open()
-
-
/mob/living/carbon/alien/humanoid/cuff_resist(obj/item/I, cuff_break = FALSE)
playsound(src, 'sound/voice/hiss5.ogg', 40, TRUE, TRUE) //Alien roars when starting to break free
return ..(I, cuff_break = TRUE)
@@ -123,9 +91,11 @@
return 0.8
-/mob/living/carbon/alien/humanoid/toggle_move_intent() //because with movement intent change our pose changes
- ..()
- update_icons()
+/mob/living/carbon/alien/humanoid/toggle_move_intent(new_move_intent) //because with movement intent change our pose changes
+ var/old_m_intent = m_intent
+ . = ..()
+ if(old_m_intent != m_intent)
+ update_icons()
/mob/living/carbon/alien/humanoid/examine(mob/user)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/inventory.dm b/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
index ddf5aafb890..9013251e919 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
@@ -13,7 +13,6 @@
if(!QDELETED(src))
update_inv_pockets()
-
/mob/living/carbon/alien/humanoid/equip_to_slot(obj/item/I, slot, initial)
if(!slot)
return
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 719be5fbf27..17d116cd973 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -87,9 +87,6 @@
// now constructs damage icon for each organ from mask * damage field
-/mob/living/carbon/alien/larva/show_inv(mob/user)
- return
-
/mob/living/carbon/alien/larva/start_pulling(atom/movable/pulled_atom, state, force = pull_force, supress_message = FALSE)
return FALSE
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index 8f75f96c59a..f16f77bb016 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -60,18 +60,15 @@ I'm using this for Stat to give it a more nifty interface to work with
return B.dna.species.name
-/mob/living/carbon/brain/Stat()
- ..()
+/mob/living/carbon/brain/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
if(has_synthetic_assistance())
- statpanel("Status")
- show_stat_emergency_shuttle_eta()
-
- if(client.statpanel == "Status")
- //Knowing how well-off your mech is doing is really important as an MMI
- if(ismecha(src.loc))
- var/obj/mecha/M = src.loc
- stat("Exosuit Charge:", "[istype(M.cell) ? "[M.cell.charge] / [M.cell.maxcharge]" : "No cell detected"]")
- stat("Exosuit Integrity", "[!M.obj_integrity ? "0" : "[(M.obj_integrity / M.max_integrity) * 100]"]%")
+ //Knowing how well-off your mech is doing is really important as an MMI
+ if(ismecha(src.loc))
+ var/obj/mecha/M = src.loc
+ status_tab_data[++status_tab_data.len] = list("Exosuit Charge:", "[istype(M.cell) ? "[M.cell.charge] / [M.cell.maxcharge]" : "No cell detected"]")
+ status_tab_data[++status_tab_data.len] = list("Exosuit Integrity", "[!M.obj_integrity ? "0" : "[(M.obj_integrity / M.max_integrity) * 100]"]%")
/mob/living/carbon/brain/can_safely_leave_loc()
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 5e1a00a4a31..c3e02e0a4ee 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -674,15 +674,15 @@
for(var/obj/item/organ/internal/organ as anything in internal_organs)
organ.emp_act(severity)
-/mob/living/carbon/Stat()
- ..()
- if(statpanel("Status"))
- var/obj/item/organ/internal/xenos/plasmavessel/vessel = get_int_organ(/obj/item/organ/internal/xenos/plasmavessel)
- if(vessel)
- stat(null, "Plasma Stored: [vessel.stored_plasma]/[vessel.max_plasma]")
- var/obj/item/organ/internal/wryn/glands/glands = get_int_organ(/obj/item/organ/internal/wryn/glands)
- if(glands)
- stat(null, "Wax: [glands.wax]")
+/mob/living/carbon/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+ var/obj/item/organ/internal/xenos/plasmavessel/vessel = get_int_organ(/obj/item/organ/internal/xenos/plasmavessel)
+ if(vessel)
+ status_tab_data[++status_tab_data.len] = list("Plasma Stored:", "[vessel.stored_plasma]/[vessel.max_plasma]")
+ var/obj/item/organ/internal/wryn/glands/glands = get_int_organ(/obj/item/organ/internal/wryn/glands)
+ if(glands)
+ status_tab_data[++status_tab_data.len] = list("Wax: [glands.wax]")
/mob/living/carbon/slip(weaken, obj/slipped_on, lube_flags, tilesSlipped)
if(movement_type & MOVETYPES_NOT_TOUCHING_GROUND)
@@ -901,13 +901,11 @@ so that different stomachs can handle things in different ways VB*/
return shock_reduction
-/mob/living/carbon/toggle_move_intent()
- if(legcuffed)
- to_chat(src, span_notice("Ваши ноги скованы! Вы не можете бежать, пока не снимете [legcuffed]!"))
- m_intent = MOVE_INTENT_WALK //Just incase
- hud_used?.move_intent.icon_state = "walking"
- update_move_intent_slowdown()
- return
+/mob/living/carbon/can_change_move_intent(silent = FALSE)
+ if(m_intent == MOVE_INTENT_WALK && legcuffed)
+ if(!silent)
+ to_chat(src, span_notice("Ваши ноги скованы! Вы не можете бежать, пока не снимете [legcuffed.name]!"))
+ return FALSE
return ..()
diff --git a/code/modules/mob/living/carbon/carbon_stripping.dm b/code/modules/mob/living/carbon/carbon_stripping.dm
new file mode 100644
index 00000000000..27ec3199c1e
--- /dev/null
+++ b/code/modules/mob/living/carbon/carbon_stripping.dm
@@ -0,0 +1,180 @@
+/datum/strippable_item/mob_item_slot/head
+ key = STRIPPABLE_ITEM_HEAD
+ item_slot = ITEM_SLOT_HEAD
+
+/datum/strippable_item/mob_item_slot/back
+ key = STRIPPABLE_ITEM_BACK
+ item_slot = ITEM_SLOT_BACK
+
+/datum/strippable_item/mob_item_slot/back/get_alternate_actions(atom/source, mob/user)
+ return get_strippable_alternate_action_internals(get_item(source), source)
+
+/datum/strippable_item/mob_item_slot/back/alternate_action(atom/source, mob/user, action_key)
+ if(!..())
+ return
+ strippable_alternate_action_internals(get_item(source), source, user)
+
+/datum/strippable_item/mob_item_slot/mask
+ key = STRIPPABLE_ITEM_MASK
+ item_slot = ITEM_SLOT_MASK
+
+/datum/strippable_item/mob_item_slot/mask/get_body_action(atom/source, mob/user)
+ if(!ishuman(source))
+ return
+ var/mob/living/carbon/human/H = source
+ var/obj/item/organ/internal/headpocket/pocket = H.get_int_organ(/obj/item/organ/internal/headpocket)
+ if(istype(pocket) && pocket.pocket.master_item)
+ return "dislodge_headpocket"
+
+/datum/strippable_item/mob_item_slot/mask/get_alternate_actions(atom/source, mob/user)
+ var/obj/item/clothing/mask/muzzle/muzzle = get_item(source)
+ if(!istype(muzzle))
+ return
+ if(muzzle.security_lock)
+ return "[muzzle.locked ? "dis" : "en"]able_lock"
+
+/datum/strippable_item/mob_item_slot/mask/alternate_action(atom/source, mob/user, action_key)
+ if(!..())
+ return
+ // Headpocket dislodging
+ if(action_key == "dislodge_headpocket")
+ var/mob/living/carbon/human/H = source
+ var/obj/item/organ/internal/headpocket/pocket = H.get_int_organ(/obj/item/organ/internal/headpocket)
+ if(!pocket.pocket.master_item)
+ return
+ user.visible_message(span_danger("[user] is trying to remove something from [source]'s head!"),
+ span_danger("You start to dislodge whatever's inside [source]'s headpocket!"))
+ if(do_after(user, POCKET_STRIP_DELAY, source, max_interact_count = 1))
+ user.visible_message(span_danger("[user] has dislodged something from [source]'s head!"),
+ span_danger("You have dislodged everything from [source]'s headpocket!"))
+ pocket.empty_contents()
+ add_attack_logs(user, source, "Stripped of headpocket items", isLivingSSD(source) ? null : ATKLOG_ALL)
+ return
+
+ // Altering a muzzle
+ if(action_key != "enable_lock" && action_key != "disable_lock")
+ return
+ var/obj/item/clothing/mask/muzzle/muzzle = get_item(source)
+ if(!istype(muzzle))
+ return
+ if(!ishuman(user))
+ to_chat(user, "You lack the ability to manipulate the lock.")
+ return
+
+ muzzle.visible_message(span_danger("[user] tries to [muzzle.locked ? "unlock" : "lock"] [source]'s [muzzle.name]."), \
+ span_userdanger("[user] tries to [muzzle.locked ? "unlock" : "lock"] [source]'s [muzzle.name]."))
+ if(!do_after(user, POCKET_STRIP_DELAY, source, max_interact_count = 1))
+ return
+
+ var/success = FALSE
+ if(muzzle.locked)
+ success = muzzle.do_unlock(user)
+ else
+ success = muzzle.do_lock(user)
+
+ if(!success)
+ return
+ muzzle.visible_message(span_danger("[user] [muzzle.locked ? "locks" : "unlocks"] [source]'s [muzzle.name]."), \
+ span_userdanger("[user] [muzzle.locked ? "locks" : "unlocks"] [source]'s [muzzle.name]."))
+
+
+/datum/strippable_item/mob_item_slot/handcuffs
+ key = STRIPPABLE_ITEM_HANDCUFFS
+ item_slot = ITEM_SLOT_HANDCUFFED
+
+/datum/strippable_item/mob_item_slot/handcuffs/should_show(atom/source, mob/user)
+ if(!iscarbon(source))
+ return FALSE
+
+ var/mob/living/carbon/carbon_source = source
+ return !isnull(carbon_source.handcuffed)
+
+// You shouldn't be able to equip things to handcuff slots.
+/datum/strippable_item/mob_item_slot/handcuffs/try_equip(atom/source, obj/item/equipping, mob/user)
+ return FALSE
+
+/datum/strippable_item/mob_item_slot/legcuffs
+ key = STRIPPABLE_ITEM_LEGCUFFS
+ item_slot = ITEM_SLOT_LEGCUFFED
+
+/datum/strippable_item/mob_item_slot/legcuffs/should_show(atom/source, mob/user)
+ if(!iscarbon(source))
+ return FALSE
+
+ var/mob/living/carbon/carbon_source = source
+ return !isnull(carbon_source.legcuffed)
+
+// You shouldn't be able to equip things to legcuff slots.
+/datum/strippable_item/mob_item_slot/legcuffs/try_equip(atom/source, obj/item/equipping, mob/user)
+ return FALSE
+
+/// A strippable item for a hand
+/datum/strippable_item/hand
+
+ /// Which hand?
+ var/which_hand
+
+/datum/strippable_item/hand/belt/get_alternate_actions(atom/source, mob/user)
+ return get_strippable_alternate_action_internals(get_item(source), source)
+
+/datum/strippable_item/hand/get_item(atom/source)
+ if(!ismob(source))
+ return null
+
+ var/mob/mob_source = source
+ return mob_source.get_item_by_slot(which_hand)
+
+/datum/strippable_item/hand/try_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if(!.)
+ return FALSE
+
+ if(!ismob(source))
+ return FALSE
+
+ var/mob/mob_source = source
+ if(!mob_source.put_in_hand_check(equipping, which_hand))
+ to_chat(user, span_warning("\The [equipping] doesn't fit in that place!"))
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/hand/start_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if(!.)
+ return
+
+ if(!ismob(source))
+ return FALSE
+
+ var/mob/mob_source = source
+
+ if(!mob_source.put_in_hand_check(equipping, which_hand))
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/hand/finish_equip(atom/source, obj/item/equipping, mob/user)
+ if(!iscarbon(source))
+ return FALSE
+
+ var/mob/mob_source = source
+ mob_source.put_in_hand(equipping, which_hand)
+
+/datum/strippable_item/hand/finish_unequip(atom/source, mob/user)
+ var/obj/item/item = get_item(source)
+ if(isnull(item))
+ return FALSE
+
+ if(!ismob(source))
+ return FALSE
+
+ finish_unequip_mob(item, source, user)
+
+/datum/strippable_item/hand/left
+ key = STRIPPABLE_ITEM_LHAND
+ which_hand = ITEM_SLOT_HAND_LEFT
+
+/datum/strippable_item/hand/right
+ key = STRIPPABLE_ITEM_RHAND
+ which_hand = ITEM_SLOT_HAND_RIGHT
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index a3cfa1998ce..f8f5023c163 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -18,6 +18,7 @@
handcrafting = new()
AddElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 1, -6)
+ AddElement(/datum/element/strippable, GLOB.strippable_human_items)
UpdateAppearance()
GLOB.human_list += src
@@ -194,61 +195,60 @@
if(!body_accessory)
change_body_accessory("Plain Wings")
-/mob/living/carbon/human/Stat()
- ..()
- statpanel("Status")
-
- stat(null, "Intent: [a_intent]")
- stat(null, "Move Mode: [m_intent]")
-
- show_stat_emergency_shuttle_eta()
-
- if(client.statpanel == "Status")
- var/total_user_contents = GetAllContents() // cache it
- if(locate(/obj/item/gps) in total_user_contents)
- var/turf/T = get_turf(src)
- stat(null, "GPS: [COORD(T)]")
- if(locate(/obj/item/assembly/health) in total_user_contents)
- stat(null, "Health: [health]")
- if(internal)
- if(!internal.air_contents)
- qdel(internal)
- else
- stat(null, "Internals: [internal.name]")
+/mob/living/carbon/human/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+
+ status_tab_data[++status_tab_data.len] = list("Intent:", "[a_intent]")
+ status_tab_data[++status_tab_data.len] = list("Move Mode:", "[m_intent]")
+
+ var/total_user_contents = GetAllContents() // cache it
+ if(locate(/obj/item/gps) in total_user_contents)
+ var/turf/T = get_turf(src)
+ status_tab_data[++status_tab_data.len] = list("GPS:", "[COORD(T)]")
+ if(locate(/obj/item/assembly/health) in total_user_contents)
+ status_tab_data[++status_tab_data.len] = list("Health:", "[health]")
+ if(internal)
+ if(!internal.air_contents)
+ qdel(internal)
+ else
+ status_tab_data[++status_tab_data.len] = list("Internal Atmosphere Info:", "[internal.name]")
+ status_tab_data[++status_tab_data.len] = list("Tank Pressure:", "[internal.air_contents.return_pressure()]")
+ status_tab_data[++status_tab_data.len] = list("Distribution Pressure:", "[internal.distribute_pressure]")
- // I REALLY need to split up status panel things into datums
- var/mob/living/simple_animal/borer/B = has_brain_worms()
- if(B && B.controlling)
- stat("Chemicals", B.chemicals)
+ // I REALLY need to split up status panel things into datums
+ var/mob/living/simple_animal/borer/B = has_brain_worms()
+ if(B && B.controlling)
+ status_tab_data[++status_tab_data.len] = list("Chemicals", B.chemicals)
- if(mind)
- var/datum/antagonist/changeling/cling = mind.has_antag_datum(/datum/antagonist/changeling)
- if(cling)
- stat("Chemical Storage", "[cling.chem_charges]/[cling.chem_storage]")
- stat("Absorbed DNA", cling.absorbed_count)
+ if(mind)
+ var/datum/antagonist/changeling/cling = mind.has_antag_datum(/datum/antagonist/changeling)
+ if(cling)
+ status_tab_data[++status_tab_data.len] = list("Chemical Storage:", "[cling.chem_charges]/[cling.chem_storage]")
+ status_tab_data[++status_tab_data.len] = list("Absorbed DNA:", "[cling.absorbed_count]")
- var/datum/antagonist/vampire/vamp = mind.has_antag_datum(/datum/antagonist/vampire)
- if(vamp)
- stat("Total Blood", "[vamp.bloodtotal]")
- stat("Usable Blood", "[vamp.bloodusable]")
+ var/datum/antagonist/vampire/vamp = mind.has_antag_datum(/datum/antagonist/vampire)
+ if(vamp)
+ status_tab_data[++status_tab_data.len] = list("Total Blood:", "[vamp.bloodtotal]")
+ status_tab_data[++status_tab_data.len] = list("Usable Blood:", "[vamp.bloodusable]")
- var/datum/antagonist/goon_vampire/g_vamp = mind.has_antag_datum(/datum/antagonist/goon_vampire)
- if(g_vamp)
- stat("Всего крови", "[g_vamp.bloodtotal]")
- stat("Доступная кровь", "[g_vamp.bloodusable]")
+ var/datum/antagonist/goon_vampire/g_vamp = mind.has_antag_datum(/datum/antagonist/goon_vampire)
+ if(g_vamp)
+ status_tab_data[++status_tab_data.len] = list("Всего крови", "[g_vamp.bloodtotal]")
+ status_tab_data[++status_tab_data.len] = list("Доступная кровь", "[g_vamp.bloodusable]")
- if(isclocker(mind.current))
- stat("Total Power", "[GLOB.clockwork_power]")
+ if(isclocker(mind.current))
+ status_tab_data[++status_tab_data.len] = list("Total Power", "[GLOB.clockwork_power]")
- var/datum/antagonist/ninja/ninja = mind?.has_antag_datum(/datum/antagonist/ninja)
- if(ninja?.my_suit)
- stat("Заряд костюма","[ninja.get_cell_charge()]")
- stat("Заряд рывков","[ninja.get_dash_charge()]")
+ var/datum/antagonist/ninja/ninja = mind?.has_antag_datum(/datum/antagonist/ninja)
+ if(ninja?.my_suit)
+ status_tab_data[++status_tab_data.len] = list("Заряд костюма","[ninja.get_cell_charge()]")
+ status_tab_data[++status_tab_data.len] = list("Заряд рывков","[ninja.get_dash_charge()]")
if(isspacepod(loc)) // Spacdpods!
var/obj/spacepod/S = loc
- stat("Spacepod Charge", "[istype(S.battery) ? "[(S.battery.charge / S.battery.maxcharge) * 100]" : "No cell detected"]")
- stat("Spacepod Integrity", "[!S.health ? "0" : "[(S.health / initial(S.health)) * 100]"]%")
+ status_tab_data[++status_tab_data.len] = list("Spacepod Charge", "[istype(S.battery) ? "[(S.battery.charge / S.battery.maxcharge) * 100]" : "No cell detected"]")
+ status_tab_data[++status_tab_data.len] = list("Spacepod Integrity", "[!S.health ? "0" : "[(S.health / initial(S.health)) * 100]"]%")
///Define used for calculating explosve damage and effects upon humanoids. Result is >= 0
#define ex_armor_reduction(value, armor) (clamp(value * (1 - (armor / 100)), 0, INFINITY))
@@ -345,141 +345,6 @@
apply_damage(5, BRUTE, affecting, run_armor_check(affecting, "melee"))
-/mob/living/carbon/human/show_inv(mob/user)
- user.set_machine(src)
- var/obscured = check_obscured_slots()
-
- var/dat = {"
- Close
- "}
-
- var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 540)
- popup.set_content(dat)
- popup.open()
-
// Get rank from ID from hands, wear_id, pda, and then from uniform
/mob/living/carbon/human/proc/get_authentification_rank(var/if_no_id = "No id", var/if_no_job = "No job")
var/obj/item/card/id/id = get_id_card()
@@ -612,12 +477,6 @@
/mob/living/carbon/human/Topic(href, href_list)
if(in_range(src, usr) && !usr.incapacitated() && !HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED))
- var/thief_mode = 0
- if(ishuman(usr))
- var/mob/living/carbon/human/H = usr
- var/obj/item/clothing/gloves/G = H.gloves
- if(G && G.pickpocket)
- thief_mode = 1
if(href_list["embedded_object"])
var/obj/item/organ/external/bodypart = locate(href_list["embedded_limb"]) in bodyparts
@@ -647,102 +506,6 @@
)
return
- if(href_list["item"])
- var/slot = text2num(href_list["item"])
- if(slot & check_obscured_slots())
- to_chat(usr, "You can't reach that! Something is covering it.")
- return
-
- if(href_list["pockets"])
- var/pocket_side = href_list["pockets"]
- var/pocket_id = (pocket_side == "right" ? ITEM_SLOT_POCKET_RIGHT : ITEM_SLOT_POCKET_LEFT)
- var/obj/item/pocket_item = (pocket_id == ITEM_SLOT_POCKET_RIGHT ? r_store : l_store)
- var/obj/item/place_item = usr.get_active_hand() // Item to place in the pocket, if it's empty
-
- var/delay_denominator = 1
- if(pocket_item && !(pocket_item.item_flags & ABSTRACT))
- if(HAS_TRAIT(pocket_item, TRAIT_NODROP))
- to_chat(usr, "You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!")
- return
- to_chat(usr, "You try to empty [src]'s [pocket_side] pocket.")
- else if(place_item && place_item.mob_can_equip(src, pocket_id, TRUE) && !(place_item.item_flags&ABSTRACT))
- to_chat(usr, "You try to place [place_item] into [src]'s [pocket_side] pocket.")
- delay_denominator = 4
- else
- return
-
- if(do_after(usr, POCKET_STRIP_DELAY / delay_denominator, src, NONE)) //placing an item into the pocket is 4 times faster
- if(pocket_item)
- if(pocket_item == (pocket_id == ITEM_SLOT_POCKET_RIGHT ? r_store : l_store)) //item still in the pocket we search
- if(drop_item_ground(pocket_item))
- if(thief_mode)
- usr.put_in_hands(pocket_item, silent = TRUE)
- add_attack_logs(usr, src, "Stripped of [pocket_item]")
- else
- if(place_item)
- usr.drop_item_ground(place_item, silent = thief_mode)
- equip_to_slot_if_possible(place_item, pocket_id, disable_warning = TRUE, initial = thief_mode)
- add_attack_logs(usr, src, "Equipped with [place_item]")
-
- // Update strip window
- if(usr.machine == src && in_range(src, usr))
- show_inv(usr)
- else
- // Display a warning if the user mocks up if they don't have pickpocket gloves.
- if(!thief_mode)
- to_chat(src, "You feel your [pocket_side] pocket being fumbled with!")
- add_attack_logs(usr, src, "Attempted strip of [pocket_item]")
-
- if(href_list["set_sensor"])
- if(istype(w_uniform, /obj/item/clothing/under))
- var/obj/item/clothing/under/U = w_uniform
- U.set_sensors(usr)
-
- if(href_list["dislodge_headpocket"])
- usr.visible_message("[usr] is trying to remove something from [src]'s head!",
- "You start to dislodge whatever's inside [src]'s headpocket!")
- if(do_after(usr, POCKET_STRIP_DELAY, src, NONE))
- usr.visible_message("[usr] has dislodged something from [src]'s head!",
- "You have dislodged everything from [src]'s headpocket!")
- var/obj/item/organ/internal/headpocket/C = get_int_organ(/obj/item/organ/internal/headpocket)
- C.empty_contents()
- add_attack_logs(usr, src, "Stripped of headpocket items")
-
- if(href_list["strip_accessory"])
- if(istype(w_uniform, /obj/item/clothing/under))
- var/obj/item/clothing/under/uniform = w_uniform
- var/accessories_len = LAZYLEN(uniform.accessories)
- if(!accessories_len)
- return
-
- var/obj/item/clothing/accessory/accessory
- if(accessories_len > 1)
- accessory = tgui_input_list(usr, "Select an accessory to remove from [src]", "Accessory Removal", uniform.accessories)
- if(!accessory || !LAZYIN(uniform.accessories, accessory) || !Adjacent(usr) || usr.incapacitated() || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED))
- return
- else
- accessory = uniform.accessories[1]
-
- if(!thief_mode)
- usr.visible_message(
- "\The [usr] starts to take off \the [accessory] from \the [src]'s [uniform]!",
- "You start to take off \the [accessory] from \the [src]'s [uniform]!",
- )
-
- if(!do_after(usr, 4 SECONDS, src, NONE) || QDELETED(accessory) || !LAZYIN(uniform.accessories, accessory) || usr.incapacitated() || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED))
- return
-
- accessory.on_removed(usr)
- if(!thief_mode)
- if(!usr.put_in_hands(accessory, ignore_anim = FALSE))
- accessory.forceMove_turf()
- usr.visible_message(
- "\The [usr] takes \the [accessory] off of \the [src]'s [uniform]!",
- "You take \the [accessory] off of \the [src]'s [uniform]!"
- )
- else
- if(!usr.put_in_hands(accessory, silent = TRUE))
- accessory.forceMove_turf()
if(href_list["criminal"])
if(hasHUD(usr, EXAMINE_HUD_SECURITY_WRITE))
@@ -1177,7 +940,6 @@
return name
/mob/living/carbon/human/verb/check_pulse()
- set category = null
set name = "Check pulse"
set desc = "Approximately count somebody's pulse. Requires you to stand still at least 6 seconds."
set src in view(1)
@@ -1496,7 +1258,7 @@
to_chat(src, "You can't write on the floor in your current state!")
return
if(!bloody_hands)
- verbs -= /mob/living/carbon/human/proc/bloody_doodle
+ remove_verb(src, /mob/living/carbon/human/proc/bloody_doodle)
if(gloves)
to_chat(src, "[gloves] are preventing you from writing anything down!")
diff --git a/code/modules/mob/living/carbon/human/human_stripping.dm b/code/modules/mob/living/carbon/human/human_stripping.dm
new file mode 100644
index 00000000000..823e299f7e8
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/human_stripping.dm
@@ -0,0 +1,251 @@
+#define INTERNALS_TOGGLE_DELAY (4 SECONDS)
+#define POCKET_EQUIP_DELAY (1 SECONDS)
+
+GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list(
+ /datum/strippable_item/mob_item_slot/head,
+ /datum/strippable_item/mob_item_slot/back,
+ /datum/strippable_item/mob_item_slot/neck,
+ /datum/strippable_item/mob_item_slot/mask,
+ /datum/strippable_item/mob_item_slot/eyes,
+ /datum/strippable_item/mob_item_slot/left_ear,
+ /datum/strippable_item/mob_item_slot/right_ear,
+ /datum/strippable_item/mob_item_slot/jumpsuit,
+ /datum/strippable_item/mob_item_slot/suit,
+ /datum/strippable_item/mob_item_slot/gloves,
+ /datum/strippable_item/mob_item_slot/feet,
+ /datum/strippable_item/mob_item_slot/suit_storage,
+ /datum/strippable_item/mob_item_slot/id,
+ /datum/strippable_item/mob_item_slot/pda,
+ /datum/strippable_item/mob_item_slot/belt,
+ /datum/strippable_item/mob_item_slot/pocket/left,
+ /datum/strippable_item/mob_item_slot/pocket/right,
+ /datum/strippable_item/hand/left,
+ /datum/strippable_item/hand/right,
+ /datum/strippable_item/mob_item_slot/handcuffs,
+ /datum/strippable_item/mob_item_slot/legcuffs,
+)))
+
+/datum/strippable_item/mob_item_slot/eyes
+ key = STRIPPABLE_ITEM_EYES
+ item_slot = ITEM_SLOT_EYES
+
+/datum/strippable_item/mob_item_slot/jumpsuit
+ key = STRIPPABLE_ITEM_JUMPSUIT
+ item_slot = ITEM_SLOT_CLOTH_INNER
+
+/datum/strippable_item/mob_item_slot/jumpsuit/get_alternate_actions(atom/source, mob/user)
+ var/list/multiple_options = list()
+ var/obj/item/clothing/under/jumpsuit = get_item(source)
+ if(!istype(jumpsuit))
+ return null
+ if(jumpsuit.has_sensor)
+ multiple_options |= "suit_sensors"
+ if(LAZYLEN(jumpsuit.accessories))
+ multiple_options |= "remove_accessory"
+ return multiple_options
+
+/datum/strippable_item/mob_item_slot/jumpsuit/alternate_action(atom/source, mob/user, action_key)
+ if(!..())
+ return
+ var/obj/item/clothing/under/jumpsuit = get_item(source)
+ if(!istype(jumpsuit))
+ return
+ if(action_key == "suit_sensors")
+ jumpsuit.set_sensors(user)
+ return
+
+ if(action_key != "remove_accessory")
+ return
+
+ var/accessories_len = LAZYLEN(jumpsuit.accessories)
+ if(!accessories_len)
+ return
+
+ var/obj/item/clothing/accessory/accessory
+ if(accessories_len > 1)
+ accessory = tgui_input_list(user, "Select an accessory to remove from [jumpsuit]", "Accessory Removal", jumpsuit.accessories)
+ if(!accessory || !LAZYIN(jumpsuit.accessories, accessory) || !source.Adjacent(user) || user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
+ return
+ else
+ accessory = jumpsuit.accessories[1]
+
+ if(!in_thief_mode(user))
+ user.visible_message(
+ span_danger("[user] starts to take off [accessory] from [source]'s [jumpsuit]!"), \
+ span_danger("You start to take off [accessory] from [source]'s [jumpsuit]!")
+ )
+
+ if(!do_after(user, POCKET_STRIP_DELAY, jumpsuit, NONE, max_interact_count = 1) || QDELETED(accessory) || !LAZYIN(jumpsuit.accessories, accessory) || user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
+ return
+
+ accessory.on_removed(source)
+ if(!in_thief_mode(user))
+ user.visible_message(
+ span_danger("[user] takes [accessory] off of [source]'s [jumpsuit]!"), \
+ span_danger("You take [accessory] off of [source]'s [jumpsuit]!")
+ )
+ if(!user.put_in_hands(accessory, ignore_anim = FALSE))
+ accessory.forceMove_turf()
+ else
+ if(!user.put_in_hands(accessory, silent = TRUE))
+ accessory.forceMove_turf()
+
+/datum/strippable_item/mob_item_slot/left_ear
+ key = STRIPPABLE_ITEM_L_EAR
+ item_slot = ITEM_SLOT_EAR_LEFT
+
+/datum/strippable_item/mob_item_slot/right_ear
+ key = STRIPPABLE_ITEM_R_EAR
+ item_slot = ITEM_SLOT_EAR_RIGHT
+
+/datum/strippable_item/mob_item_slot/neck
+ key = STRIPPABLE_ITEM_NECK
+ item_slot = ITEM_SLOT_NECK
+
+/datum/strippable_item/mob_item_slot/suit
+ key = STRIPPABLE_ITEM_SUIT
+ item_slot = ITEM_SLOT_CLOTH_OUTER
+
+/datum/strippable_item/mob_item_slot/gloves
+ key = STRIPPABLE_ITEM_GLOVES
+ item_slot = ITEM_SLOT_GLOVES
+
+/datum/strippable_item/mob_item_slot/feet
+ key = STRIPPABLE_ITEM_FEET
+ item_slot = ITEM_SLOT_FEET
+
+/datum/strippable_item/mob_item_slot/suit_storage
+ key = STRIPPABLE_ITEM_SUIT_STORAGE
+ item_slot = ITEM_SLOT_SUITSTORE
+
+/datum/strippable_item/mob_item_slot/suit_storage/get_alternate_actions(atom/source, mob/user)
+ return get_strippable_alternate_action_internals(get_item(source), source)
+
+/datum/strippable_item/mob_item_slot/suit_storage/alternate_action(atom/source, mob/user, action_key)
+ if(!..())
+ return
+ strippable_alternate_action_internals(get_item(source), source, user)
+
+/datum/strippable_item/mob_item_slot/id
+ key = STRIPPABLE_ITEM_ID
+ item_slot = ITEM_SLOT_ID
+
+/datum/strippable_item/mob_item_slot/pda
+ key = STRIPPABLE_ITEM_PDA
+ item_slot = ITEM_SLOT_PDA
+
+/datum/strippable_item/mob_item_slot/pda/get_obscuring(atom/source)
+ return isnull(get_item(source)) \
+ ? STRIPPABLE_OBSCURING_NONE \
+ : STRIPPABLE_OBSCURING_HIDDEN
+
+/datum/strippable_item/mob_item_slot/belt
+ key = STRIPPABLE_ITEM_BELT
+ item_slot = ITEM_SLOT_BELT
+
+/datum/strippable_item/mob_item_slot/belt/get_alternate_actions(atom/source, mob/user)
+ return get_strippable_alternate_action_internals(get_item(source), source)
+
+/datum/strippable_item/mob_item_slot/belt/alternate_action(atom/source, mob/user, action_key)
+ if(!..())
+ return
+ strippable_alternate_action_internals(get_item(source), source, user)
+
+/datum/strippable_item/mob_item_slot/pocket
+ /// Which pocket we're referencing. Used for visible text.
+ var/pocket_side
+
+/datum/strippable_item/mob_item_slot/pocket/get_obscuring(atom/source)
+ return isnull(get_item(source)) \
+ ? STRIPPABLE_OBSCURING_NONE \
+ : STRIPPABLE_OBSCURING_HIDDEN
+
+/datum/strippable_item/mob_item_slot/pocket/get_equip_delay(obj/item/equipping)
+ return POCKET_EQUIP_DELAY // Equipping is 4 times as fast as stripping
+
+/datum/strippable_item/mob_item_slot/pocket/start_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if(!. && !in_thief_mode(user))
+ warn_owner(source)
+
+/datum/strippable_item/mob_item_slot/pocket/start_unequip(atom/source, mob/user)
+ var/obj/item/item = get_item(source)
+ if(isnull(item))
+ return FALSE
+
+ to_chat(user, span_notice("You try to empty [source]'s [pocket_side] pocket."))
+
+ add_attack_logs(user, source, "Attempting pickpocketing of [item]")
+ item.add_fingerprint(user)
+
+ var/result = start_unequip_mob(item, source, user, POCKET_STRIP_DELAY)
+
+ if(!result && !in_thief_mode(user))
+ warn_owner(source)
+
+ return result
+
+/datum/strippable_item/mob_item_slot/pocket/proc/warn_owner(atom/owner)
+ owner.balloon_alert(owner, "You feel your [pocket_side] pocket being fumbled with!")
+
+/datum/strippable_item/mob_item_slot/pocket/left
+ key = STRIPPABLE_ITEM_LPOCKET
+ item_slot = ITEM_SLOT_POCKET_LEFT
+ pocket_side = "left"
+
+/datum/strippable_item/mob_item_slot/pocket/right
+ key = STRIPPABLE_ITEM_RPOCKET
+ item_slot = ITEM_SLOT_POCKET_RIGHT
+ pocket_side = "right"
+
+/proc/get_strippable_alternate_action_internals(obj/item/item, atom/source)
+ if(!iscarbon(source))
+ return
+
+ var/mob/living/carbon/carbon_source = source
+ if(carbon_source.has_airtight_items() && istype(item, /obj/item/tank))
+ if(carbon_source.internal != item)
+ return "enable_internals"
+ else
+ return "disable_internals"
+
+/proc/strippable_alternate_action_internals(obj/item/item, atom/source, mob/user)
+ var/obj/item/tank/tank = item
+ if(!istype(tank))
+ return
+
+ var/mob/living/carbon/carbon_source = source
+ if(!istype(carbon_source))
+ return
+
+ var/enabling = carbon_source.internal != item
+
+ if(enabling && !carbon_source.has_airtight_items())
+ return
+
+ carbon_source.visible_message(
+ span_danger("[user] tries to [(enabling) ? "open" : "close"] the valve on [source]'s [item.name]."),
+ span_userdanger("[user] tries to [(enabling) ? "open" : "close"] the valve on your [item.name]."),
+ )
+
+ if(!do_after(user, INTERNALS_TOGGLE_DELAY, carbon_source, max_interact_count = 1))
+ return
+
+ if(enabling && !carbon_source.has_airtight_items())
+ return
+
+ if(carbon_source.internal == item)
+ carbon_source.internal = null
+ else if(!QDELETED(item))
+ carbon_source.internal = item
+
+ carbon_source.update_action_buttons_icon()
+
+ carbon_source.visible_message(
+ span_danger("[user] [isnull(carbon_source.internal) ? "closes": "opens"] the valve on [source]'s [item.name]."),
+ span_userdanger("[user] [isnull(carbon_source.internal) ? "closes": "opens"] the valve on your [item.name]."),
+ )
+
+
+#undef INTERNALS_TOGGLE_DELAY
+#undef POCKET_EQUIP_DELAY
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 77b3e35e95a..793746122ed 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -570,30 +570,6 @@
)
-/**
- * Humans have their pickpocket gloves, so they get no message when stealing things
- */
-/mob/living/carbon/human/stripPanelUnequip(obj/item/what, mob/who, where)
- var/is_silent = FALSE
- var/obj/item/clothing/gloves/G = gloves
- if(istype(G))
- is_silent = G.pickpocket
-
- ..(what, who, where, silent = is_silent)
-
-
-/**
- * Humans have their pickpocket gloves, so they get no message when stealing things
- */
-/mob/living/carbon/human/stripPanelEquip(obj/item/what, mob/who, where)
- var/is_silent = FALSE
- var/obj/item/clothing/gloves/G = gloves
- if(istype(G))
- is_silent = G.pickpocket
-
- ..(what, who, where, silent = is_silent)
-
-
/mob/living/carbon/human/proc/equipOutfit(outfit, visualsOnly = FALSE)
var/datum/outfit/O = null
diff --git a/code/modules/mob/living/carbon/human/species/diona.dm b/code/modules/mob/living/carbon/human/species/diona.dm
index b789c22a2a8..7785f18c9ea 100644
--- a/code/modules/mob/living/carbon/human/species/diona.dm
+++ b/code/modules/mob/living/carbon/human/species/diona.dm
@@ -21,7 +21,7 @@
even the simplest concepts of other minds. Their alien physiology allows them survive happily off a diet of nothing but light, \
water and other radiation."
- species_traits = list(IS_PLANT, NO_GERMS, NO_DECAY, NO_DNA)
+ species_traits = list(IS_PLANT, NO_GERMS, NO_DECAY, NO_DNA, NO_ROBOPARTS, ONLY_SPECIES_LIMBS, NO_BIOCHIPS, NO_CYBERIMPS)
clothing_flags = HAS_SOCKS
default_hair_colour = "#000000"
has_gender = FALSE
@@ -78,11 +78,11 @@
/datum/species/diona/on_species_gain(mob/living/carbon/human/H)
..()
H.gender = NEUTER
- H.verbs |= /mob/living/carbon/human/proc/emote_creak
+ add_verb(H, /mob/living/carbon/human/proc/emote_creak)
/datum/species/diona/on_species_loss(mob/living/carbon/human/H)
..()
- H.verbs -= /mob/living/carbon/human/proc/emote_creak
+ remove_verb(H, /mob/living/carbon/human/proc/emote_creak)
/datum/species/diona/on_species_loss(mob/living/carbon/human/H)
. = ..()
diff --git a/code/modules/mob/living/carbon/human/species/drask.dm b/code/modules/mob/living/carbon/human/species/drask.dm
index 871f444db2f..a43fb6c8c83 100644
--- a/code/modules/mob/living/carbon/human/species/drask.dm
+++ b/code/modules/mob/living/carbon/human/species/drask.dm
@@ -84,11 +84,11 @@
/datum/species/drask/on_species_gain(mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/emote_hum
+ add_verb(H, /mob/living/carbon/human/proc/emote_hum)
/datum/species/drask/on_species_loss(mob/living/carbon/human/H)
..()
- H.verbs -= /mob/living/carbon/human/proc/emote_hum
+ remove_verb(H, /mob/living/carbon/human/proc/emote_hum)
/datum/species/drask/handle_life(mob/living/carbon/human/H)
..()
diff --git a/code/modules/mob/living/carbon/human/species/kidan.dm b/code/modules/mob/living/carbon/human/species/kidan.dm
index d14b5691f58..a876bca6aa9 100644
--- a/code/modules/mob/living/carbon/human/species/kidan.dm
+++ b/code/modules/mob/living/carbon/human/species/kidan.dm
@@ -99,22 +99,23 @@
/datum/species/kidan/on_species_gain(mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/emote_click
- H.verbs |= /mob/living/carbon/human/proc/emote_clack
- H.verbs |= /mob/living/carbon/human/proc/emote_wiggle
- H.verbs |= /mob/living/carbon/human/proc/emote_wave_k
- H.verbs -= /mob/living/carbon/human/verb/emote_pale
- H.verbs -= /mob/living/carbon/human/verb/emote_blink
- H.verbs -= /mob/living/carbon/human/verb/emote_blink_r
- H.verbs -= /mob/living/carbon/human/verb/emote_blush
- H.verbs -= /mob/living/carbon/human/verb/emote_wink
- H.verbs -= /mob/living/carbon/human/verb/emote_smile
- H.verbs -= /mob/living/carbon/human/verb/emote_snuffle
- H.verbs -= /mob/living/carbon/human/verb/emote_grin
- H.verbs -= /mob/living/carbon/human/verb/emote_eyebrow
- H.verbs -= /mob/living/carbon/human/verb/emote_frown
- H.verbs -= /mob/living/carbon/human/verb/emote_sniff
- H.verbs -= /mob/living/carbon/human/verb/emote_glare
+ add_verb(H, list(/mob/living/carbon/human/proc/emote_click,
+ /mob/living/carbon/human/proc/emote_clack,
+ /mob/living/carbon/human/proc/emote_wiggle,
+ /mob/living/carbon/human/proc/emote_wave_k))
+ remove_verb(H, list(
+ /mob/living/carbon/human/verb/emote_pale,
+ /mob/living/carbon/human/verb/emote_blink,
+ /mob/living/carbon/human/verb/emote_blink_r,
+ /mob/living/carbon/human/verb/emote_blush,
+ /mob/living/carbon/human/verb/emote_wink,
+ /mob/living/carbon/human/verb/emote_smile,
+ /mob/living/carbon/human/verb/emote_snuffle,
+ /mob/living/carbon/human/verb/emote_grin,
+ /mob/living/carbon/human/verb/emote_eyebrow,
+ /mob/living/carbon/human/verb/emote_frown,
+ /mob/living/carbon/human/verb/emote_sniff,
+ /mob/living/carbon/human/verb/emote_glare))
// HUD for detecting pheromones
var/datum/atom_hud/kidan_hud = GLOB.huds[DATA_HUD_KIDAN_PHEROMONES]
kidan_hud.add_hud_to(H)
@@ -125,22 +126,24 @@
/datum/species/kidan/on_species_loss(mob/living/carbon/human/H)
..()
- H.verbs -= /mob/living/carbon/human/proc/emote_click
- H.verbs -= /mob/living/carbon/human/proc/emote_clack
- H.verbs -= /mob/living/carbon/human/proc/emote_wiggle
- H.verbs -= /mob/living/carbon/human/proc/emote_wave_k
- H.verbs |= /mob/living/carbon/human/verb/emote_pale
- H.verbs |= /mob/living/carbon/human/verb/emote_blink
- H.verbs |= /mob/living/carbon/human/verb/emote_blink_r
- H.verbs |= /mob/living/carbon/human/verb/emote_blush
- H.verbs |= /mob/living/carbon/human/verb/emote_wink
- H.verbs |= /mob/living/carbon/human/verb/emote_smile
- H.verbs |= /mob/living/carbon/human/verb/emote_snuffle
- H.verbs |= /mob/living/carbon/human/verb/emote_grin
- H.verbs |= /mob/living/carbon/human/verb/emote_eyebrow
- H.verbs |= /mob/living/carbon/human/verb/emote_frown
- H.verbs |= /mob/living/carbon/human/verb/emote_sniff
- H.verbs |= /mob/living/carbon/human/verb/emote_glare
+ remove_verb(H, list(
+ /mob/living/carbon/human/proc/emote_click,
+ /mob/living/carbon/human/proc/emote_clack,
+ /mob/living/carbon/human/proc/emote_wiggle,
+ /mob/living/carbon/human/proc/emote_wave_k))
+ add_verb(H, list(
+ /mob/living/carbon/human/verb/emote_pale,
+ /mob/living/carbon/human/verb/emote_blink,
+ /mob/living/carbon/human/verb/emote_blink_r,
+ /mob/living/carbon/human/verb/emote_blush,
+ /mob/living/carbon/human/verb/emote_wink,
+ /mob/living/carbon/human/verb/emote_smile,
+ /mob/living/carbon/human/verb/emote_snuffle,
+ /mob/living/carbon/human/verb/emote_grin,
+ /mob/living/carbon/human/verb/emote_eyebrow,
+ /mob/living/carbon/human/verb/emote_frown,
+ /mob/living/carbon/human/verb/emote_sniff,
+ /mob/living/carbon/human/verb/emote_glare))
// Removing the HUD for detecting pheromones
var/datum/atom_hud/kidan_hud = GLOB.huds[DATA_HUD_KIDAN_PHEROMONES]
diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm
index 8c04bcd758e..2fec8834784 100644
--- a/code/modules/mob/living/carbon/human/species/machine.dm
+++ b/code/modules/mob/living/carbon/human/species/machine.dm
@@ -92,12 +92,13 @@
monitor.Grant(H)
var/datum/atom_hud/data/human/medical/advanced/medhud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
medhud.remove_from_hud(H)
- H.verbs |= /mob/living/carbon/human/proc/emote_ping
- H.verbs |= /mob/living/carbon/human/proc/emote_beep
- H.verbs |= /mob/living/carbon/human/proc/emote_buzz
- H.verbs |= /mob/living/carbon/human/proc/emote_buzz2
- H.verbs |= /mob/living/carbon/human/proc/emote_yes
- H.verbs |= /mob/living/carbon/human/proc/emote_no
+ add_verb(H, list(
+ /mob/living/carbon/human/proc/emote_ping,
+ /mob/living/carbon/human/proc/emote_beep,
+ /mob/living/carbon/human/proc/emote_buzz,
+ /mob/living/carbon/human/proc/emote_buzz2,
+ /mob/living/carbon/human/proc/emote_yes,
+ /mob/living/carbon/human/proc/emote_no))
/datum/species/machine/on_species_loss(mob/living/carbon/human/H)
..()
@@ -105,12 +106,13 @@
monitor.Remove(H)
var/datum/atom_hud/data/human/medical/advanced/medhud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
medhud.add_to_hud(H)
- H.verbs -= /mob/living/carbon/human/proc/emote_ping
- H.verbs -= /mob/living/carbon/human/proc/emote_beep
- H.verbs -= /mob/living/carbon/human/proc/emote_buzz
- H.verbs -= /mob/living/carbon/human/proc/emote_buzz2
- H.verbs -= /mob/living/carbon/human/proc/emote_yes
- H.verbs -= /mob/living/carbon/human/proc/emote_no
+ remove_verb(H, list(
+ /mob/living/carbon/human/proc/emote_ping,
+ /mob/living/carbon/human/proc/emote_beep,
+ /mob/living/carbon/human/proc/emote_buzz,
+ /mob/living/carbon/human/proc/emote_buzz2,
+ /mob/living/carbon/human/proc/emote_yes,
+ /mob/living/carbon/human/proc/emote_no))
// Allows IPC's to change their monitor display
/datum/action/innate/change_monitor
diff --git a/code/modules/mob/living/carbon/human/species/moth.dm b/code/modules/mob/living/carbon/human/species/moth.dm
index c636370885e..261c12e84e3 100644
--- a/code/modules/mob/living/carbon/human/species/moth.dm
+++ b/code/modules/mob/living/carbon/human/species/moth.dm
@@ -83,9 +83,9 @@
/datum/species/moth/on_species_gain(mob/living/carbon/human/H)
..()
H.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/limbless)
- H.verbs |= /mob/living/carbon/human/proc/emote_flap
- H.verbs |= /mob/living/carbon/human/proc/emote_aflap
- H.verbs |= /mob/living/carbon/human/proc/emote_flutter
+ add_verb(H, /mob/living/carbon/human/proc/emote_flap)
+ add_verb(H, /mob/living/carbon/human/proc/emote_aflap)
+ add_verb(H, /mob/living/carbon/human/proc/emote_flutter)
var/datum/action/innate/cocoon/cocoon = locate() in H.actions
if(!cocoon)
cocoon = new
@@ -98,9 +98,9 @@
/datum/species/moth/on_species_loss(mob/living/carbon/human/H)
..()
H.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/limbless)
- H.verbs -= /mob/living/carbon/human/proc/emote_flap
- H.verbs -= /mob/living/carbon/human/proc/emote_aflap
- H.verbs -= /mob/living/carbon/human/proc/emote_flutter
+ remove_verb(H, /mob/living/carbon/human/proc/emote_flap)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_aflap)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_flutter)
var/datum/action/innate/cocoon/cocoon = locate() in H.actions
if(cocoon)
cocoon.Remove(H)
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 9f56731238a..a4fded9f236 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -55,13 +55,13 @@
/datum/species/plasmaman/on_species_gain(mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/emote_rattle
+ add_verb(H, /mob/living/carbon/human/proc/emote_rattle)
RegisterSignal(H, COMSIG_CARBON_RECEIVE_FRACTURE, PROC_REF(on_fracture))
/datum/species/plasmaman/on_species_loss(mob/living/carbon/human/H)
..()
- H.verbs -= /mob/living/carbon/human/proc/emote_rattle
+ remove_verb(H, /mob/living/carbon/human/proc/emote_rattle)
UnregisterSignal(H, COMSIG_CARBON_RECEIVE_FRACTURE)
//внёс перевод акцента речи, шипящий звук. Но я не смог осилить и он почему-то по прежнему не работает, похоже не тут настраивается -- ПУПС
diff --git a/code/modules/mob/living/carbon/human/species/skeleton.dm b/code/modules/mob/living/carbon/human/species/skeleton.dm
index d681f079b2a..86558736881 100644
--- a/code/modules/mob/living/carbon/human/species/skeleton.dm
+++ b/code/modules/mob/living/carbon/human/species/skeleton.dm
@@ -49,12 +49,12 @@
/datum/species/skeleton/on_species_gain(mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/emote_rattle
+ add_verb(H, /mob/living/carbon/human/proc/emote_rattle)
/datum/species/skeleton/on_species_loss(mob/living/carbon/human/H)
..()
- H.verbs -= /mob/living/carbon/human/proc/emote_rattle
+ remove_verb(H, /mob/living/carbon/human/proc/emote_rattle)
/datum/species/skeleton/handle_reagents(mob/living/carbon/human/H, datum/reagent/R)
diff --git a/code/modules/mob/living/carbon/human/species/skrell.dm b/code/modules/mob/living/carbon/human/species/skrell.dm
index e259a635760..b064040d05a 100644
--- a/code/modules/mob/living/carbon/human/species/skrell.dm
+++ b/code/modules/mob/living/carbon/human/species/skrell.dm
@@ -77,42 +77,46 @@
/datum/species/skrell/on_species_gain(mob/living/carbon/human/H)
..()
ADD_TRAIT(H, TRAIT_WATERBREATH, "species")
- H.verbs |= /mob/living/carbon/human/proc/emote_warble
- H.verbs |= /mob/living/carbon/human/proc/emote_sad_trill
- H.verbs |= /mob/living/carbon/human/proc/emote_joyfull_trill
- H.verbs |= /mob/living/carbon/human/proc/emote_croaking
- H.verbs |= /mob/living/carbon/human/proc/emote_discontent
- H.verbs |= /mob/living/carbon/human/proc/emote_relax
- H.verbs |= /mob/living/carbon/human/proc/emote_excitement
- H.verbs |= /mob/living/carbon/human/proc/emote_confusion
- H.verbs |= /mob/living/carbon/human/proc/emote_understand
- H.verbs -= /mob/living/carbon/human/verb/emote_grin
- H.verbs -= /mob/living/carbon/human/verb/emote_wink
- H.verbs -= /mob/living/carbon/human/verb/emote_eyebrow
- H.verbs -= /mob/living/carbon/human/verb/emote_glare
- H.verbs -= /mob/living/carbon/human/verb/emote_chuckle
- H.verbs -= /mob/living/carbon/human/verb/emote_frown
- H.verbs -= /mob/living/carbon/human/verb/emote_snuffle
+ add_verb(H, list(
+ /mob/living/carbon/human/proc/emote_warble,
+ /mob/living/carbon/human/proc/emote_sad_trill,
+ /mob/living/carbon/human/proc/emote_joyfull_trill,
+ /mob/living/carbon/human/proc/emote_croaking,
+ /mob/living/carbon/human/proc/emote_discontent,
+ /mob/living/carbon/human/proc/emote_relax,
+ /mob/living/carbon/human/proc/emote_excitement,
+ /mob/living/carbon/human/proc/emote_confusion,
+ /mob/living/carbon/human/proc/emote_understand))
+ remove_verb(H, list(
+ /mob/living/carbon/human/verb/emote_grin,
+ /mob/living/carbon/human/verb/emote_wink,
+ /mob/living/carbon/human/verb/emote_eyebrow,
+ /mob/living/carbon/human/verb/emote_glare,
+ /mob/living/carbon/human/verb/emote_chuckle,
+ /mob/living/carbon/human/verb/emote_frown,
+ /mob/living/carbon/human/verb/emote_snuffle))
/datum/species/skrell/on_species_loss(mob/living/carbon/human/H)
..()
REMOVE_TRAIT(H, TRAIT_WATERBREATH, "species")
- H.verbs -= /mob/living/carbon/human/proc/emote_warble
- H.verbs -= /mob/living/carbon/human/proc/emote_sad_trill
- H.verbs -= /mob/living/carbon/human/proc/emote_joyfull_trill
- H.verbs -= /mob/living/carbon/human/proc/emote_croaking
- H.verbs -= /mob/living/carbon/human/proc/emote_discontent
- H.verbs -= /mob/living/carbon/human/proc/emote_relax
- H.verbs -= /mob/living/carbon/human/proc/emote_excitement
- H.verbs -= /mob/living/carbon/human/proc/emote_confusion
- H.verbs -= /mob/living/carbon/human/proc/emote_understand
- H.verbs |= /mob/living/carbon/human/verb/emote_grin
- H.verbs |= /mob/living/carbon/human/verb/emote_wink
- H.verbs |= /mob/living/carbon/human/verb/emote_eyebrow
- H.verbs |= /mob/living/carbon/human/verb/emote_glare
- H.verbs |= /mob/living/carbon/human/verb/emote_chuckle
- H.verbs |= /mob/living/carbon/human/verb/emote_frown
- H.verbs |= /mob/living/carbon/human/verb/emote_snuffle
+ remove_verb(H, list(
+ /mob/living/carbon/human/proc/emote_warble,
+ /mob/living/carbon/human/proc/emote_sad_trill,
+ /mob/living/carbon/human/proc/emote_joyfull_trill,
+ /mob/living/carbon/human/proc/emote_croaking,
+ /mob/living/carbon/human/proc/emote_discontent,
+ /mob/living/carbon/human/proc/emote_relax,
+ /mob/living/carbon/human/proc/emote_excitement,
+ /mob/living/carbon/human/proc/emote_confusion,
+ /mob/living/carbon/human/proc/emote_understand))
+ add_verb(H, list(
+ /mob/living/carbon/human/verb/emote_grin,
+ /mob/living/carbon/human/verb/emote_wink,
+ /mob/living/carbon/human/verb/emote_eyebrow,
+ /mob/living/carbon/human/verb/emote_glare,
+ /mob/living/carbon/human/verb/emote_chuckle,
+ /mob/living/carbon/human/verb/emote_frown,
+ /mob/living/carbon/human/verb/emote_snuffle))
/datum/species/skrell/water_act(mob/living/carbon/human/M, volume, temperature, source, method)
diff --git a/code/modules/mob/living/carbon/human/species/slime.dm b/code/modules/mob/living/carbon/human/species/slime.dm
index 25b14dcb4fb..0faa382cd3d 100644
--- a/code/modules/mob/living/carbon/human/species/slime.dm
+++ b/code/modules/mob/living/carbon/human/species/slime.dm
@@ -96,9 +96,9 @@
ADD_TRAIT(H, TRAIT_WATERBREATH, "species")
RegisterSignal(H, COMSIG_HUMAN_UPDATE_DNA, PROC_REF(blend))
blend(H)
- H.verbs |= /mob/living/carbon/human/proc/emote_squish
- H.verbs |= /mob/living/carbon/human/proc/emote_bubble
- H.verbs |= /mob/living/carbon/human/proc/emote_pop
+ add_verb(H, /mob/living/carbon/human/proc/emote_squish)
+ add_verb(H, /mob/living/carbon/human/proc/emote_bubble)
+ add_verb(H, /mob/living/carbon/human/proc/emote_pop)
/datum/species/slime/on_species_loss(mob/living/carbon/human/H)
@@ -117,9 +117,9 @@
changebeard.Remove(H)
REMOVE_TRAIT(H, TRAIT_WATERBREATH, "species")
UnregisterSignal(H, COMSIG_HUMAN_UPDATE_DNA)
- H.verbs -= /mob/living/carbon/human/proc/emote_squish
- H.verbs -= /mob/living/carbon/human/proc/emote_bubble
- H.verbs -= /mob/living/carbon/human/proc/emote_pop
+ remove_verb(H, /mob/living/carbon/human/proc/emote_squish)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_bubble)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_pop)
/datum/species/slime/proc/blend(mob/living/carbon/human/H)
diff --git a/code/modules/mob/living/carbon/human/species/tajaran.dm b/code/modules/mob/living/carbon/human/species/tajaran.dm
index 32ab15ca666..dfbe69c40b3 100644
--- a/code/modules/mob/living/carbon/human/species/tajaran.dm
+++ b/code/modules/mob/living/carbon/human/species/tajaran.dm
@@ -86,16 +86,16 @@
/datum/species/tajaran/on_species_gain(mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/emote_wag
- H.verbs |= /mob/living/carbon/human/proc/emote_swag
- H.verbs |= /mob/living/carbon/human/proc/emote_purr
- H.verbs |= /mob/living/carbon/human/proc/emote_purrl
- H.verbs |= /mob/living/carbon/human/proc/emote_hiss_tajaran
+ add_verb(H, /mob/living/carbon/human/proc/emote_wag)
+ add_verb(H, /mob/living/carbon/human/proc/emote_swag)
+ add_verb(H, /mob/living/carbon/human/proc/emote_purr)
+ add_verb(H, /mob/living/carbon/human/proc/emote_purrl)
+ add_verb(H, /mob/living/carbon/human/proc/emote_hiss_tajaran)
/datum/species/tajaran/on_species_loss(mob/living/carbon/human/H)
..()
- H.verbs -= /mob/living/carbon/human/proc/emote_wag
- H.verbs -= /mob/living/carbon/human/proc/emote_swag
- H.verbs -= /mob/living/carbon/human/proc/emote_purr
- H.verbs -= /mob/living/carbon/human/proc/emote_purrl
- H.verbs -= /mob/living/carbon/human/proc/emote_hiss_tajaran
+ remove_verb(H, /mob/living/carbon/human/proc/emote_wag)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_swag)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_purr)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_purrl)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_hiss_tajaran)
diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm
index ffe9f2fcc37..57ff9fcc381 100644
--- a/code/modules/mob/living/carbon/human/species/unathi.dm
+++ b/code/modules/mob/living/carbon/human/species/unathi.dm
@@ -189,14 +189,15 @@
/datum/species/unathi/on_species_gain(mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/emote_wag
- H.verbs |= /mob/living/carbon/human/proc/emote_swag
- H.verbs |= /mob/living/carbon/human/proc/emote_hiss_unathi
- H.verbs |= /mob/living/carbon/human/proc/emote_roar
- H.verbs |= /mob/living/carbon/human/proc/emote_threat
- H.verbs |= /mob/living/carbon/human/proc/emote_whip
- H.verbs |= /mob/living/carbon/human/proc/emote_whip_l
- H.verbs |= /mob/living/carbon/human/proc/emote_rumble
+ add_verb(H, list(
+ /mob/living/carbon/human/proc/emote_wag,
+ /mob/living/carbon/human/proc/emote_swag,
+ /mob/living/carbon/human/proc/emote_hiss_unathi,
+ /mob/living/carbon/human/proc/emote_roar,
+ /mob/living/carbon/human/proc/emote_threat,
+ /mob/living/carbon/human/proc/emote_whip,
+ /mob/living/carbon/human/proc/emote_whip_l,
+ /mob/living/carbon/human/proc/emote_rumble))
var/datum/action/innate/tail_cut/lash = locate() in H.actions
if(!lash)
lash = new
@@ -204,15 +205,15 @@
/datum/species/unathi/on_species_loss(mob/living/carbon/human/H)
..()
- H.verbs -= /mob/living/carbon/human/proc/emote_wag
- H.verbs -= /mob/living/carbon/human/proc/emote_swag
- H.verbs -= /mob/living/carbon/human/proc/emote_hiss_unathi
- H.verbs -= /mob/living/carbon/human/proc/emote_roar
- H.verbs -= /mob/living/carbon/human/proc/emote_threat
- H.verbs -= /mob/living/carbon/human/proc/emote_whip
- H.verbs -= /mob/living/carbon/human/proc/emote_whip_l
- H.verbs -= /mob/living/carbon/human/proc/emote_rumble
-
+ remove_verb(H, list(
+ /mob/living/carbon/human/proc/emote_wag,
+ /mob/living/carbon/human/proc/emote_swag,
+ /mob/living/carbon/human/proc/emote_hiss_unathi,
+ /mob/living/carbon/human/proc/emote_roar,
+ /mob/living/carbon/human/proc/emote_threat,
+ /mob/living/carbon/human/proc/emote_whip,
+ /mob/living/carbon/human/proc/emote_whip_l,
+ /mob/living/carbon/human/proc/emote_rumble))
var/datum/action/innate/tail_cut/lash = locate() in H.actions
if(lash)
lash.Remove(H)
diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm
index 4ba41176316..8fb8b6c781d 100644
--- a/code/modules/mob/living/carbon/human/species/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/vox.dm
@@ -102,15 +102,15 @@
/datum/species/vox/on_species_gain(mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/emote_wag
- H.verbs |= /mob/living/carbon/human/proc/emote_swag
- H.verbs |= /mob/living/carbon/human/proc/emote_quill
+ add_verb(H, /mob/living/carbon/human/proc/emote_wag)
+ add_verb(H, /mob/living/carbon/human/proc/emote_swag)
+ add_verb(H, /mob/living/carbon/human/proc/emote_quill)
/datum/species/vox/on_species_loss(mob/living/carbon/human/H)
..()
- H.verbs -= /mob/living/carbon/human/proc/emote_wag
- H.verbs -= /mob/living/carbon/human/proc/emote_swag
- H.verbs -= /mob/living/carbon/human/proc/emote_quill
+ remove_verb(H, /mob/living/carbon/human/proc/emote_wag)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_swag)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_quill)
/datum/species/vox/after_equip_job(datum/job/J, mob/living/carbon/human/H)
if(!H.mind || !H.mind.assigned_role || H.mind.assigned_role != JOB_TITLE_CLOWN && H.mind.assigned_role != JOB_TITLE_MIME)
@@ -236,11 +236,11 @@
/datum/species/vox/armalis/on_species_gain(mob/living/carbon/human/H)
..()
if(/mob/living/carbon/human/proc/emote_wag in H.verbs)
- H.verbs -= /mob/living/carbon/human/proc/emote_wag
+ remove_verb(H, /mob/living/carbon/human/proc/emote_wag)
if(/mob/living/carbon/human/proc/emote_swag in H.verbs)
- H.verbs -= /mob/living/carbon/human/proc/emote_swag
+ remove_verb(H, /mob/living/carbon/human/proc/emote_swag)
/datum/species/vox/armalis/on_species_loss(mob/living/carbon/human/H)
..()
if(/mob/living/carbon/human/proc/emote_quill in H.verbs)
- H.verbs -= /mob/living/carbon/human/proc/emote_quill
+ remove_verb(H, /mob/living/carbon/human/proc/emote_quill)
diff --git a/code/modules/mob/living/carbon/human/species/vulpkanin.dm b/code/modules/mob/living/carbon/human/species/vulpkanin.dm
index 45ebdf469f4..9b340dc3673 100644
--- a/code/modules/mob/living/carbon/human/species/vulpkanin.dm
+++ b/code/modules/mob/living/carbon/human/species/vulpkanin.dm
@@ -73,14 +73,14 @@
/datum/species/vulpkanin/on_species_gain(mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/emote_wag
- H.verbs |= /mob/living/carbon/human/proc/emote_swag
- H.verbs |= /mob/living/carbon/human/proc/emote_howl
- H.verbs |= /mob/living/carbon/human/proc/emote_growl
+ add_verb(H, /mob/living/carbon/human/proc/emote_wag)
+ add_verb(H, /mob/living/carbon/human/proc/emote_swag)
+ add_verb(H, /mob/living/carbon/human/proc/emote_howl)
+ add_verb(H, /mob/living/carbon/human/proc/emote_growl)
/datum/species/vulpkanin/on_species_loss(mob/living/carbon/human/H)
..()
- H.verbs -= /mob/living/carbon/human/proc/emote_wag
- H.verbs -= /mob/living/carbon/human/proc/emote_swag
- H.verbs -= /mob/living/carbon/human/proc/emote_howl
- H.verbs -= /mob/living/carbon/human/proc/emote_growl
+ remove_verb(H, /mob/living/carbon/human/proc/emote_wag)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_swag)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_howl)
+ remove_verb(H, /mob/living/carbon/human/proc/emote_growl)
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index 416219b263d..6a3e320f784 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -83,13 +83,11 @@
/mob/living/carbon/proc/update_legcuffed_status()
if(legcuffed)
throw_alert(ALERT_LEGCUFFED, /atom/movable/screen/alert/restrained/legcuffed, new_master = legcuffed)
- if(m_intent == MOVE_INTENT_RUN)
- toggle_move_intent()
+ toggle_move_intent(MOVE_INTENT_WALK)
else
clear_alert(ALERT_LEGCUFFED)
- if(m_intent == MOVE_INTENT_WALK)
- toggle_move_intent()
+ toggle_move_intent(MOVE_INTENT_RUN)
update_inv_legcuffed()
@@ -167,122 +165,6 @@
I.do_break()
drop_item_ground(I, TRUE)
-
-/mob/living/carbon/show_inv(mob/user)
- user.set_machine(src)
-
- var/dat = {"
- Close
- "}
-
- var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 500)
- popup.set_content(dat)
- popup.open()
-
-
-/mob/living/carbon/Topic(href, href_list)
- ..()
- //strip panel
- if(usr.incapacitated() || !Adjacent(usr) || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED))
- return
-
- if(href_list["internal"])
- if(internal)
- visible_message(
- span_danger("[usr] пыта[pluralize_ru(usr.gender,"ет","ют")]ся закрыть воздушный клапан на баллоне у [name]!"),
- span_userdanger("[usr] пыта[pluralize_ru(usr.gender,"ет","ют")]ся закрыть воздушный клапан на Вашем баллоне!"),
- )
- if(!do_after(usr, POCKET_STRIP_DELAY, src, NONE) || !internal)
- return
- internal = null
- update_action_buttons_icon()
- else
- if(!has_airtight_items())
- to_chat(usr, span_warning("[name] не облада[pluralize_ru(gender,"ет","ют")] подходящей маской или шлемом!"))
- return
-
- var/list/airtanks = find_air_tanks()
- if(!length(airtanks))
- return
-
- var/obj/item/tank/our_tank
- if(length(airtanks) > 1)
- var/obj/item/tank/choice = tgui_input_list(usr, "Choose a tank to open valve on.", "Tank selection.", airtanks)
- if(!choice || usr.incapacitated() || !Adjacent(usr))
- return
- if(internal)
- to_chat(usr, span_warning("[name] уже име[pluralize_ru(gender,"ет","ют")] подключённый баллон."))
- return
- if(choice.loc != src)
- to_chat(usr, span_warning("[name] более не облада[pluralize_ru(gender,"ет","ют")] указанным баллоном."))
- return
- if(!has_airtight_items())
- to_chat(usr, span_warning("[name] более не облада[pluralize_ru(gender,"ет","ют")] подходящей маской или шлемом."))
- return
- our_tank = choice
- else
- our_tank = airtanks[1]
-
- visible_message(
- span_danger("[usr] пыта[pluralize_ru(usr.gender,"ет","ют")]ся открыть воздушный клапан на баллоне у [name]!"),
- span_userdanger("[usr] пыта[pluralize_ru(usr.gender,"ет","ют")]ся открыть воздушный клапан на Вашем баллоне!"),
- )
- if(!do_after(usr, POCKET_STRIP_DELAY, src, NONE))
- return
- if(internal)
- to_chat(usr, span_warning("[name] уже име[pluralize_ru(src.gender,"ет","ют")] подключённый баллон."))
- return
- if(our_tank.loc != src)
- to_chat(usr, span_warning("[name] более не облада[pluralize_ru(src.gender,"ет","ют")] баллоном."))
- return
- if(!has_airtight_items())
- to_chat(usr, span_warning("[name] более не облада[pluralize_ru(src.gender,"ет","ют")] подходящей маской или шлемом."))
- return
- internal = our_tank
- update_action_buttons_icon()
-
- for(var/mob/viewer as anything in viewers(1, src))
- if(viewer.machine == src)
- show_inv(viewer)
-
- visible_message(
- span_danger("[usr] [internal ? "открыва" : "закрыва"][pluralize_ru(usr.gender,"ет","ют")] воздушный клапан на баллоне у [name]!"),
- span_userdanger("[usr] [internal ? "открыва" : "закрыва"][pluralize_ru(usr.gender,"ет","ют")] воздушный клапан на Вашем баллоне!"),
- )
-
-
/mob/living/carbon/do_unEquip(obj/item/I, force = FALSE, atom/newloc, no_move = FALSE, invdrop = TRUE, silent = FALSE)
. = ..()
if(!. || !I)
@@ -511,12 +393,6 @@
return FALSE
-/mob/living/carbon/proc/find_air_tanks()
- . = list()
- for(var/obj/item/tank/tank in get_equipped_items(include_pockets = TRUE, include_hands = TRUE))
- . += tank
-
-
/mob/living/carbon/covered_with_thick_material(check_zone, full_body_check = FALSE)
if(full_body_check)
if(!isclothing(head))
@@ -549,3 +425,4 @@
return FALSE
+
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index dbf4b1908d1..14125f7c39c 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -19,7 +19,7 @@
stack_trace("Mob [type] has improper ventcrawler_trait value.")
if(mobility_flags & MOBILITY_REST)
- verbs += /mob/living/proc/toggle_resting
+ add_verb(src, /mob/living/proc/toggle_resting)
if(!density) // we want undense mobs to stay undense when they stop resting
ADD_TRAIT(src, TRAIT_UNDENSE, INNATE_TRAIT)
@@ -1278,43 +1278,6 @@
return HEARING_PROTECTION_NONE
-// The src mob is trying to strip an item from someone
-// Override if a certain type of mob should be behave differently when stripping items (can't, for example)
-/mob/living/stripPanelUnequip(obj/item/what, mob/who, where, silent = FALSE)
- if(HAS_TRAIT(what, TRAIT_NODROP))
- to_chat(src, "You can't remove \the [what.name], it appears to be stuck!")
- return
- if(!silent)
- who.visible_message("[src] tries to remove [who]'s [what.name].", \
- "[src] tries to remove [who]'s [what.name].")
- what.add_fingerprint(src)
- if(do_after(src, what.strip_delay, who, NONE))
- if(what && what == who.get_item_by_slot(where) && Adjacent(who))
- if(!who.drop_item_ground(what, silent = silent))
- return
- if(silent && !QDELETED(what) && isturf(what.loc))
- put_in_hands(what, silent = TRUE)
- add_attack_logs(src, who, "Stripped of [what]")
-
-// The src mob is trying to place an item on someone
-// Override if a certain mob should be behave differently when placing items (can't, for example)
-/mob/living/stripPanelEquip(obj/item/what, mob/who, where, silent = FALSE)
- what = get_active_hand()
- if(what && HAS_TRAIT(what, TRAIT_NODROP))
- to_chat(src, "You can't put \the [what.name] on [who], it's stuck to your hand!")
- return
- if(what)
- if(!what.mob_can_equip(who, where, TRUE, TRUE))
- to_chat(src, "\The [what.name] doesn't fit in that place!")
- return
- if(!silent)
- visible_message("[src] tries to put [what] on [who].")
- if(do_after(src, what.put_on_delay, who, NONE))
- if(what && Adjacent(who) && !HAS_TRAIT(what, TRAIT_NODROP))
- drop_item_ground(what, silent = silent)
- who.equip_to_slot_if_possible(what, where, disable_warning = TRUE, initial = silent)
- add_attack_logs(src, who, "Equipped [what]")
-
/mob/living/singularity_act()
investigate_log("([key_name_log(src)]) has been consumed by the singularity.", INVESTIGATE_ENGINE) //Oh that's where the clown ended up!
gib()
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index 1ec02c2323c..c4eac47be7d 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -113,22 +113,30 @@
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/bulky_push, multiplicative_slowdown = pushing_obj.pull_push_slowdown)
-/mob/living/toggle_move_intent()
+/mob/living/proc/can_change_move_intent(silent = FALSE)
+ return TRUE
+
+
+/mob/living/toggle_move_intent(new_move_intent)
+ if(new_move_intent && m_intent == new_move_intent)
+ return
if(SEND_SIGNAL(src, COMSIG_MOB_MOVE_INTENT_TOGGLE, m_intent) & COMPONENT_BLOCK_INTENT_TOGGLE)
return
+ if(!can_change_move_intent())
+ return
- var/icon_toggle
- if(m_intent == MOVE_INTENT_RUN)
- m_intent = MOVE_INTENT_WALK
- icon_toggle = "walking"
+ if(new_move_intent)
+ m_intent = new_move_intent
else
- m_intent = MOVE_INTENT_RUN
- icon_toggle = "running"
+ switch(m_intent)
+ if(MOVE_INTENT_RUN)
+ m_intent = MOVE_INTENT_WALK
+ if(MOVE_INTENT_WALK)
+ m_intent = MOVE_INTENT_RUN
- if(hud_used && hud_used.move_intent && hud_used.static_inventory)
- hud_used.move_intent.icon_state = icon_toggle
+ if(hud_used?.move_intent && hud_used.static_inventory)
for(var/atom/movable/screen/mov_intent/selector in hud_used.static_inventory)
- selector.update_icon()
+ selector.update_icon(UPDATE_ICON_STATE)
update_move_intent_slowdown()
SEND_SIGNAL(src, COMSIG_MOB_MOVE_INTENT_TOGGLED)
@@ -346,3 +354,10 @@
end_look_down()
else
look_down()
+
+
+/mob/living/keybind_face_direction(direction)
+ if(stat > CONSCIOUS)
+ return
+ return ..()
+
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 1222febc8e6..735e0ed7429 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -46,7 +46,6 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
mob_size = MOB_SIZE_LARGE
sight = SEE_TURFS | SEE_MOBS | SEE_OBJS
nightvision = 8
- can_strip = 0
can_buckle_to = FALSE
var/list/network = list("SS13","Telecomms","Research Outpost","Mining Outpost")
var/obj/machinery/camera/current = null
@@ -114,12 +113,15 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
var/list/all_eyes = list()
/mob/living/silicon/ai/proc/add_ai_verbs()
- verbs |= GLOB.ai_verbs_default
- verbs |= silicon_subsystems
+ add_verb(src, GLOB.ai_verbs_default)
+ add_verb(src, silicon_subsystems)
+
+/mob/living/silicon/ai/can_strip()
+ return FALSE
/mob/living/silicon/ai/proc/remove_ai_verbs()
- verbs -= GLOB.ai_verbs_default
- verbs -= silicon_subsystems
+ remove_verb(src, GLOB.ai_verbs_default)
+ remove_verb(src, silicon_subsystems)
/mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/mmi/B, var/safety = 0)
announcement = new()
@@ -154,7 +156,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
else
make_laws()
- verbs += /mob/living/silicon/ai/proc/show_laws_verb
+ add_verb(src, /mob/living/silicon/ai/proc/show_laws_verb)
aiMulti = new(src)
aiRadio = new(src)
@@ -239,13 +241,13 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
job = JOB_TITLE_AI
-/mob/living/silicon/ai/Stat()
- ..()
- if(statpanel("Status"))
- if(stat)
- stat(null, text("Systems nonfunctional"))
- return
- show_borg_info()
+/mob/living/silicon/ai/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+ if(stat)
+ status_tab_data[++status_tab_data.len] = list("System status:", "Nonfunctional")
+ return
+ status_tab_data = show_borg_info(status_tab_data)
/mob/living/silicon/ai/proc/ai_alerts()
var/list/dat = list("Current Station Alerts\n")
@@ -287,10 +289,9 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
var/dat_text = dat.Join("")
src << browse(dat_text, "window=aialerts&can_close=0")
-/mob/living/silicon/ai/proc/show_borg_info()
- stat(null, text("Connected cyborgs: [connected_robots.len]"))
- for(var/thing in connected_robots)
- var/mob/living/silicon/robot/R = thing
+/mob/living/silicon/ai/proc/show_borg_info(list/status_tab_data)
+ status_tab_data[++status_tab_data.len] = list("Connected cyborg count:", "[length(connected_robots)]")
+ for(var/mob/living/silicon/robot/R in connected_robots)
var/robot_status = "Nominal"
if(R.stat || !R.client)
robot_status = "OFFLINE"
@@ -299,8 +300,9 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
// Name, Health, Battery, Module, Area, and Status! Everything an AI wants to know about its borgies!
var/area/A = get_area(R)
var/area_name = A ? sanitize(A.name) : "Unknown"
- stat(null, text("[R.name] | S.Integrity: [R.health]% | Cell: [R.cell ? "[R.cell.charge] / [R.cell.maxcharge]" : "Empty"] | \
- Module: [R.designation] | Loc: [area_name] | Status: [robot_status]"))
+ status_tab_data[++status_tab_data.len] = list("[R.name]:", "S.Integrity: [R.health]% | Cell: [R.cell ? "[R.cell.charge] / [R.cell.maxcharge]" : "Empty"] | \
+ Module: [R.designation] | Loc: [area_name] | Status: [robot_status]")
+ return status_tab_data
/mob/living/silicon/ai/rename_character(oldname, newname)
if(!..(oldname, newname))
diff --git a/code/modules/mob/living/silicon/ai/ai_say.dm b/code/modules/mob/living/silicon/ai/ai_say.dm
index a2d78a66fd6..55bbb4c2711 100644
--- a/code/modules/mob/living/silicon/ai/ai_say.dm
+++ b/code/modules/mob/living/silicon/ai/ai_say.dm
@@ -193,13 +193,3 @@ GLOBAL_VAR_INIT(announcing_vox, 0) // Stores the time of the last announcement
return TRUE
return FALSE
-
-// VOX sounds moved to /code/defines/vox_sounds.dm
-
-/client/proc/preload_vox()
- var/list/vox_files = flist(VOX_PATH)
- for(var/file in vox_files)
-// to_chat(src, "Downloading [file]")
- var/sound/S = sound("[VOX_PATH][file]")
- src << browse_rsc(S)
-
diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
index 78f600729ac..e5872075dff 100644
--- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
@@ -186,21 +186,3 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new())
if(chunk.visibleTurfs[position])
return TRUE
return FALSE
-
-/*
-/datum/cameranet/proc/stat_entry()
- if(!statclick)
- statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
-
- stat(name, statclick.update("Cameras: [cameranet.cameras.len] | Chunks: [cameranet.chunks.len]"))
-*/
-
-// Debug verb for VVing the chunk that the turf is in.
-/*
-/turf/verb/view_chunk()
- set src in world
-
- if(cameranet.chunkGenerated(x, y, z))
- var/datum/camerachunk/chunk = cameranet.getCameraChunk(x, y, z)
- usr.client.debug_variables(chunk)
-*/
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index ebf285e7a1e..047918093c7 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -130,9 +130,9 @@
add_language(LANGUAGE_TRINARY, 1)
//Verbs for pAI mobile form, chassis and Say flavor text
- verbs += /mob/living/silicon/pai/proc/choose_chassis
- verbs += /mob/living/silicon/pai/proc/choose_verbs
- verbs += /mob/living/silicon/pai/proc/pai_change_voice
+ add_verb(src, /mob/living/silicon/pai/proc/choose_chassis)
+ add_verb(src, /mob/living/silicon/pai/proc/choose_verbs)
+ add_verb(src, /mob/living/silicon/pai/proc/pai_change_voice)
var/datum/action/innate/pai_soft/P = new
P.Grant(src)
@@ -183,14 +183,13 @@
/mob/living/silicon/pai/proc/show_silenced()
if(silence_time)
var/timeleft = round((silence_time - world.timeofday)/10 ,1)
- stat(null, "Communications system reboot in -[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
+ return list("Communications system reboot in:", "-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
-/mob/living/silicon/pai/Stat()
- ..()
- statpanel("Status")
- if(client.statpanel == "Status")
- show_silenced()
+/mob/living/silicon/pai/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+ status_tab_data[++status_tab_data.len] = show_silenced()
/mob/living/silicon/pai/blob_act()
@@ -363,7 +362,7 @@
finalized = alert("Look at your sprite. Is this what you wish to use?",,"No","Yes")
chassis = my_choices[choice]
- verbs -= /mob/living/silicon/pai/proc/choose_chassis
+ remove_verb(src, /mob/living/silicon/pai/proc/choose_chassis)
/mob/living/silicon/pai/proc/choose_verbs()
set category = "pAI Commands"
@@ -377,7 +376,7 @@
speak_exclamation = sayverbs[(sayverbs.len>1 ? 2 : sayverbs.len)]
speak_query = sayverbs[(sayverbs.len>2 ? 3 : sayverbs.len)]
- verbs -= /mob/living/silicon/pai/proc/choose_verbs
+ remove_verb(src, /mob/living/silicon/pai/proc/choose_verbs)
/mob/living/silicon/pai/proc/pai_change_voice()
set name = "Change Voice"
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index ecf52ae0781..9f26a63bafb 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -85,7 +85,7 @@
var/datum/robot_component/C = components[V]
C.max_damage = 10
- verbs -= /mob/living/silicon/robot/verb/Namepick
+ remove_verb(src, /mob/living/silicon/robot/verb/Namepick)
module = new /obj/item/robot_module/drone(src)
//Allows Drones to hear the Engineering channel.
@@ -105,6 +105,8 @@
scanner.Grant(src)
update_icons()
+/mob/living/silicon/robot/drone/add_strippable_element()
+ return
/mob/living/silicon/robot/drone/Initialize(mapload)
. = ..()
@@ -121,7 +123,7 @@
/mob/living/silicon/robot/drone/init(alien = FALSE, mob/living/silicon/ai/ai_to_sync_to = null)
laws = new /datum/ai_laws/drone()
- connected_ai = null
+ set_connected_ai(null)
aiCamera = new/obj/item/camera/siliconcam/drone_camera(src)
additional_law_channels["Drone"] = get_language_prefix(LANGUAGE_DRONE_BINARY)
@@ -260,7 +262,7 @@
holder_type = /obj/item/holder/drone/emagged
update_icons()
lawupdate = 0
- connected_ai = null
+ set_connected_ai(null)
clear_supplied_laws()
clear_inherent_laws()
laws = new /datum/ai_laws/syndicate_override
@@ -391,10 +393,10 @@
return FALSE
/mob/living/silicon/robot/drone/add_robot_verbs()
- src.verbs |= silicon_subsystems
+ add_verb(src, silicon_subsystems)
/mob/living/silicon/robot/drone/remove_robot_verbs()
- src.verbs -= silicon_subsystems
+ remove_verb(src, silicon_subsystems)
/mob/living/simple_animal/drone/flash_eyes(intensity = 1, override_blindness_check, affect_silicon, visual, type = /atom/movable/screen/fullscreen/flash/noise)
if(affect_silicon)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
index 3bdb865aec3..8260877b6e8 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
@@ -75,7 +75,7 @@
icon = 'icons/mob/custom_synthetic/custom-synthetic.dmi'
icon_state = "[ckey]-drone"
to_chat(src, "You reconfigure your chassis and improve the station through your new aesthetics.")
- verbs -= /mob/living/silicon/robot/drone/verb/customize
+ remove_verb(src, /mob/living/silicon/robot/drone/verb/customize)
/mob/living/silicon/robot/drone/get_scooped(mob/living/carbon/grabber)
var/obj/item/holder/H = ..()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 8f94c372046..9683704635c 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -194,6 +194,10 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
if(length(module?.borg_skins) <= 1 && (has_transform_animation || module?.has_transform_animation))
transform_animation(icon_state, TRUE)
+ add_strippable_element()
+
+/mob/living/silicon/robot/proc/add_strippable_element()
+ AddElement(/datum/element/strippable, create_strippable_list(list(/datum/strippable_item/borg_head)))
/mob/living/silicon/robot/proc/init(alien, connect_to_AI = TRUE, mob/living/silicon/ai/ai_to_sync_to = null)
@@ -476,6 +480,8 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
status_flags &= ~CANPUSH
choose_icon()
+ if(client.stat_tab == "Status")
+ SSstatpanels.set_status_tab(client)
if(!static_radio_channels)
radio.config(module.channels)
notify_ai(ROBOT_NOTIFY_AI_MODULE)
@@ -611,12 +617,12 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
toggle_sensor_mode()
/mob/living/silicon/robot/proc/add_robot_verbs()
- src.verbs |= GLOB.robot_verbs_default
- src.verbs |= silicon_subsystems
+ add_verb(src, GLOB.robot_verbs_default)
+ add_verb(src, silicon_subsystems)
/mob/living/silicon/robot/proc/remove_robot_verbs()
- src.verbs -= GLOB.robot_verbs_default
- src.verbs -= silicon_subsystems
+ remove_verb(src, GLOB.robot_verbs_default)
+ remove_verb(src, silicon_subsystems)
/mob/living/silicon/robot/verb/cmd_robot_alerts()
set category = "Robot Commands"
@@ -700,25 +706,34 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
// this function displays the cyborgs current cell charge in the stat panel
/mob/living/silicon/robot/proc/show_cell_power()
- if(cell)
- stat(null, text("Charge Left: [cell.charge]/[cell.maxcharge]"))
- else
- stat(null, text("No Cell Inserted!"))
+ return list("Charge Left:", cell ? "[cell.charge]/[cell.maxcharge]" : "No Cell Inserted!")
+
+
+/mob/living/silicon/robot/proc/show_gps_coords()
+ var/turf/turf = get_turf(src)
+ return list("GPS:", "[COORD(turf)]")
+
+
+/mob/living/silicon/robot/proc/show_stack_energy(datum/robot_energy_storage/robot_energy_storage)
+ return list("[robot_energy_storage.name]:", "[robot_energy_storage.energy] / [robot_energy_storage.max_energy]")
// update the status screen display
-/mob/living/silicon/robot/Stat()
- ..()
- statpanel("Status")
- if(client.statpanel == "Status")
- show_cell_power()
+/mob/living/silicon/robot/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+
+ status_tab_data[++status_tab_data.len] = show_cell_power()
+
+ if(!module)
+ return
+
var/total_user_contents = GetAllContents()
if(locate(/obj/item/gps) in total_user_contents)
- var/turf/T = get_turf(src)
- stat(null, "GPS: [COORD(T)]")
- if(module)
- for(var/datum/robot_energy_storage/st in module.storages)
- stat("[st.name]:", "[st.energy]/[st.max_energy]")
+ status_tab_data[++status_tab_data.len] = show_gps_coords()
+
+ for(var/datum/robot_energy_storage/robot_energy_storage in module.storages)
+ status_tab_data[++status_tab_data.len] = show_stack_energy(robot_energy_storage)
/mob/living/silicon/robot/InCritical()
@@ -1456,7 +1471,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
if(R)
R.UnlinkSelf()
to_chat(R, "Buffers flushed and reset. Camera system shutdown. All systems operational.")
- src.verbs -= /mob/living/silicon/robot/proc/ResetSecurityCodes
+ remove_verb(src, /mob/living/silicon/robot/proc/ResetSecurityCodes)
/mob/living/silicon/robot/mode()
set name = "Activate Held Object"
@@ -1553,14 +1568,12 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
/mob/living/silicon/robot/proc/disconnect_from_ai()
if(connected_ai)
sync() // One last sync attempt
- connected_ai.connected_robots -= src
- connected_ai = null
+ set_connected_ai(null)
/mob/living/silicon/robot/proc/connect_to_ai(var/mob/living/silicon/ai/AI)
if(AI && AI != connected_ai)
disconnect_from_ai()
- connected_ai = AI
- connected_ai.connected_robots |= src
+ set_connected_ai(AI)
notify_ai(ROBOT_NOTIFY_AI_CONNECTED)
sync()
@@ -1585,6 +1598,17 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
if(2)
disable_component("comms", 60)
+/mob/living/silicon/robot/proc/set_connected_ai(new_ai)
+ if(connected_ai == new_ai)
+ return
+ . = connected_ai
+ connected_ai = new_ai
+ if(.)
+ var/mob/living/silicon/ai/old_ai = .
+ old_ai.connected_robots -= src
+ if(connected_ai)
+ connected_ai.connected_robots |= src
+
/mob/living/silicon/robot/deathsquad
base_icon = "nano_bloodhound"
icon_state = "nano_bloodhound"
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 068add435cf..6255a69e300 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -139,14 +139,14 @@
R.add_language(LANGUAGE_MOTH, 0)
/obj/item/robot_module/proc/add_subsystems_and_actions(mob/living/silicon/robot/R)
- R.verbs |= subsystems
+ add_verb(R, subsystems)
for(var/A in module_actions)
var/datum/action/act = new A()
act.Grant(R)
R.module_actions += act
/obj/item/robot_module/proc/remove_subsystems_and_actions(mob/living/silicon/robot/R)
- R.verbs -= subsystems
+ remove_verb(R, subsystems)
for(var/datum/action/A in R.module_actions)
A.Remove(R)
qdel(A)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 064eb186709..f60ba9d0947 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -266,18 +266,14 @@
// this function shows the health of the pAI in the Status panel
/mob/living/silicon/proc/show_system_integrity()
- if(!src.stat)
- stat(null, text("System integrity: [round((health/maxHealth)*100)]%"))
- else
- stat(null, text("Systems nonfunctional"))
+ return list("System integrity:", stat ? "Nonfunctional" : "[round((health / maxHealth) * 100)]%")
// This adds the basic clock, shuttle recall timer, and malf_ai info to all silicon lifeforms
-/mob/living/silicon/Stat()
- ..()
- if(statpanel("Status"))
- show_stat_emergency_shuttle_eta()
- show_system_integrity()
+/mob/living/silicon/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+ status_tab_data[++status_tab_data.len] = show_system_integrity()
//Silicon mob language procs
diff --git a/code/modules/mob/living/silicon/silicon_hat.dm b/code/modules/mob/living/silicon/silicon_hat.dm
index 9a137255af8..25cad73fa5f 100644
--- a/code/modules/mob/living/silicon/silicon_hat.dm
+++ b/code/modules/mob/living/silicon/silicon_hat.dm
@@ -1,5 +1,30 @@
+/datum/strippable_item/borg_head
+ key = STRIPPABLE_ITEM_HEAD
+
+/datum/strippable_item/borg_head/get_item(atom/source)
+ var/mob/living/silicon/borg_source = source
+ if(!istype(borg_source))
+ return
+
+ return borg_source.inventory_head
+
+/datum/strippable_item/borg_head/finish_equip(atom/source, obj/item/equipping, mob/user)
+ var/mob/living/silicon/borg_source = source
+ if(!istype(borg_source))
+ return
+
+ borg_source.place_on_head(equipping, user)
+
+/datum/strippable_item/borg_head/finish_unequip(atom/source, mob/user)
+ var/mob/living/silicon/borg_source = source
+ if(!istype(borg_source))
+ return
+
+ borg_source.remove_from_head(user)
+
/mob/living/silicon
var/obj/item/inventory_head
+ var/list/strippable_inventory_slots = list()
var/hat_offset_y = -3
var/isCentered = FALSE //центрирован ли синтетик. Если нет, то шляпа будет растянута
@@ -127,37 +152,6 @@
return
. = ..()
-
-/mob/living/silicon/Topic(href, href_list)
- if(..())
- return 1
-
- if(!(iscarbon(usr) || usr.incapacitated() || !Adjacent(usr)))
- usr << browse(null, "window=mob[UID()]")
- usr.unset_machine()
- return
-
- if (!canBeHatted)
- return 0
-
- if(href_list["remove_inv"])
- var/remove_from = href_list["remove_inv"]
- switch(remove_from)
- if("head")
- remove_from_head(usr)
- show_inv(usr)
-
- else if(href_list["add_inv"])
- var/add_to = href_list["add_inv"]
- switch(add_to)
- if("head")
- place_on_head(usr.get_active_hand(), usr)
- show_inv(usr)
-
- if(usr != src)
- return 1
-
-
/mob/living/silicon/proc/get_hat_overlay()
if(hat_icon_file && hat_icon_state)
var/image/borgI = image(hat_icon_file, hat_icon_state)
@@ -168,18 +162,6 @@
borgI.transform = matrix(1.125, 0, 0.5, 0, 1, 0)
return borgI
-/mob/living/silicon/show_inv(mob/user)
- if(user.incapacitated() || !Adjacent(user))
- return
- user.set_machine(src)
-
- var/dat = {"Inventory of [name]
"}
- dat += "
Head: [inventory_head]" : "add_inv=head'>Nothing"]"
-
- var/datum/browser/popup = new(user, "mob[UID()]", "[src]", 440, 250)
- popup.set_content(dat)
- popup.open()
-
/mob/living/silicon/proc/place_on_head(obj/item/item_to_add, mob/user)
if(!item_to_add)
user.visible_message("[user] похлопывает по голове [src].", "Вы положили руку на голову [src].")
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 831fa07181c..e875735faf7 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -14,8 +14,8 @@
has_unlimited_silicon_privilege = TRUE
sentience_type = SENTIENCE_ARTIFICIAL
status_flags = NONE //no default canpush
- can_strip = FALSE
pass_flags = PASSFLAPS
+ AI_delay_max = 0 SECONDS
speak_emote = list("states")
tts_seed = null
@@ -227,11 +227,14 @@
path_hud.add_hud_to(src)
+
/mob/living/simple_animal/bot/proc/add_bot_filter()
if(QDELETED(src) || !SSradio || !bot_filter)
return
SSradio.add_object(bot_core, control_freq, bot_filter)
+/mob/living/simple_animal/bot/can_strip()
+ return FALSE
/mob/living/simple_animal/bot/med_hud_set_health()
return diag_hud_set_bothealth() //we use a different hud
@@ -1010,10 +1013,6 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r
frustration = 0
-/mob/living/simple_animal/bot/show_inv()
- return
-
-
/mob/living/simple_animal/bot/proc/show_controls(mob/user)
users |= user
var/dat = {""}
diff --git a/code/modules/mob/living/simple_animal/friendly/diona.dm b/code/modules/mob/living/simple_animal/friendly/diona.dm
index 08c05107757..99c05aec6de 100644
--- a/code/modules/mob/living/simple_animal/friendly/diona.dm
+++ b/code/modules/mob/living/simple_animal/friendly/diona.dm
@@ -107,14 +107,59 @@
//Let people pick the little buggers up.
if(M.a_intent == INTENT_HELP)
if(isdiona(M))
- to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.")
- to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.")
- throw_alert(gestalt_alert, /atom/movable/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist
- forceMove(M)
+ gestalt_heal(M)
else
get_scooped(M)
else
..()
+/mob/living/simple_animal/diona/MouseDrop(mob/living/carbon/human/user, src_location, over_location, src_control, over_control, params)
+ if(isdiona(user)) // diona with NO HANDS?? Now it's not trouble.
+ gestalt_heal(user)
+ return FALSE
+ return ..()
+
+/mob/living/simple_animal/diona/proc/gestalt_heal(mob/living/carbon/human/M)
+ if(!Adjacent(M))
+ return FALSE
+ forceMove(M)
+ if(stat != CONSCIOUS)
+ qdel(src)
+ to_chat(M, span_notice("Тело нимфы сливается с вашим гештальтом."))
+ return TRUE // TRUE if nymph was deleted, FALSE - if not. Maybe I need this later..
+
+ if(ckey)
+ to_chat(src, span_notice("Ваше сознание соединяется с [M], когда вы сливаетесь с гештальтом."))
+ to_chat(M, span_notice("Ваше сознание соединяется с нимфой, когда она сливается с гештальтом."))
+ throw_alert(gestalt_alert, /atom/movable/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist
+ return FALSE
+
+ to_chat(M, span_notice("Вы начинаете принимать нимфу в свой гештальт."))
+
+ if(!ckey && do_after(M, 5 SECONDS, M, ALL))
+ var/list/stock_limbs = /datum/species/diona::has_limbs
+ for(var/limb_zone in stock_limbs)
+ if(!M.bodyparts_by_name[limb_zone])
+ var/list/organ_data = stock_limbs[limb_zone]
+ var/limb_path = organ_data["path"]
+ var/obj/item/organ/new_organ = new limb_path(M)
+ organ_data["descriptor"] = new_organ.name
+ to_chat(M, span_notice("Нимфа занимает пустующее место в гештальте в качестве конечности."))
+ M.recalculate_limbs_status()
+ M.regenerate_icons()
+ qdel(src)
+ return TRUE
+
+ var/list/stock_organs = /datum/species/diona::has_organ
+ for(var/organ_slot in stock_organs)
+ if(!M.internal_organs_slot[organ_slot])
+ var/organ_path = stock_organs[organ_slot]
+ new organ_path(M)
+ to_chat(M, span_notice("Нимфа занимает пустующее место в гештальте в качестве органа."))
+ qdel(src)
+ return TRUE
+
+ to_chat(M, span_notice("Ваше сознание соединяется с нимфой, когда она сливается с гештальтом."))
+ return FALSE
/mob/living/simple_animal/diona/proc/merge()
if(stat != CONSCIOUS)
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 2a260ce33d4..01d22d6e09f 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -30,11 +30,19 @@
var/growl_sound = list('sound/creatures/dog_grawl1.ogg','sound/creatures/dog_grawl2.ogg') //Used in emote.
var/yelp_sound = 'sound/creatures/dog_yelp.ogg' //Used on death.
var/last_eaten = 0
+ var/had_fashion
+ ///Currently worn item on the head slot
+ var/obj/item/inventory_head = null
+ ///Currently worn item on the back slot
+ var/obj/item/inventory_back = null
+ ///Currently wotn item oh the mask slot
+ var/obj/item/inventory_mask = null
+ ///Item slots that are available for this dog to equip stuff into
+ var/list/strippable_inventory_slots = list()
footstep_type = FOOTSTEP_MOB_CLAW
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/dog = 4)
collar_type = "dog"
-
/mob/living/simple_animal/pet/dog/verb/chasetail()
set name = "Chase your tail"
set desc = "d'awwww."
@@ -69,6 +77,12 @@
if(M && stat != DEAD) // Same check here, even though emote checks it as well (poor form to check it only in the help case)
custom_emote(EMOTE_VISIBLE, "рыч%(ит,ат)%!")
+/mob/living/simple_animal/pet/dog/proc/place_on_head(obj/item/item_to_add, mob/user)
+ return
+
+/mob/living/simple_animal/pet/dog/proc/update_dog_fluff()
+ return
+
//Corgis and pugs are now under one dog subtype
/mob/living/simple_animal/pet/dog/corgi
name = "\improper corgi"
@@ -81,8 +95,6 @@
childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
animal_species = /mob/living/simple_animal/pet/dog
collar_type = "corgi"
- var/obj/item/inventory_head
- var/obj/item/inventory_back
var/shaved = FALSE
var/nofur = FALSE //Corgis that have risen past the material plane of existence.
tts_seed = "Stetmann"
@@ -92,6 +104,9 @@
. = ..()
regenerate_icons()
+/mob/living/simple_animal/pet/dog/corgi/add_strippable_element()
+ AddElement(/datum/element/strippable, length(strippable_inventory_slots) ? create_strippable_list(strippable_inventory_slots) : GLOB.strippable_corgi_items)
+
/mob/living/simple_animal/pet/dog/corgi/Destroy()
QDEL_NULL(inventory_head)
QDEL_NULL(inventory_back)
@@ -114,21 +129,6 @@
..(gibbed)
regenerate_icons()
-/mob/living/simple_animal/pet/dog/corgi/show_inv(mob/user)
- if(user.incapacitated() || !Adjacent(user))
- return
- user.set_machine(src)
-
-
- var/dat = {"
Inventory of [name]
"}
- dat += "
Head: [inventory_head]" : "add_inv=head'>Nothing"]"
- dat += "
Back: [inventory_back]" : "add_inv=back'>Nothing"]"
- dat += "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]"
-
- var/datum/browser/popup = new(user, "mob[UID()]", "[src]", 440, 250)
- popup.set_content(dat)
- popup.open()
-
/mob/living/simple_animal/pet/dog/corgi/getarmor(def_zone, type)
var/armorval = 0
@@ -168,116 +168,14 @@
icon_state = icon_dead
return
..()
- update_corgi_fluff()
-
-/mob/living/simple_animal/pet/dog/corgi/Topic(href, href_list)
- if(!(iscarbon(usr) || isrobot(usr)) || usr.incapacitated() || !Adjacent(usr))
- usr << browse(null, "window=mob[UID()]")
- usr.unset_machine()
- return
-
- //Removing from inventory
- if(href_list["remove_inv"])
- var/remove_from = href_list["remove_inv"]
- switch(remove_from)
- if("head")
- if(inventory_head)
- if(HAS_TRAIT(inventory_head, TRAIT_NODROP))
- to_chat(usr, "\The [inventory_head] is stuck too hard to [src] for you to remove!")
- return
- drop_item_ground(inventory_head)
- usr.put_in_hands(inventory_head, ignore_anim = FALSE)
- inventory_head = null
- update_corgi_fluff()
- regenerate_icons()
- else
- to_chat(usr, "There is nothing to remove from its [remove_from].")
- return
- if("back")
- if(inventory_back)
- if(HAS_TRAIT(inventory_back, TRAIT_NODROP))
- to_chat(usr, "\The [inventory_head] is stuck too hard to [src] for you to remove!")
- return
- drop_item_ground(inventory_back)
- usr.put_in_hands(inventory_back, ignore_anim = FALSE)
- inventory_back = null
- update_corgi_fluff()
- regenerate_icons()
- else
- to_chat(usr, "There is nothing to remove from its [remove_from].")
- return
- if("collar")
- if(pcollar)
- var/the_collar = pcollar
- drop_item_ground(pcollar)
- usr.put_in_hands(the_collar, ignore_anim = FALSE)
- pcollar = null
- update_corgi_fluff()
- regenerate_icons()
-
- show_inv(usr)
-
- //Adding things to inventory
- else if(href_list["add_inv"])
- var/add_to = href_list["add_inv"]
-
- switch(add_to)
- if("collar")
- add_collar(usr.get_active_hand(), usr)
- update_corgi_fluff()
-
- if("head")
- place_on_head(usr.get_active_hand(),usr)
-
- if("back")
- if(inventory_back)
- to_chat(usr, "It's already wearing something!")
- return
- else
- var/obj/item/item_to_add = usr.get_active_hand()
-
- if(!item_to_add)
- usr.visible_message("[usr] pets [src].", "You rest your hand on [src]'s back for a moment.")
- return
-
- if(!usr.drop_item_ground(item_to_add))
- to_chat(usr, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!")
- return
-
- if(istype(item_to_add, /obj/item/grenade/plastic/c4)) // last thing he ever wears, I guess
- item_to_add.afterattack(src,usr,1)
- return
-
- //The objects that corgis can wear on their backs.
- var/allowed = FALSE
- if(ispath(item_to_add.dog_fashion, /datum/dog_fashion/back))
- allowed = TRUE
-
- if(!allowed)
- to_chat(usr, "You set [item_to_add] on [src]'s back, but it falls off!")
- item_to_add.forceMove(drop_location())
- if(prob(25))
- step_rand(item_to_add)
- for(var/i in list(1,2,4,8,4,8,4,dir))
- setDir(i)
- sleep(1)
- return
-
- item_to_add.forceMove(src)
- inventory_back = item_to_add
- update_corgi_fluff()
- regenerate_icons()
-
- show_inv(usr)
- else
- return ..()
+ update_dog_fluff()
//Corgis are supposed to be simpler, so only a select few objects can actually be put
//to be compatible with them. The objects are below.
//Many hats added, Some will probably be removed, just want to see which ones are popular.
// > some will probably be removed
-/mob/living/simple_animal/pet/dog/corgi/proc/place_on_head(obj/item/item_to_add, mob/user)
+/mob/living/simple_animal/pet/dog/corgi/place_on_head(obj/item/item_to_add, mob/user)
if(istype(item_to_add, /obj/item/grenade/plastic/c4)) // last thing he ever wears, I guess
item_to_add.afterattack(src,user,1)
@@ -312,7 +210,7 @@
"You hear a friendly-sounding bark.")
item_to_add.forceMove(src)
inventory_head = item_to_add
- update_corgi_fluff()
+ update_dog_fluff()
regenerate_icons()
else
to_chat(user, "You set [item_to_add] on [src]'s head, but it falls off!")
@@ -325,7 +223,7 @@
return valid
-/mob/living/simple_animal/pet/dog/corgi/proc/update_corgi_fluff()
+/mob/living/simple_animal/pet/dog/corgi/update_dog_fluff()
// First, change back to defaults
name = real_name
desc = initial(desc)
@@ -585,7 +483,7 @@
visible_message("... Aw, someone beat me to this one.")
P.gib()
-/mob/living/simple_animal/pet/dog/corgi/narsie/update_corgi_fluff()
+/mob/living/simple_animal/pet/dog/corgi/narsie/update_dog_fluff()
..()
speak = list("Tari'karat-pasnar!", "IA! IA!", "BRRUUURGHGHRHR")
speak_emote = list("growls", "barks ominously")
@@ -609,7 +507,7 @@
maxHealth = 100
health = 100
-/mob/living/simple_animal/pet/dog/corgi/ratvar/update_corgi_fluff()
+/mob/living/simple_animal/pet/dog/corgi/ratvar/update_dog_fluff()
..()
speak = list("V'z fuvavat jneevbe!", "CLICK!", "KL-KL-KLIK")
speak_emote = list("growls", "barks ominously")
@@ -634,15 +532,7 @@
maxHealth = 20
health = 20
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/corgi = 1)
-
-//puppies cannot wear anything.
-/mob/living/simple_animal/pet/dog/corgi/puppy/Topic(href, href_list)
- if(href_list["remove_inv"] == "collar" || href_list["add_inv"] == "collar")
- return ..()
- if(href_list["remove_inv"] || href_list["add_inv"])
- to_chat(usr, "You can't fit this on [src]!")
- return
- ..()
+ strippable_inventory_slots = list(/datum/strippable_item/pet_collar) // Puppies do not have a head or back equipment slot.
/mob/living/simple_animal/pet/dog/corgi/puppy/void //Tribute to the corgis born in nullspace
name = "\improper void puppy"
@@ -694,13 +584,6 @@
tts_seed = "Luna"
holder_type = /obj/item/holder/lisa
-//Lisa already has a cute bow!
-/mob/living/simple_animal/pet/dog/corgi/Lisa/Topic(href, href_list)
- if(href_list["remove_inv"] || href_list["add_inv"])
- to_chat(usr, "[src] already has a cute bow!")
- return
- ..()
-
/mob/living/simple_animal/pet/dog/corgi/Lisa/Life()
..()
make_babies()
diff --git a/code/modules/mob/living/simple_animal/friendly/dog_sec.dm b/code/modules/mob/living/simple_animal/friendly/dog_sec.dm
index 0470f17be5a..187a72fe25f 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog_sec.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog_sec.dm
@@ -13,8 +13,6 @@
melee_damage_lower = 8
melee_damage_upper = 10
attacktext = "кусает"
- var/obj/item/inventory_head
- var/obj/item/inventory_mask
footstep_type = FOOTSTEP_MOB_CLAW
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/security = 3)
tts_seed = "Furion"
@@ -39,40 +37,15 @@
icon_dead = "german_shep2_dead"
tts_seed = "pantheon"
-/mob/living/simple_animal/pet/dog/security/show_inv(mob/user)
- if(user.incapacitated() || !Adjacent(user))
- return
- user.set_machine(src)
-
-
- var/dat = {"
Inventory of [name]
"}
- dat += "
Head: [inventory_head]" : "add_inv=head'>Nothing"]"
- dat += "
Mask: [inventory_mask]" : "add_inv=mask'>Nothing"]"
- dat += "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]"
-
- var/datum/browser/popup = new(user, "mob[UID()]", "[src]", 440, 250)
- popup.set_content(dat)
- popup.open()
-
-/mob/living/simple_animal/pet/dog/security/ranger/show_inv(mob/user)
- if(user.incapacitated() || !Adjacent(user))
- return
- user.set_machine(src)
-
-
- var/dat = {"
Inventory of [name]
"}
- dat += "
Mask: [inventory_mask]" : "add_inv=mask'>Nothing"]"
- dat += "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]"
-
- var/datum/browser/popup = new(user, "mob[UID()]", "[src]", 440, 250)
- popup.set_content(dat)
- popup.open()
/mob/living/simple_animal/pet/dog/security/Initialize(mapload)
. = ..()
regenerate_icons()
+/mob/living/simple_animal/pet/dog/security/add_strippable_element()
+ AddElement(/datum/element/strippable, length(strippable_inventory_slots) ? create_strippable_list(strippable_inventory_slots) : GLOB.strippable_muhtar_items)
+
/mob/living/simple_animal/pet/dog/security/Destroy()
QDEL_NULL(inventory_head)
QDEL_NULL(inventory_mask)
@@ -95,109 +68,8 @@
..(gibbed)
regenerate_icons()
-/mob/living/simple_animal/pet/dog/security/Topic(href, href_list)
- if(!(iscarbon(usr) || isrobot(usr)) || usr.incapacitated() || !Adjacent(usr))
- usr << browse(null, "window=mob[UID()]")
- usr.unset_machine()
- return
-
- //Removing from inventory
- if(href_list["remove_inv"])
- var/remove_from = href_list["remove_inv"]
- switch(remove_from)
- if("head")
- if(inventory_head)
- if(HAS_TRAIT(inventory_head, TRAIT_NODROP))
- to_chat(usr, "\The [inventory_head] is stuck too hard to [src] for you to remove!")
- return
- drop_item_ground(inventory_head)
- usr.put_in_hands(inventory_head, ignore_anim = FALSE)
- inventory_head = null
- update_muhtar_fluff()
- regenerate_icons()
- else
- to_chat(usr, "There is nothing to remove from its [remove_from].")
- return
- if("mask")
- if(inventory_mask)
- if(HAS_TRAIT(inventory_mask, TRAIT_NODROP))
- to_chat(usr, "\The [inventory_head] is stuck too hard to [src] for you to remove!")
- return
- drop_item_ground(inventory_mask)
- usr.put_in_hands(inventory_mask, ignore_anim = FALSE)
- inventory_mask = null
- update_muhtar_fluff()
- regenerate_icons()
- else
- to_chat(usr, "There is nothing to remove from its [remove_from].")
- return
- if("collar")
- if(pcollar)
- var/the_collar = pcollar
- drop_item_ground(pcollar)
- usr.put_in_hands(the_collar, ignore_anim = FALSE)
- pcollar = null
- update_muhtar_fluff()
- regenerate_icons()
-
- show_inv(usr)
-
- //Adding things to inventory
- else if(href_list["add_inv"])
- var/add_to = href_list["add_inv"]
-
- switch(add_to)
- if("collar")
- add_collar(usr.get_active_hand(), usr)
- update_muhtar_fluff()
-
- if("head")
- place_on_head(usr.get_active_hand(),usr)
-
- if("mask")
- if(inventory_mask)
- to_chat(usr, "It's already wearing something!")
- return
- else
- var/obj/item/item_to_add = usr.get_active_hand()
-
- if(!item_to_add)
- usr.visible_message("[usr] pets [src].", "You rest your hand on [src]'s face for a moment.")
- return
-
- if(!usr.drop_item_ground(item_to_add))
- to_chat(usr, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s face!")
- return
-
- if(istype(item_to_add, /obj/item/grenade/plastic/c4)) // last thing he ever wears, I guess
- item_to_add.afterattack(src,usr,1)
- return
-
- //The objects that secdogs can wear on their faces.
- var/allowed = FALSE
- if(ispath(item_to_add.muhtar_fashion, /datum/muhtar_fashion/mask))
- allowed = TRUE
-
- if(!allowed)
- to_chat(usr, "You set [item_to_add] on [src]'s face, but it falls off!")
- item_to_add.forceMove(drop_location())
- if(prob(25))
- step_rand(item_to_add)
- for(var/i in list(1,2,4,8,4,8,4,dir))
- setDir(i)
- sleep(1)
- return
-
- item_to_add.forceMove(src)
- inventory_mask = item_to_add
- update_muhtar_fluff()
- regenerate_icons()
-
- show_inv(usr)
- else
- return ..()
-/mob/living/simple_animal/pet/dog/security/proc/place_on_head(obj/item/item_to_add, mob/user)
+/mob/living/simple_animal/pet/dog/security/place_on_head(obj/item/item_to_add, mob/user)
if(istype(item_to_add, /obj/item/grenade/plastic/c4)) // last thing he ever wears, I guess
item_to_add.afterattack(src,user,1)
@@ -232,7 +104,7 @@
"You hear a friendly-sounding bark.")
item_to_add.forceMove(src)
inventory_head = item_to_add
- update_muhtar_fluff()
+ update_dog_fluff()
regenerate_icons()
else
to_chat(user, "You set [item_to_add] on [src]'s head, but it falls off!")
@@ -245,7 +117,7 @@
return valid
-/mob/living/simple_animal/pet/dog/security/proc/update_muhtar_fluff()
+/mob/living/simple_animal/pet/dog/security/update_dog_fluff()
// First, change back to defaults
name = real_name
desc = initial(desc)
@@ -324,15 +196,5 @@
icon_resting = "blackdog_rest"
tts_seed = "Thrall"
-/mob/living/simple_animal/pet/dog/security/detective/show_inv(mob/user)
- if(user.incapacitated() || !Adjacent(user))
- return
- user.set_machine(src)
-
-
- var/dat = {"
Inventory of [name]
"}
- dat += "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]"
-
- var/datum/browser/popup = new(user, "mob[UID()]", "[src]", 440, 250)
- popup.set_content(dat)
- popup.open()
+/mob/living/simple_animal/pet/dog/security/detective/add_strippable_element()
+ AddElement(/datum/element/strippable, create_strippable_list(list(/datum/strippable_item/pet_collar)))
diff --git a/code/modules/mob/living/simple_animal/friendly/dog_stripping.dm b/code/modules/mob/living/simple_animal/friendly/dog_stripping.dm
new file mode 100644
index 00000000000..a5fbd6fdcaa
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/friendly/dog_stripping.dm
@@ -0,0 +1,158 @@
+//dog's stippable items
+
+GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
+ /datum/strippable_item/dog_head,
+ /datum/strippable_item/dog_back,
+ /datum/strippable_item/pet_collar
+)))
+
+GLOBAL_LIST_INIT(strippable_muhtar_items, create_strippable_list(list(
+ /datum/strippable_item/dog_head,
+ /datum/strippable_item/dog_mask,
+ /datum/strippable_item/pet_collar
+)))
+
+
+/datum/strippable_item/dog_head
+ key = STRIPPABLE_ITEM_HEAD
+
+/datum/strippable_item/dog_head/get_item(atom/source)
+ var/mob/living/simple_animal/pet/dog/dog_source = source
+ if(!istype(dog_source))
+ return
+
+ return dog_source.inventory_head
+
+/datum/strippable_item/dog_head/finish_equip(atom/source, obj/item/equipping, mob/user)
+ var/mob/living/simple_animal/pet/dog/dog_source = source
+ if(!istype(dog_source))
+ return
+
+ INVOKE_ASYNC(source, TYPE_PROC_REF(/mob/living/simple_animal/pet/dog, place_on_head), equipping, user)
+
+/datum/strippable_item/dog_head/finish_unequip(atom/source, mob/user)
+ var/mob/living/simple_animal/pet/dog/dog_source = source
+ if(!istype(dog_source))
+ return
+
+ user.put_in_hands(dog_source.inventory_head)
+ dog_source.inventory_head = null
+ dog_source.update_dog_fluff()
+ dog_source.update_appearance(UPDATE_OVERLAYS)
+
+/datum/strippable_item/pet_collar
+ key = STRIPPABLE_ITEM_PET_COLLAR
+
+/datum/strippable_item/pet_collar/get_item(atom/source)
+ var/mob/living/simple_animal/pet_source = source
+ if(!istype(pet_source))
+ return
+
+ return pet_source.pcollar
+
+/datum/strippable_item/pet_collar/try_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if(!.)
+ return FALSE
+
+ if(!istype(equipping, /obj/item/clothing/accessory/petcollar))
+ to_chat(user, span_warning("That's not a collar."))
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/pet_collar/finish_equip(atom/source, obj/item/equipping, mob/user)
+ var/mob/living/simple_animal/pet_source = source
+ if(!istype(pet_source))
+ return
+
+ pet_source.add_collar(equipping, user)
+
+/datum/strippable_item/pet_collar/finish_unequip(atom/source, mob/user)
+ var/mob/living/simple_animal/pet_source = source
+ if(!istype(pet_source))
+ return
+
+ pet_source.remove_collar(user.drop_location(), user)
+
+
+/datum/strippable_item/dog_back
+ key = STRIPPABLE_ITEM_BACK
+
+/datum/strippable_item/dog_back/get_item(atom/source)
+ var/mob/living/simple_animal/pet/dog/dog_source = source
+ if(!istype(dog_source))
+ return
+
+ return dog_source.inventory_back
+
+/datum/strippable_item/dog_back/finish_equip(atom/source, obj/item/equipping, mob/user)
+ var/mob/living/simple_animal/pet/dog/dog_source = source
+ if(!istype(dog_source))
+ return
+ if(!ispath(equipping.dog_fashion, /datum/dog_fashion/back))
+ var/mob/living/simple_animal/pet/dog/dog = source
+ to_chat(user, span_warning("You set [equipping] on [source]'s back, but it falls off!"))
+ equipping.forceMove(source.drop_location())
+ if(prob(25))
+ step_rand(equipping)
+ var/old_dir = dog.dir
+ dog.spin(7, 1)
+ dog.setDir(old_dir)
+ return
+
+ equipping.forceMove(dog_source)
+ dog_source.inventory_back = equipping
+ dog_source.update_dog_fluff()
+ dog_source.regenerate_icons()
+
+/datum/strippable_item/dog_back/finish_unequip(atom/source, mob/user)
+ var/mob/living/simple_animal/pet/dog/dog_source = source
+ if(!istype(dog_source))
+ return
+
+ user.put_in_hands(dog_source.inventory_back)
+ dog_source.inventory_back = null
+ dog_source.update_dog_fluff()
+ dog_source.regenerate_icons()
+
+/datum/strippable_item/dog_mask
+ key = STRIPPABLE_ITEM_MASK
+
+/datum/strippable_item/dog_mask/get_item(atom/source)
+ var/mob/living/simple_animal/pet/dog/dog_source = source
+ if(!istype(dog_source))
+ return
+
+ return dog_source.inventory_mask
+
+/datum/strippable_item/dog_mask/finish_equip(atom/source, obj/item/equipping, mob/user)
+ var/mob/living/simple_animal/pet/dog/dog_source = source
+ if(!istype(dog_source))
+ return
+
+ //The objects that secdogs can wear on their faces.
+ if(!ispath(equipping.muhtar_fashion, /datum/muhtar_fashion/mask))
+ to_chat(user, span_warning("You set [equipping] on [src]'s face, but it falls off!"))
+ equipping.forceMove(dog_source.drop_location())
+ if(prob(25))
+ step_rand(equipping)
+ var/old_dir = dog_source.dir
+ dog_source.spin(7, 1)
+ dog_source.setDir(old_dir)
+
+ equipping.forceMove(dog_source)
+ dog_source.inventory_mask = equipping
+ dog_source.update_dog_fluff()
+ dog_source.regenerate_icons()
+
+/datum/strippable_item/dog_mask/finish_unequip(atom/source, mob/user)
+ var/mob/living/simple_animal/pet/dog/dog_source = source
+ if(!istype(dog_source))
+ return
+
+ user.put_in_hands(dog_source.inventory_mask)
+ dog_source.inventory_mask = null
+ dog_source.update_dog_fluff()
+ dog_source.regenerate_icons()
+ dog_source.update_appearance(UPDATE_OVERLAYS)
diff --git a/code/modules/mob/living/simple_animal/friendly/frog.dm b/code/modules/mob/living/simple_animal/friendly/frog.dm
index 2dde5b6b5cf..b6949c1eb53 100644
--- a/code/modules/mob/living/simple_animal/friendly/frog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/frog.dm
@@ -135,3 +135,25 @@
if(!resting && !buckled && prob(1))
emote("warcry")
+/mob/living/simple_animal/frog/scream/mapper
+ name = "Лягушка"
+ real_name = "Маппер"
+ atmos_requirements = list("min_oxy"=0,"max_oxy"=0,"min_tox"=0,"max_tox"=0,"min_co2"=0,"max_co2"=0,"min_n2"=0,"max_n2"=0)
+ butcher_results = list(/obj/item/areaeditor/blueprints=1)
+ cold_damage_per_tick = 0
+ damage_coeff = list("brute"=0,"fire"=0,"tox"=0,"clone"=0,"stamina"=0,"oxy"=0)
+ death_sound = 'sound/creatures/mapper_death.ogg'
+ desc = "Окупировавшая один из офисов на Центральном командовании лягушка. Постоянно кричит что-то в монитор."
+ emote_hear = list("МГРЛЬК","МРГЛ","УААМРГЛ")
+ emote_see = list("лежит расслабленная","увлажнена","издает гортанные звуки","лупает глазками","сильно недовольна","ищет рантаймы")
+ maxHealth = 1000
+ maxbodytemp = 1000
+ scream_sound = list('sound/creatures/mapper_disappointed.ogg','sound/creatures/mapper_angry.ogg','sound/creatures/mapper_annoyed.ogg')
+ speak = list("МРГЛЬК!","ТРУБА В ТРУБЕ! РАНТАЙМ! ПИЗДЕЦ!","ЧЕРЕЗ ЧАС!","ЗЕРО НА ВАЙТЛИСТЕ!","1.5.7. В РЕЛИЗЕЕЕ!","ВОТ БИ СМ НА КОРОБКУ!","ДА КТО ЭТОТ ВАШ ПР?!","МУЛЬТИЗЕТА ХОЧЕТСЯ!")
+ squeak_sound = list('sound/creatures/mapper_disappointed.ogg','sound/creatures/mapper_angry.ogg','sound/creatures/mapper_annoyed.ogg')
+ talk_sound = list('sound/creatures/mapper_scream.ogg')
+ gold_core_spawnable = NO_SPAWN
+
+/mob/living/simple_animal/frog/scream/mapper/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/squeak, squeak_sound, 50, extrarange = SILENCED_SOUND_EXTRARANGE) //as quiet as a frog or whatever
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index e68a8033aec..09efa3df2c3 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -61,6 +61,15 @@
)
AddElement(/datum/element/connect_loc, loc_connections)
+/mob/living/simple_animal/mouse/add_strippable_element()
+ AddElement(/datum/element/strippable, GLOB.strippable_mouse_items)
+
+/mob/living/simple_animal/mouse/death(gibbed)
+ if(jetpack)
+ remove_from_back(null)
+ . = ..()
+
+
/mob/living/simple_animal/mouse/handle_automated_action()
if(prob(chew_probability) && isturf(loc))
var/turf/simulated/floor/F = get_turf(src)
@@ -113,10 +122,10 @@
pixel_y = rand(0, 10)
if(is_available_for_anim())
- verbs += /mob/living/simple_animal/mouse/proc/sniff
- verbs += /mob/living/simple_animal/mouse/proc/shake
- verbs += /mob/living/simple_animal/mouse/proc/scratch
- verbs += /mob/living/simple_animal/mouse/proc/washup
+ add_verb(src, /mob/living/simple_animal/mouse/proc/sniff)
+ add_verb(src, /mob/living/simple_animal/mouse/proc/shake)
+ add_verb(src, /mob/living/simple_animal/mouse/proc/scratch)
+ add_verb(src, /mob/living/simple_animal/mouse/proc/washup)
/mob/living/simple_animal/mouse/update_icons()
@@ -141,65 +150,11 @@
return ..()
-/mob/living/simple_animal/mouse/show_inv(mob/user)
- if(user.incapacitated() || !Adjacent(user))
- return
- user.set_machine(src)
-
- var/dat = {"
Inventory of [name]
"}
- dat += "
Back: [jetpack]" : "add_inv=back'>Nothing"]"
- dat += "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]"
-
- var/datum/browser/popup = new(user, "mob[UID()]", "[src]", 440, 250)
- popup.set_content(dat)
- popup.open()
-
-
-/mob/living/simple_animal/mouse/Topic(href, href_list)
- if(..())
- return TRUE
-
- if(!(iscarbon(usr) || usr.incapacitated() || !Adjacent(usr)))
- usr << browse(null, "window=mob[UID()]")
- usr.unset_machine()
- return
-
- if(stat == DEAD)
- return FALSE
-
- if(href_list["remove_inv"])
- var/remove_from = href_list["remove_inv"]
- switch(remove_from)
- if("back")
- remove_from_back(usr)
- if("collar")
- if(pcollar)
- drop_item_ground(pcollar)
- usr.put_in_hands(pcollar, ignore_anim = FALSE)
- pcollar = null
- show_inv(usr)
-
- else if(href_list["add_inv"])
- var/add_to = href_list["add_inv"]
- switch(add_to)
- if("back")
- place_on_back(usr.get_active_hand(), usr)
- if("collar")
- add_collar(usr.get_active_hand(), usr)
- show_inv(usr)
-
- if(usr != src)
- return TRUE
-
-
/mob/living/simple_animal/mouse/proc/place_on_back(obj/item/item_to_add, mob/living/user)
- if(!istype(item_to_add, /obj/item/mouse_jetpack) || !is_available_for_anim())
- to_chat(user, span_warning("You can't figure out how to do something with \the [item_to_add] and [src]."))
- return FALSE
if(jetpack)
to_chat(user, span_warning("[src] already have jetpack!"))
return FALSE
- if(!mind)
+ if(!mind || !is_available_for_anim())
to_chat(user, span_warning("[src] doesn't seem interested in that."))
return FALSE
if(!user.drop_transfer_item_to_loc(item_to_add, src))
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse_stripping.dm b/code/modules/mob/living/simple_animal/friendly/mouse_stripping.dm
new file mode 100644
index 00000000000..aa2b7a55097
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/friendly/mouse_stripping.dm
@@ -0,0 +1,40 @@
+GLOBAL_LIST_INIT(strippable_mouse_items, create_strippable_list(list(
+ /datum/strippable_item/mouse_jet,
+ /datum/strippable_item/pet_collar
+)))
+
+/datum/strippable_item/mouse_jet
+ key = STRIPPABLE_ITEM_BACK
+
+/datum/strippable_item/mouse_jet/get_item(atom/source)
+ var/mob/living/simple_animal/mouse/mouse_source = source
+ return istype(mouse_source) ? mouse_source.jetpack : null
+
+/datum/strippable_item/mouse_jet/try_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if(!.)
+ return FALSE
+
+ if(!istype(equipping, /obj/item/mouse_jetpack))
+ to_chat(user, span_warning("You can't figure out how to do something with \the [equipping] and [src]."))
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/mouse_jet/finish_equip(atom/source, obj/item/equipping, mob/user)
+ var/obj/item/mouse_jetpack/jet = equipping
+ if(!istype(jet))
+ return
+
+ var/mob/living/simple_animal/mouse/mouse_source = source
+ if(!istype(mouse_source))
+ return
+
+ mouse_source.place_on_back(equipping, user)
+
+/datum/strippable_item/mouse_jet/finish_unequip(atom/source, mob/user)
+ var/mob/living/simple_animal/mouse/mouse_source = source
+ if(!istype(mouse_source))
+ return
+
+ mouse_source.remove_from_back(user)
diff --git a/code/modules/mob/living/simple_animal/friendly/slugcat.dm b/code/modules/mob/living/simple_animal/friendly/slugcat.dm
index 83825897e49..a8078898330 100644
--- a/code/modules/mob/living/simple_animal/friendly/slugcat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/slugcat.dm
@@ -34,6 +34,7 @@
//Шляпы для слизнекота!
var/obj/item/inventory_head
var/obj/item/inventory_hand
+ var/list/strippable_inventory_slots = list()
var/hat_offset_y = -8
var/hat_offset_y_rest = -19
@@ -45,6 +46,9 @@
var/is_pacifist = FALSE
var/is_reduce_damage = TRUE
+/mob/living/simple_animal/pet/slugcat/add_strippable_element()
+ AddElement(/datum/element/strippable, length(strippable_inventory_slots) ? create_strippable_list(strippable_inventory_slots) : GLOB.strippable_slugcat_items)
+
/mob/living/simple_animal/pet/slugcat/monk
name = "слизнекот-монах"
desc = "Удивительное существо, напоминающее кота и слизня в одном обличии. Но это не слизь, а иной вид существа. Гордость ксенобиологии. Крайне ловкое и умное, родом с планеты с опасной средой обитания. Не любит охоту и не умеет пользоваться копьями. На нём отлично смотрятся шляпы."
@@ -101,48 +105,6 @@
drop_hand()
. = ..()
-/mob/living/simple_animal/pet/slugcat/Topic(href, href_list)
- if(..())
- return TRUE
-
- if(!(iscarbon(usr) || usr.incapacitated() || !Adjacent(usr)))
- usr << browse(null, "window=mob[UID()]")
- usr.unset_machine()
- return
-
- if(stat == DEAD)
- return FALSE
-
- if(href_list["remove_inv"])
- var/remove_from = href_list["remove_inv"]
- switch(remove_from)
- if("head")
- remove_from_head(usr)
- if("hand")
- remove_from_hand(usr)
- if("collar")
- if(pcollar)
- var/the_collar = pcollar
- drop_item_ground(pcollar)
- usr.put_in_hands(the_collar, ignore_anim = FALSE)
- pcollar = null
- show_inv(usr)
-
- else if(href_list["add_inv"])
- var/add_to = href_list["add_inv"]
- switch(add_to)
- if("head")
- place_on_head(usr.get_active_hand(), usr)
- if("hand")
- place_to_hand(usr.get_active_hand(), usr)
- if("collar")
- add_collar(usr.get_active_hand(), usr)
- show_inv(usr)
-
- if(usr != src)
- return TRUE
-
-
/mob/living/simple_animal/pet/slugcat/regenerate_icons()
cut_overlays()
if(pcollar && collar_type)
@@ -216,19 +178,6 @@
//slugI.transform = matrix(1, 0, 1, 0, 1, 0)
return slugI
-/mob/living/simple_animal/pet/slugcat/show_inv(mob/user)
- if(user.incapacitated() || !Adjacent(user))
- return
- user.set_machine(src)
-
- var/dat = {"
Inventory of [name]
"}
- dat += "
Head: [inventory_head]" : "add_inv=head'>Nothing"]"
- dat += "
Hand: [inventory_hand]" : "add_inv=hand'>Nothing"]"
- dat += "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]"
- var/datum/browser/popup = new(user, "mob[UID()]", "[src]", 440, 250)
- popup.set_content(dat)
- popup.open()
-
/mob/living/simple_animal/pet/slugcat/proc/place_on_head(obj/item/item_to_add, mob/user)
if(!item_to_add)
if(flags & HOLOGRAM) //Can't touch ephemeral dudes(
diff --git a/code/modules/mob/living/simple_animal/friendly/slugcat_stripping.dm b/code/modules/mob/living/simple_animal/friendly/slugcat_stripping.dm
new file mode 100644
index 00000000000..75be554e3f0
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/friendly/slugcat_stripping.dm
@@ -0,0 +1,54 @@
+GLOBAL_LIST_INIT(strippable_slugcat_items, create_strippable_list(list(
+ /datum/strippable_item/slugcat_head,
+ /datum/strippable_item/slugcat_hand,
+ /datum/strippable_item/pet_collar
+)))
+
+
+/datum/strippable_item/slugcat_head
+ key = STRIPPABLE_ITEM_HEAD
+
+/datum/strippable_item/slugcat_head/get_item(atom/source)
+ var/mob/living/simple_animal/pet/slugcat/slugcat_source = source
+ if(!istype(slugcat_source))
+ return
+
+ return slugcat_source.inventory_head
+
+/datum/strippable_item/slugcat_head/finish_equip(atom/source, obj/item/equipping, mob/user)
+ var/mob/living/simple_animal/pet/slugcat/slugcat_source = source
+ if(!istype(slugcat_source))
+ return
+
+ INVOKE_ASYNC(source, TYPE_PROC_REF(/mob/living/simple_animal/pet/slugcat, place_on_head), equipping, user)
+
+/datum/strippable_item/slugcat_head/finish_unequip(atom/source, mob/user)
+ var/mob/living/simple_animal/pet/slugcat/slugcat_source = source
+ if(!istype(slugcat_source))
+ return
+
+ INVOKE_ASYNC(source, TYPE_PROC_REF(/mob/living/simple_animal/pet/slugcat, remove_from_head), user)
+
+/datum/strippable_item/slugcat_hand
+ key = STRIPPABLE_ITEM_RHAND
+
+/datum/strippable_item/slugcat_hand/get_item(atom/source)
+ var/mob/living/simple_animal/pet/slugcat/slugcat_source = source
+ if(!istype(slugcat_source))
+ return
+
+ return slugcat_source.inventory_hand
+
+/datum/strippable_item/slugcat_hand/finish_equip(atom/source, obj/item/equipping, mob/user)
+ var/mob/living/simple_animal/pet/slugcat/slugcat_source = source
+ if(!istype(slugcat_source))
+ return
+
+ INVOKE_ASYNC(source, TYPE_PROC_REF(/mob/living/simple_animal/pet/slugcat, place_to_hand), equipping, user)
+
+/datum/strippable_item/slugcat_hand/finish_unequip(atom/source, mob/user)
+ var/mob/living/simple_animal/pet/slugcat/slugcat_source = source
+ if(!istype(slugcat_source))
+ return
+
+ INVOKE_ASYNC(source, TYPE_PROC_REF(/mob/living/simple_animal/pet/slugcat, remove_from_hand), user)
diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm
index 906f4d75549..845ae329cf5 100644
--- a/code/modules/mob/living/simple_animal/friendly/snake.dm
+++ b/code/modules/mob/living/simple_animal/friendly/snake.dm
@@ -94,11 +94,15 @@
response_disarm = "shoos"
response_harm = "steps on"
var/obj/item/inventory_head
+ var/list/strippable_inventory_slots = list()
faction = list("neutral", "syndicate")
gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
can_hide = 1
+/mob/living/simple_animal/hostile/retaliate/poison/snake/rouge/add_strippable_element()
+ AddElement(/datum/element/strippable, length(strippable_inventory_slots) ? create_strippable_list(strippable_inventory_slots) : GLOB.strippable_snake_items)
+
/mob/living/simple_animal/hostile/retaliate/poison/snake/rouge/verb/chasetail()
set name = "Chase your tail"
set desc = "d'awwww."
@@ -159,19 +163,6 @@
..(gibbed)
regenerate_icons()
-/mob/living/simple_animal/hostile/retaliate/poison/snake/rouge/show_inv(mob/user)
- if(user.incapacitated() || !Adjacent(user))
- return
- user.set_machine(src)
-
- var/dat = {"
Inventory of [name]
"}
- dat += "
Head: [inventory_head]" : "add_inv=head'>Nothing"]"
- dat += "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]"
-
- var/datum/browser/popup = new(user, "mob[UID()]", "[src]", 440, 250)
- popup.set_content(dat)
- popup.open()
-
/mob/living/simple_animal/hostile/retaliate/poison/snake/rouge/getarmor(def_zone, type)
var/armorval = inventory_head?.armor.getRating(type)
if(!def_zone)
@@ -180,57 +171,6 @@
armorval = 0
return armorval
-/mob/living/simple_animal/hostile/retaliate/poison/snake/rouge/Topic(href, href_list)
- if(!(iscarbon(usr) || isrobot(usr)) || usr.incapacitated() || !Adjacent(usr))
- usr << browse(null, "window=mob[UID()]")
- usr.unset_machine()
- return
-
- //Removing from inventory
- if(href_list["remove_inv"])
- var/remove_from = href_list["remove_inv"]
- switch(remove_from)
- if("head")
- if(inventory_head)
- if(HAS_TRAIT(inventory_head, TRAIT_NODROP))
- to_chat(usr, "\The [inventory_head] is stuck too hard to [src] for you to remove!")
- return
- drop_item_ground(inventory_head)
- usr.put_in_hands(inventory_head, ignore_anim = FALSE)
- inventory_head = null
- update_snek_fluff()
- regenerate_icons()
- else
- to_chat(usr, "There is nothing to remove from its [remove_from].")
- return
- if("collar")
- if(pcollar)
- var/the_collar = pcollar
- drop_item_ground(pcollar)
- usr.put_in_hands(the_collar, ignore_anim = FALSE)
- pcollar = null
- update_snek_fluff()
- regenerate_icons()
-
- show_inv(usr)
-
- //Adding things to inventory
- else if(href_list["add_inv"])
- var/add_to = href_list["add_inv"]
-
- switch(add_to)
- if("collar")
- add_collar(usr.get_active_hand(), usr)
- update_snek_fluff()
-
- if("head")
- place_on_head(usr.get_active_hand(),usr)
-
- show_inv(usr)
- else
- return ..()
-
-
/mob/living/simple_animal/hostile/retaliate/poison/snake/rouge/proc/place_on_head(obj/item/item_to_add, mob/user)
if(istype(item_to_add, /obj/item/grenade/plastic/c4)) // last thing she ever wears, I guess
diff --git a/code/modules/mob/living/simple_animal/friendly/snake_stripping.dm b/code/modules/mob/living/simple_animal/friendly/snake_stripping.dm
new file mode 100644
index 00000000000..3367caa0742
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/friendly/snake_stripping.dm
@@ -0,0 +1,32 @@
+GLOBAL_LIST_INIT(strippable_snake_items, create_strippable_list(list(
+ /datum/strippable_item/snake_head,
+ /datum/strippable_item/pet_collar
+)))
+
+
+/datum/strippable_item/snake_head
+ key = STRIPPABLE_ITEM_HEAD
+
+/datum/strippable_item/snake_head/get_item(atom/source)
+ var/mob/living/simple_animal/hostile/retaliate/poison/snake/rouge/snake_source = source
+ if(!istype(snake_source))
+ return
+
+ return snake_source.inventory_head
+
+/datum/strippable_item/snake_head/finish_equip(atom/source, obj/item/equipping, mob/user)
+ var/mob/living/simple_animal/hostile/retaliate/poison/snake/rouge/snake_source = source
+ if(!istype(snake_source))
+ return
+
+ INVOKE_ASYNC(source, TYPE_PROC_REF(/mob/living/simple_animal/hostile/retaliate/poison/snake/rouge, place_on_head), equipping, user)
+
+/datum/strippable_item/snake_head/finish_unequip(atom/source, mob/user)
+ var/mob/living/simple_animal/hostile/retaliate/poison/snake/rouge/snake_source = source
+ if(!istype(snake_source))
+ return
+
+ INVOKE_ASYNC(user, TYPE_PROC_REF(/mob, put_in_hands), snake_source.inventory_head)
+ snake_source.inventory_head = null
+ snake_source.update_snek_fluff()
+ snake_source.update_appearance(UPDATE_OVERLAYS)
diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla_actions.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla_actions.dm
index 06c394979ad..589c2a19e0e 100644
--- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla_actions.dm
+++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla_actions.dm
@@ -38,10 +38,10 @@
COOLDOWN_DECLARE(gorilla_actions_cooldown)
-/mob/living/simple_animal/hostile/gorilla/Stat()
- . = ..()
- if(statpanel("Status"))
- stat(null, "Бананов съедено: [bananas_eaten]/[BANANAS_TO_ENLIGHTEN]")
+/mob/living/simple_animal/hostile/gorilla/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+ status_tab_data[++status_tab_data.len] = list("Бананов съедено:", "[bananas_eaten]/[BANANAS_TO_ENLIGHTEN]")
/mob/living/simple_animal/hostile/gorilla/attackby(obj/item/I, mob/user, params)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index 42464e161d8..56e1740a8e3 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -101,7 +101,6 @@ Difficulty: Medium
stat_allowed = UNCONSCIOUS
sound = 'sound/misc/enter_blood.ogg'
action_icon_state = "bloodcrawl"
- panel = "Blood Drunk"
/obj/effect/proc_holder/spell/blood_suit/create_new_targeting()
return new /datum/spell_targeting/self
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index e0ba35f9faa..206b0ad2c83 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -656,7 +656,8 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/charge_end(datum/source)
. = ..()
- qdel(src)
+ if(!QDELETED(src))
+ qdel(src)
/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/Destroy()
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/guardian.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/guardian.dm
index 70db035f8e5..0a4a364c4da 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/guardian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/guardian.dm
@@ -112,21 +112,22 @@
melee_damage_lower = 5
melee_damage_upper = 10
-/mob/living/simple_animal/hostile/poison/terror_spider/guardian/Stat()
- ..()
+/mob/living/simple_animal/hostile/poison/terror_spider/guardian/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
// Provides a status panel indicator, showing purples how long they can be away from their queen before their hivemind link breaks, and they die.
// Uses because the status panel does NOT accept .
if(statpanel("Status") && ckey && stat == CONSCIOUS)
if(spider_myqueen)
var/area/A = get_area(spider_myqueen)
if(degenerate)
- stat(null, "Link: BROKEN") // color=red
+ status_tab_data[++status_tab_data.len] = list("Link:", "BROKEN") // color=red
else if(queen_visible)
- stat(null, "Link: [spider_myqueen] is near") // color=green
+ status_tab_data[++status_tab_data.len] = list("Link:", "[spider_myqueen] is near") // color=green
else if(cycles_noqueen >= 18)
- stat(null, "Link: Critical - return to [spider_myqueen] in [A]") // color=red
+ status_tab_data[++status_tab_data.len] = list("Link:", "Critical - return to [spider_myqueen] in [A]") // color=red
else
- stat(null, "Link: Warning - return to [spider_myqueen] in [A]") // color=orange
+ status_tab_data[++status_tab_data.len] = list("Link:", "Warning - return to [spider_myqueen] in [A]") // color=orange
/obj/structure/spider/terrorweb/purple
name = "thick web"
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
index 7c91910c335..5b330d3faf3 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
@@ -397,14 +397,12 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list)
return spider_thing
-/mob/living/simple_animal/hostile/poison/terror_spider/Stat()
- ..()
- // Determines what shows in the "Status" tab for player-controlled spiders. Used to help players understand spider health regeneration mechanics.
- // Uses because the status panel does NOT accept .
- if(statpanel("Status") && ckey && stat == CONSCIOUS)
+/mob/living/simple_animal/hostile/poison/terror_spider/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+ if(ckey && stat == CONSCIOUS)
if(degenerate)
- stat(null, "Hivemind Connection Severed! Dying...") // color=red
- return
+ status_tab_data[++status_tab_data.len] = list("Link:", "Hivemind Connection Severed! Dying...") // color=red
/mob/living/simple_animal/hostile/poison/terror_spider/proc/DoRemoteView()
if(!isturf(loc))
diff --git a/code/modules/mob/living/simple_animal/hulk_power.dm b/code/modules/mob/living/simple_animal/hulk_power.dm
index e571fae37a6..bae04dd5583 100644
--- a/code/modules/mob/living/simple_animal/hulk_power.dm
+++ b/code/modules/mob/living/simple_animal/hulk_power.dm
@@ -3,7 +3,6 @@
/obj/effect/proc_holder/spell/hulk_transform
name = "Transform"
desc = "Превращение в халка."
- panel = "Hulk"
action_icon_state = "transformarion_hulk"
action_background_icon_state = "bg_hulk"
base_cooldown = 10 SECONDS
@@ -52,7 +51,6 @@
/obj/effect/proc_holder/spell/hulk_dash
name = "Dash"
desc = "Разбег. Чем он дольше, тем больнее будет, тем кто встанет у вас на пути."
- panel = "Hulk"
action_icon_state = "charge_hulk"
action_background_icon_state = "bg_hulk"
base_cooldown = 13 SECONDS
@@ -218,7 +216,6 @@
/obj/effect/proc_holder/spell/hulk_jump
name = "Leap"
desc = "Прыжок. Можно легко сломать кому-то кость при столкновении."
- panel = "Hulk"
action_icon_state = "jump_hulk"
action_background_icon_state = "bg_hulk"
base_cooldown = 13 SECONDS
@@ -335,7 +332,6 @@
/obj/effect/proc_holder/spell/hulk_honk
name = "HulkHONK"
desc = "Ваш хонк заставляет ваших врагов пасть на пол и налить под себя смазку (от страха). На ваших братьях-клоунах работает как лечение."
- panel = "Hulk"
action_icon_state = "honk_hulk"
action_background_icon_state = "bg_hulk"
base_cooldown = 25 SECONDS
@@ -375,7 +371,6 @@
/obj/effect/proc_holder/spell/hulk_joke
name = "Joke"
desc = "Пускает большое облако дыма, а так-же лечит вас. Хорошее решение если вам нужно отступить."
- panel = "Hulk"
action_icon_state = "joke_hulk"
action_background_icon_state = "bg_hulk"
base_cooldown = 35 SECONDS
@@ -411,7 +406,6 @@
/obj/effect/proc_holder/spell/hulk_mill
name = "Windmill"
desc = "Вы начинаете крутить хвостом во все стороны и наносить им урон. Хорошим выбором будет использовать это в узких помещаниях."
- panel = "Hulk"
action_icon_state = "mill_hulk"
action_background_icon_state = "bg_hulk"
base_cooldown = 20 SECONDS
@@ -470,7 +464,6 @@
/obj/effect/proc_holder/spell/fireball/hulk_spit
name = "Fire Spit"
desc = "Вы харкаете во врага зеленой соплей и поджигаете его."
- panel = "Hulk"
invocation_type = "none"
action_icon_state = "harchok_hulk"
action_background_icon_state = "bg_hulk"
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 9c758141786..8e4add18562 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -118,6 +118,8 @@
/obj/machinery/recharge_station, /obj/machinery/smartfridge, \
/obj/machinery/computer))
+/mob/living/simple_animal/parrot/add_strippable_element()
+ AddElement(/datum/element/strippable, GLOB.strippable_parrot_items)
/mob/living/simple_animal/parrot/Destroy()
GLOB.hear_radio_list -= src
@@ -140,120 +142,10 @@
return ..()
-/mob/living/simple_animal/parrot/Stat()
- ..()
- stat("Held Item", held_item)
-
-
-/*
- * Inventory
- */
-/mob/living/simple_animal/parrot/show_inv(mob/user)
- user.set_machine(src)
-
- var/dat = {"
- Close
- "}
-
- var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 500)
- popup.set_content(dat)
- popup.open()
-
-
-/mob/living/simple_animal/parrot/Topic(href, href_list)
-
- //Can the usr physically do this?
- if(usr.incapacitated() || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED) || !usr.Adjacent(src))
- return
-
- //Is the usr's mob type able to do this?
- if(ishuman(usr) || isrobot(usr))
- if(href_list["remove_inv"])
- var/remove_from = href_list["remove_inv"]
- switch(remove_from)
- if("collar")
- if(!pcollar)
- return
- var/collar = pcollar
- drop_item_ground(collar)
- usr.put_in_hands(collar, ignore_anim = FALSE)
- regenerate_icons()
-
- if("ears")
- if(ears)
- if(stat == CONSCIOUS) //DEAD PARROTS SHOULD NOT SPEAK (i hate that this is done in topic)
- if(length(available_channels))
- say("[pick(available_channels)]БВАААК ОСТАВЬТЕ НАУШНИК БВАААК!")
- else
- say("БВАААК ОСТАВЬТЕ НАУШНИК БВАААК!")
- ears.forceMove(loc)
- ears = null
- update_speak()
- else
- to_chat(usr, span_warning("There is nothing to remove from its [remove_from]."))
- return
- show_inv(usr)
- else if(href_list["add_inv"])
- var/add_to = href_list["add_inv"]
- if(!usr.get_active_hand())
- to_chat(usr, span_warning("You have nothing in your hand to put on its [add_to]."))
- return
- switch(add_to)
- if("collar")
- add_collar(usr.get_active_hand(), usr)
-
- if("ears")
- if(ears)
- to_chat(usr, span_warning("It's already wearing something."))
- return
- else
- var/obj/item/item_to_add = usr.get_active_hand()
- if(!item_to_add)
- return
-
- if(!istype(item_to_add, /obj/item/radio/headset))
- to_chat(usr, span_warning("This object won't fit."))
- return
-
- var/obj/item/radio/headset/headset_to_add = item_to_add
-
- usr.drop_transfer_item_to_loc(headset_to_add, src)
- ears = headset_to_add
- to_chat(usr, "You fit the headset onto [src].")
-
- available_channels.Cut()
- for(var/ch in headset_to_add.channels)
- switch(ch)
- if("Engineering")
- available_channels.Add(":e")
- if("Command")
- available_channels.Add(":c")
- if("Security")
- available_channels.Add(":s")
- if("Science")
- available_channels.Add(":n")
- if("Medical")
- available_channels.Add(":m")
- if("Supply")
- available_channels.Add(":u")
- if("Service")
- available_channels.Add(":z")
- if("Procedure")
- available_channels.Add(":x")
-
- if(headset_to_add.translate_binary)
- available_channels.Add(":+")
- update_speak()
- show_inv(usr)
- else
- ..()
+/mob/living/simple_animal/parrot/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+ status_tab_data[++status_tab_data.len] = list("Held Item", held_item)
/*
@@ -344,7 +236,7 @@
/mob/living/simple_animal/parrot/proc/update_speak()
speak.Cut()
- if(length(available_channels) && ears)
+ if(ears && length(available_channels))
for(var/possible_phrase in clean_speak)
//50/50 chance to not use the radio at all
speak += "[prob(50) ? "[pick(available_channels)] " : ""][possible_phrase]"
@@ -354,6 +246,32 @@
speak += possible_phrase
+/mob/living/simple_animal/parrot/proc/update_available_channels()
+ available_channels.Cut()
+ if(!istype(ears) || QDELETED(ears))
+ return
+
+ for(var/ch in ears.channels)
+ switch(ch)
+ if("Engineering")
+ available_channels.Add(":e")
+ if("Command")
+ available_channels.Add(":c")
+ if("Security")
+ available_channels.Add(":s")
+ if("Science")
+ available_channels.Add(":n")
+ if("Medical")
+ available_channels.Add(":m")
+ if("Mining")
+ available_channels.Add(":d")
+ if("Cargo")
+ available_channels.Add(":q")
+
+ if(ears.translate_binary)
+ available_channels.Add(":b")
+
+
/mob/living/simple_animal/parrot/handle_automated_movement()
if(pulledby)
parrot_state = PARROT_WANDER
diff --git a/code/modules/mob/living/simple_animal/parrot_stripping.dm b/code/modules/mob/living/simple_animal/parrot_stripping.dm
new file mode 100644
index 00000000000..c0fa176d8cd
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/parrot_stripping.dm
@@ -0,0 +1,62 @@
+GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
+ /datum/strippable_item/parrot_headset,
+ /datum/strippable_item/pet_collar
+)))
+
+/datum/strippable_item/parrot_headset
+ key = STRIPPABLE_ITEM_PARROT_HEADSET
+
+/datum/strippable_item/parrot_headset/get_item(atom/source)
+ var/mob/living/simple_animal/parrot/parrot_source = source
+ return istype(parrot_source) ? parrot_source.ears : null
+
+/datum/strippable_item/parrot_headset/try_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if(!.)
+ return FALSE
+
+ if(!istype(equipping, /obj/item/radio/headset))
+ to_chat(user, "[equipping] won't fit!")
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/parrot_headset/finish_equip(atom/source, obj/item/equipping, mob/user)
+ var/obj/item/radio/headset/radio = equipping
+ if(!istype(radio))
+ return
+
+ var/mob/living/simple_animal/parrot/parrot_source = source
+ if(!istype(parrot_source))
+ return
+
+ equipping.forceMove(parrot_source)
+ parrot_source.ears = radio
+ parrot_source.update_available_channels()
+ parrot_source.update_speak()
+
+ to_chat(user, "You fit [radio] onto [source].")
+
+/datum/strippable_item/parrot_headset/start_unequip(atom/source, mob/user)
+ . = ..()
+ if(!.)
+ return FALSE
+
+ var/mob/living/simple_animal/parrot/parrot_source = source
+ if(!istype(parrot_source))
+ return
+
+ if(parrot_source.stat == CONSCIOUS) // DEAD PARROTS TELL NO TALES (Finally moved this out of topic, thank god)
+ parrot_source.say("[length(parrot_source.available_channels) ? "[pick(parrot_source.available_channels)] " : null]BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
+
+ return TRUE
+
+/datum/strippable_item/parrot_headset/finish_unequip(atom/source, mob/user)
+ var/mob/living/simple_animal/parrot/parrot_source = source
+ if(!istype(parrot_source))
+ return
+
+ parrot_source.ears.forceMove(parrot_source.drop_location())
+ parrot_source.ears = null
+ parrot_source.update_available_channels()
+ parrot_source.update_speak()
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 02f8db32424..f0664536a00 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -80,7 +80,8 @@
var/obj/item/clothing/accessory/petcollar/pcollar = null
var/collar_type //if the mob has collar sprites, define them.
var/unique_pet = FALSE // if the mob can be renamed
- var/can_collar = FALSE // can add collar to mob or not
+ /// Can add collar to mob or not, use the set_can_collar if you want to change this on runtime
+ var/can_collar = FALSE
//Hot simple_animal baby making vars
var/list/childtype = null
@@ -150,7 +151,6 @@
if(!loc)
stack_trace("Simple animal being instantiated in nullspace")
update_simplemob_varspeed()
- verbs -= /mob/verb/observe
if(can_hide)
var/datum/action/innate/hide/hide = new()
hide.Grant(src)
@@ -159,7 +159,7 @@
regenerate_icons()
if(footstep_type)
AddElement(/datum/element/footstep, footstep_type)
-
+ add_strippable_element()
/mob/living/simple_animal/Destroy()
QDEL_NULL(pcollar)
@@ -411,11 +411,10 @@
-/mob/living/simple_animal/Stat()
- ..()
- if(statpanel("Status"))
- stat(null, "Health: [round((health / maxHealth) * 100)]%")
- return TRUE
+/mob/living/simple_animal/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+ status_tab_data[++status_tab_data.len] = list("Health:", "[round((health / maxHealth) * 100)]%")
/mob/living/simple_animal/proc/drop_loot()
if(loot.len)
@@ -551,18 +550,6 @@
if(target)
return new childspawn(target)
-/mob/living/simple_animal/show_inv(mob/user)
- if(!can_collar)
- return
-
- user.set_machine(src)
- var/dat = {""}
- dat += "Close"
-
- var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 250)
- popup.set_content(dat)
- popup.open()
-
/mob/living/simple_animal/get_item_by_slot(slot_id)
switch(slot_id)
if(ITEM_SLOT_NECK)
@@ -700,6 +687,20 @@
P.equipped(src)
return TRUE
+/mob/living/simple_animal/proc/remove_collar(atom/new_loc, mob/user)
+ if(!pcollar)
+ return
+
+ var/obj/old_collar = pcollar
+
+ if(!drop_item_ground(pcollar))
+ return
+
+ if(user)
+ user.put_in_hands(old_collar)
+
+ return old_collar
+
/mob/living/simple_animal/regenerate_icons()
cut_overlays()
@@ -795,3 +796,15 @@
else if(glide_size != DEFAULT_GLIDE_SIZE)
set_glide_size(DEFAULT_GLIDE_SIZE)
+/mob/living/simple_animal/proc/set_can_collar(new_value)
+ can_collar = (new_value ? TRUE : FALSE)
+ if(can_collar)
+ add_strippable_element()
+ return
+ remove_collar(drop_location())
+ RemoveElement(/datum/element/strippable)
+
+/mob/living/simple_animal/proc/add_strippable_element()
+ if(!can_collar)
+ return
+ AddElement(/datum/element/strippable, create_strippable_list(list(/datum/strippable_item/pet_collar)))
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index eddcd1b6302..59db01f4861 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -247,19 +247,20 @@
/mob/living/simple_animal/slime/Process_Spacemove(movement_dir = NONE, continuous_move = FALSE)
return TRUE
-/mob/living/simple_animal/slime/Stat()
- if(..())
+/mob/living/simple_animal/slime/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
- if(!docile)
- stat(null, "Nutrition: [nutrition]/[get_max_nutrition()]")
+ if(!docile)
+ status_tab_data[++status_tab_data.len] = list("Nutrition:", "[nutrition]/[get_max_nutrition()]")
- if(amount_grown >= age_state.amount_grown_for_split)
- stat(null, "You can [age_state.stat_text][amount_grown >= age_state.amount_grown ? " [age_state.stat_text_evolve]" : ""]!")
+ if(amount_grown >= age_state.amount_grown_for_split)
+ status_tab_data[++status_tab_data.len] = list("You can:", "[age_state.stat_text][amount_grown >= age_state.amount_grown ? " [age_state.stat_text_evolve]" : ""]!")
- if(stat == UNCONSCIOUS)
- stat(null,"You are knocked out by high levels of BZ!")
- else
- stat(null,"Power Level: [powerlevel]")
+ if(stat == UNCONSCIOUS)
+ status_tab_data[++status_tab_data.len] = list("Power Level:", "You are knocked out by high levels of BZ!")
+ else
+ status_tab_data[++status_tab_data.len] = list("Power Level:", "[powerlevel]")
/mob/living/simple_animal/slime/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE)
@@ -529,8 +530,8 @@
sman = slimeman
if(slime_spell)
parent_spell = slime_spell
- verbs -= /mob/living/simple_animal/slime/verb/Evolve
- verbs -= /mob/living/simple_animal/slime/verb/Reproduce
+ remove_verb(src, /mob/living/simple_animal/slime/verb/Evolve)
+ remove_verb(src, /mob/living/simple_animal/slime/verb/Reproduce)
/mob/living/simple_animal/slime/invalid/Destroy()
parent_spell = null
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 6f605b02c8c..d8dd4d89719 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -30,6 +30,7 @@
return FALSE
canon_client = client
GLOB.player_list |= src
+ GLOB.keyloop_list |= src
last_known_ckey = ckey
update_Login_details()
world.update_status()
@@ -68,10 +69,10 @@
if(ckey in GLOB.deadmins)
- verbs += /client/proc/readmin
+ add_verb(src, /client/proc/readmin)
//Clear ability list and update from mob.
- client.verbs -= GLOB.ability_verbs
+ remove_verb(client, GLOB.ability_verbs)
client.update_active_keybindings()
@@ -87,6 +88,7 @@
update_client_colour(0)
update_morgue()
+ client.init_verbs()
SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGIN, client)
SEND_SIGNAL(src, COMSIG_MOB_LOGIN)
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index 92789b8e819..06b89882c93 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -3,6 +3,7 @@
SStgui.on_logout(src) // Cleanup any TGUIs the user has open
unset_machine()
GLOB.player_list -= src
+ GLOB.keyloop_list -= src
log_access_out(src)
add_game_logs("OWNERSHIP: [key_name(src)] is no longer owning mob [src]([src.type])")
// `holder` is nil'd out by now, so we check the `admin_datums` array directly
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index d383ab2b7da..e94e518710c 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -2,7 +2,7 @@
GLOB.mob_list -= src
GLOB.dead_mob_list -= src
GLOB.alive_mob_list -= src
- input_focus = null
+ focus = null
QDEL_NULL(hud_used)
if(mind && mind.current == src)
spellremove(src)
@@ -30,16 +30,19 @@
GLOB.dead_mob_list += src
else
GLOB.alive_mob_list += src
- input_focus = src
- reset_perspective(src)
+ set_focus(src)
prepare_huds()
. = ..()
update_config_movespeed()
update_movespeed()
-
+ if(can_strip())
+ ADD_TRAIT(src, TRAIT_CAN_STRIP, GENERIC_TRAIT)
/mob/vv_edit_var(var_name, var_value)
switch(var_name)
+ if(NAMEOF(src, focus))
+ set_focus(var_value)
+ . = TRUE
if(NAMEOF(src, machine))
set_machine(var_value)
. = TRUE
@@ -333,20 +336,6 @@
client.screen = list()
hud_used.show_hud(hud_used.hud_version)
-/mob/proc/show_inv(mob/user)
- user.set_machine(src)
- var/dat = {"
- Close
- "}
-
- var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 250)
- popup.set_content(dat)
- popup.open()
-
//mob verbs are faster than object verbs. See http://www.byond.com/forum/?post=1326139&page=2#comment8198716 for why this isn't atom/verb/examine()
/mob/verb/examinate(atom/A as mob|obj|turf in view())
set name = "Examine"
@@ -361,7 +350,6 @@
/mob/verb/mode()
set name = "Activate Held Object"
- set category = null
set src = usr
if(ismecha(loc))
@@ -458,9 +446,6 @@
else
return "[copytext_preserve_html(msg, 1, 57)]... More..."
-/mob/proc/is_dead()
- return stat == DEAD
-
/mob
var/newPlayerType = /mob/new_player
@@ -530,74 +515,8 @@
GLOB.respawnable_list += usr
return
-/mob/verb/observe()
- set name = "Observe"
- set category = "OOC"
- var/is_admin = 0
-
- if(client.holder && (client.holder.rights & R_ADMIN))
- is_admin = 1
- else if(stat != DEAD || isnewplayer(src))
- to_chat(usr, "You must be observing to use this!")
- return
-
- if(is_admin && stat == DEAD)
- is_admin = 0
-
- var/list/names = list()
- var/list/namecounts = list()
- var/list/creatures = list()
-
- for(var/obj/O in GLOB.poi_list)
- if(!O.loc)
- continue
- if(istype(O, /obj/item/disk/nuclear))
- var/name = "Nuclear Disk"
- if(names.Find(name))
- namecounts[name]++
- name = "[name] ([namecounts[name]])"
- else
- names.Add(name)
- namecounts[name] = 1
- creatures[name] = O
-
- if(istype(O, /obj/singularity))
- var/name = "Singularity"
- if(names.Find(name))
- namecounts[name]++
- name = "[name] ([namecounts[name]])"
- else
- names.Add(name)
- namecounts[name] = 1
- creatures[name] = O
-
-
- for(var/mob/M in sortAtom(GLOB.mob_list))
- var/name = M.name
- if(names.Find(name))
- namecounts[name]++
- name = "[name] ([namecounts[name]])"
- else
- names.Add(name)
- namecounts[name] = 1
-
- creatures[name] = M
-
-
- client.perspective = EYE_PERSPECTIVE
-
- var/eye_name = null
-
- var/ok = "[is_admin ? "Admin Observe" : "Observe"]"
- eye_name = input("Please, select a player!", ok, null, null) as null|anything in creatures
-
- if(!eye_name)
- return
-
- var/mob/mob_eye = creatures[eye_name]
-
- if(client && mob_eye)
- client.eye = mob_eye
+/mob/proc/is_dead()
+ return stat == DEAD
/mob/verb/cancel_camera()
set name = "Cancel Camera View"
@@ -615,26 +534,6 @@
unset_machine()
src << browse(null, t1)
- if(href_list["refresh"])
- if(machine && in_range(src, usr))
- show_inv(machine)
-
- if(!usr.incapacitated() && in_range(src, usr))
- if(href_list["item"])
- var/slot = text2num(href_list["item"])
- var/obj/item/what = get_item_by_slot(slot)
-
- if(what)
- usr.stripPanelUnequip(what,src,slot)
- else
- usr.stripPanelEquip(what,src,slot)
-
- if(usr.machine == src)
- if(Adjacent(usr))
- show_inv(usr)
- else
- usr << browse(null,"window=mob\ref[src]")
-
if(href_list["flavor_more"])
usr << browse(text({"[][]"}, name, replacetext(flavor_text, "\n", "
")), text("window=[];size=500x200", name))
onclose(usr, "[name]")
@@ -645,20 +544,9 @@
usr << browse(GLOB.scoreboard, "window=roundstats;size=700x900")
-// The src mob is trying to strip an item from someone
-// Defined in living.dm
-/mob/proc/stripPanelUnequip(obj/item/what, mob/who)
- return
-
-// The src mob is trying to place an item on someone
-// Defined in living.dm
-/mob/proc/stripPanelEquip(obj/item/what, mob/who)
- return
-
-
/mob/MouseDrop(mob/living/user, src_location, over_location, src_control, over_control, params)
. = ..()
- if(!. || usr != user || usr == src || !user.can_strip)
+ if(!. || usr != user || usr == src || !HAS_TRAIT(user, TRAIT_CAN_STRIP))
return FALSE
if(isliving(user) && user.mob_size <= MOB_SIZE_SMALL)
return FALSE // Stops pAI drones and small mobs (borers, parrots, crabs) from stripping people. --DZD
@@ -667,8 +555,7 @@
return FALSE
if(isLivingSSD(src) && user.client?.send_ssd_warning(src))
return FALSE
- show_inv(user)
-
+ SEND_SIGNAL(src, COMSIG_DO_MOB_STRIP, user, usr)
/mob/proc/is_mechanical()
return mind && (mind.assigned_role == JOB_TITLE_CYBORG || mind.assigned_role == JOB_TITLE_AI)
@@ -701,130 +588,10 @@
/mob/proc/is_muzzled()
return 0
-/mob/Stat()
- ..()
-
- show_stat_turf_contents()
-
- statpanel("Status") // We only want alt-clicked turfs to come before Status
- stat(null, "Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]")
-
- for(var/obj/effect/proc_holder/spell/spell as anything in mob_spell_list)
- add_spell_to_statpanel(spell)
- if(mind && isliving(src))
- for(var/obj/effect/proc_holder/spell/spell as anything in mind.spell_list)
- add_spell_to_statpanel(spell)
-
- // Allow admins + PR reviewers to VIEW the panel. Doesnt mean they can click things.
- if((is_admin(src) || check_rights(R_VIEWRUNTIMES, FALSE)))
- // Shows SDQL2 list
- if(length(GLOB.sdql2_queries))
- if(statpanel("SDQL2"))
- stat("Access Global SDQL2 List", GLOB.sdql2_vv_statobj)
- for(var/i in GLOB.sdql2_queries)
- var/datum/sdql2_query/Q = i
- Q.generate_stat()
- // Below are checks to see which MC panel you are looking at
- if(client?.prefs.toggles2 & PREFTOGGLE_2_MC_TABS)
- // Shows MC Metadata
- if(statpanel("MC|M"))
- stat("Info", "Showing MC metadata")
- var/turf/T = get_turf(client.eye)
- stat("Location:", COORD(T))
- stat("CPU:", "[Master.formatcpu(world.cpu)]")
- stat("Map CPU:", "[Master.formatcpu(world.map_cpu)]")
- //stat("Map CPU:", "[Master.formatcpu(world.map_cpu)]")
- stat("Instances:", "[num2text(world.contents.len, 10)]")
- GLOB.stat_entry()
- stat("Server Time:", time_stamp())
- if(Master)
- Master.stat_entry()
- else
- stat("Master Controller:", "ERROR")
- if(Failsafe)
- Failsafe.stat_entry()
- else
- stat("Failsafe Controller:", "ERROR")
-
- // Shows subsystems with SS_NO_FIRE
- if(statpanel("MC|N"))
- stat("Info", "Showing subsystems that do not fire")
- if(Master)
- for(var/datum/controller/subsystem/SS as anything in Master.subsystems)
- if(SS.flags & SS_NO_FIRE)
- SS.stat_entry()
-
- // Shows subsystems with the SS_CPUDISPLAY_LOW flag
- if(statpanel("MC|L"))
- stat("Info", "Showing subsystems marked as low intensity")
- if(Master)
- for(var/datum/controller/subsystem/SS as anything in Master.subsystems)
- if((SS.cpu_display == SS_CPUDISPLAY_LOW) && !(SS.flags & SS_NO_FIRE))
- SS.stat_entry()
-
- // Shows subsystems with the SS_CPUDISPLAY_DEFAULT flag
- if(statpanel("MC|D"))
- stat("Info", "Showing subsystems marked as default intensity")
- if(Master)
- for(var/datum/controller/subsystem/SS as anything in Master.subsystems)
- if((SS.cpu_display == SS_CPUDISPLAY_DEFAULT) && !(SS.flags & SS_NO_FIRE))
- SS.stat_entry()
-
- // Shows subsystems with the SS_CPUDISPLAY_HIGH flag
- if(statpanel("MC|H"))
- stat("Info", "Showing subsystems marked as high intensity")
- if(Master)
- for(var/datum/controller/subsystem/SS as anything in Master.subsystems)
- if((SS.cpu_display == SS_CPUDISPLAY_HIGH) && !(SS.flags & SS_NO_FIRE))
- SS.stat_entry()
-
- statpanel("Status") // Switch to the Status panel again, for the sake of the lazy Stat procs
-
- if(client?.statpanel == "Status")
- if(SSticker)
- show_stat_station_time()
- stat(null, "Players Connected: [length(GLOB.clients)]")
-
-
-// this function displays the station time in the status panel
-/mob/proc/show_stat_station_time()
- stat(null, "Current Map: [SSmapping.map_datum.name]")
- if(SSmapping.next_map)
- stat(null, "Next Map: [SSmapping.next_map.name]")
- stat(null, "Round Time: [ROUND_TIME_TEXT()]")
- stat(null, "Station Time: [station_time_timestamp()]")
- stat(null, "Server TPS: [world.fps]")
- stat(null, "Desired Client FPS: [client?.prefs?.clientfps]")
- stat(null, "Time Dilation: [round(SStime_track.time_dilation_current,1)]% " + \
- "AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, " + \
- "[round(SStime_track.time_dilation_avg,1)]%, " + \
- "[round(SStime_track.time_dilation_avg_slow,1)]%)")
- stat(null, "Ping: [round(client.lastping, 1)]ms (Average: [round(client.avgping, 1)]ms)")
-
-// this function displays the shuttles ETA in the status panel if the shuttle has been called
-/mob/proc/show_stat_emergency_shuttle_eta()
- var/ETA = SSshuttle.emergency.getModeStr()
- if(ETA)
- stat(null, "[ETA] [SSshuttle.emergency.getTimerStr()]")
-
-/mob/proc/show_stat_turf_contents()
- if(listed_turf && client)
- if(!TurfAdjacent(listed_turf))
- listed_turf = null
- else
- statpanel(listed_turf.name, null, listed_turf)
- var/list/statpanel_things = list()
- for(var/foo in listed_turf)
- var/atom/A = foo
- if(A.invisibility > see_invisible)
- continue
- if(!A.simulated)
- continue
- statpanel_things += A
- statpanel(listed_turf.name, null, statpanel_things)
-
-/mob/proc/add_spell_to_statpanel(obj/effect/proc_holder/spell/S)
- statpanel(S.panel,"[S.cooldown_handler.statpanel_info()]", S)
+/mob/proc/get_status_tab_items()
+ SHOULD_CALL_PARENT(TRUE)
+ var/list/status_tab_data = list()
+ return status_tab_data
// facing verbs
/mob/proc/canface()
@@ -1169,6 +936,9 @@
/mob/proc/can_resist()
return FALSE //overridden in living.dm
+///Can this mob use strip menu (defaut TRUE)
+/mob/proc/can_strip()
+ return TRUE
///Spin this mob around it's central axis
/mob/proc/spin(spintime, speed)
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 11f72edb9fe..6a080055ca2 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -71,7 +71,6 @@
var/gen_record = ""
var/exploit_record = ""
var/lastpuke = 0
- var/can_strip = 1
/// For speaking/listening.
var/list/languages
/// For reagents that grant language knowlege.
@@ -232,8 +231,9 @@
var/obj/effect/proc_holder/ranged_ability //Any ranged ability the mob has, as a click override
- /// The datum receiving keyboard input. parent mob by default.
- var/datum/input_focus = null
+ /// The datum receiving keyboard input. src by default
+ var/datum/focus
+
var/last_emote = null
var/ghost_orbiting = 0
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index fb173c3b1f9..5eaa8ad55a0 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -40,9 +40,8 @@
if(world.time < move_delay) //do not move anything ahead of this check please
return FALSE
- input_data.desired_move_dir_add = NONE
- input_data.desired_move_dir_sub = NONE
-
+ next_move_dir_add = NONE
+ next_move_dir_sub = NONE
var/old_move_delay = move_delay
move_delay = world.time + world.tick_lag //this is here because Move() can now be called multiple times per tick
@@ -462,13 +461,6 @@
var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(next_in_line)
-/client/verb/toggle_walk_run()
- set name = "toggle-walk-run"
- set hidden = TRUE
- set instant = TRUE
- if(mob)
- mob.toggle_move_intent()
-
/client/verb/toggle_throw_mode()
set hidden = 1
@@ -479,7 +471,7 @@
to_chat(usr, "Это существо не может бросать предметы.")
-/mob/proc/toggle_move_intent()
+/mob/proc/toggle_move_intent(new_move_intent)
return
/mob/verb/move_up()
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index f6e60e83376..d1f68d197f2 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -25,20 +25,26 @@
client.screen = list() // Remove HUD items just in case.
client.images = list()
if(!hud_used)
- create_mob_hud()
+ create_mob_hud() // creating a hud will add it to the client's screen, which can process a disconnect
+ if(!client)
+ return FALSE
if(hud_used)
- hud_used.show_hud(hud_used.hud_version)
+ hud_used.show_hud(hud_used.hud_version) // see above, this can process a disconnect
+ if(!client)
+ return FALSE
add_sight(SEE_TURFS)
GLOB.player_list |= src
+ GLOB.new_player_mobs |= src
new_player_panel()
if(ckey in GLOB.deadmins)
- verbs += /client/proc/readmin
- spawn(40)
- if(client)
- client.playtitlemusic()
+ add_verb(src, /client/proc/readmin)
+ . = TRUE
+
+ spawn(4 SECONDS)
+ client?.playtitlemusic()
/mob/new_player/proc/whitelist_check()
// Admins are immune to overflow rerouting
diff --git a/code/modules/mob/new_player/logout.dm b/code/modules/mob/new_player/logout.dm
index de6f38f337f..de8dc20fdcc 100644
--- a/code/modules/mob/new_player/logout.dm
+++ b/code/modules/mob/new_player/logout.dm
@@ -1,6 +1,7 @@
/mob/new_player/Logout()
- ready = 0
+ ready = FALSE
..()
+ GLOB.new_player_mobs -= src
if(!spawning)//Here so that if they are spawning and log out, the other procs can play out and they will have a mob to come back to.
key = null//We null their key before deleting the mob, so they are properly kicked out.
qdel(src)
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 3af28ac104e..f1e55b0dd6b 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -19,7 +19,7 @@
GLOB.mob_list += src
return INITIALIZE_HINT_NORMAL
-/mob/new_player/verb/new_player_panel()
+/mob/new_player/proc/new_player_panel()
set src = usr
if(client.tos_consent)
@@ -84,36 +84,24 @@
popup.open(0)
return
-/mob/new_player/Stat()
- statpanel("Status")
-
- ..()
-
- statpanel("Lobby")
- if(client.statpanel=="Lobby" && SSticker)
- if(SSticker.hide_mode)
- stat("Game Mode:", "Secret")
+/mob/new_player/get_status_tab_items()
+ var/list/status_tab_data = ..()
+ . = status_tab_data
+ if(SSticker)
+ if(!SSticker.hide_mode)
+ status_tab_data[++status_tab_data.len] = list("Game Mode:", "[GLOB.master_mode]")
else
- if(SSticker.hide_mode == 0)
- stat("Game Mode:", "[GLOB.master_mode]") // Old setting for showing the game mode
- else
- stat("Game Mode: ", "Secret")
+ status_tab_data[++status_tab_data.len] = list("Game Mode:", "Secret")
- if((SSticker.current_state == GAME_STATE_PREGAME) && SSticker.ticker_going)
- stat("Time To Start:", round(SSticker.pregame_timeleft/10))
- if((SSticker.current_state == GAME_STATE_PREGAME) && !SSticker.ticker_going)
- stat("Time To Start:", "DELAYED")
+ if(SSticker.current_state == GAME_STATE_PREGAME)
+ status_tab_data[++status_tab_data.len] = list("Time To Start:", SSticker.ticker_going ? deciseconds_to_time_stamp(SSticker.pregame_timeleft) : "DELAYED")
if(SSticker.current_state == GAME_STATE_PREGAME)
- stat("Players:", "[totalPlayers]")
- //if(check_rights(R_ADMIN, 0, src))
- stat("Players Ready:", "[totalPlayersReady]")
- totalPlayers = 0
+ status_tab_data[++status_tab_data.len] = list("Players Ready:", "[totalPlayersReady]")
totalPlayersReady = 0
for(var/mob/new_player/player in GLOB.player_list)
if(check_rights(R_ADMIN, 0, src))
- stat("[player.key]", (player.ready)?("(Playing)"):(null))
- totalPlayers++
+ status_tab_data[++status_tab_data.len] = list("[player.key]", player.ready ? "(Ready)" : "(Not ready)")
if(player.ready)
totalPlayersReady++
@@ -130,8 +118,9 @@
query.warn_execute()
qdel(query)
src << browse(null, "window=privacy_consent")
- client.tos_consent = TRUE
- new_player_panel_proc()
+ if(client)
+ client.tos_consent = TRUE
+ new_player_panel_proc()
if(href_list["consent_rejected"])
client.tos_consent = FALSE
to_chat(usr, "You must consent to the terms of service before you can join!")
@@ -298,7 +287,8 @@
if(client)
client.prefs.process_link(src, href_list)
else if(!href_list["late_join"])
- new_player_panel()
+ if(client)
+ new_player_panel()
/mob/new_player/proc/IsJobAvailable(rank)
var/datum/job/job = SSjobs.GetJob(rank)
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index cfb36aa6094..dc9d3c935d2 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -113,30 +113,5 @@ GLOBAL_LIST_EMPTY(typing_indicator)
else
set_typing_indicator(FALSE)
-/client/verb/typing_indicator()
- set name = "Show/Hide Typing Indicator"
- set category = "Preferences"
- set desc = "Toggles showing an indicator when you are typing a message."
- prefs.toggles ^= PREFTOGGLE_SHOW_TYPING
- prefs.save_preferences(src)
- to_chat(src, "You will [(prefs.toggles & PREFTOGGLE_SHOW_TYPING) ? "no longer" : "now"] display a typing indicator.")
-
- // Clear out any existing typing indicator.
- if(prefs.toggles & PREFTOGGLE_SHOW_TYPING)
- if(istype(mob))
- mob.set_typing_indicator(FALSE)
-
- SSblackbox.record_feedback("tally", "toggle_verbs", 1, "Toggle Typing Indicator (Speech)") //If you are copy-pasting this, ensure the 4th parameter is unique to the new proc!
-
-
-/client/verb/emote_indicator()
- set name = "Show/Hide Emote Typing Indicator"
- set category = "Preferences"
- set desc = "Toggles showing an indicator when you are typing an emote."
- prefs.toggles2 ^= PREFTOGGLE_2_EMOTE_BUBBLE
- prefs.save_preferences(src)
- to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_EMOTE_BUBBLE) ? "no longer" : "now"] display a typing indicator for emotes.")
-
- SSblackbox.record_feedback("tally", "toggle_verbs", 1, "Toggle Typing Indicator (Emote)") //If you are copy-pasting this, ensure the 4th parameter is unique to the new proc!
#undef TYPING_INDICATOR_LIFETIME
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 4a42a7e7045..8435cc36855 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -288,7 +288,6 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
SStgui.update_uis(src)
/obj/machinery/photocopier/faxmachine/verb/eject_id()
- set category = null
set name = "Eject ID Card"
set src in oview(1)
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index df24f0f048d..255ec092a3f 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -768,6 +768,11 @@
populatefields()
+/obj/item/paper/central_command/archive/station_reports
+ info = "Приветствую Центральное командование
Сообщает вам ██████████ █████████, в должности капитан .
В данный момент на станции код: Зеленый
Активные угрозы для станции: Отсуствуют
![](\"https://cdn.discordapp.com/attachments/961279768249118750/1079288344657277008/NVNcWzVwAHs.png?width=736&height=736\")
![](\"https://cdn.discordapp.com/attachments/961279768249118750/1046826506741104830/unknown.png?width=604&height=604\")
![](\"https://cdn.discordapp.com/attachments/961279768249118750/1168235730171080704/image.png?width=1919&height=824\")