"
- dat += render_prompt(user)
- dat += render_choices(user)
+ dat += render_prompt()
+ dat += render_choices()
dat += " "
dat += " "
- dat += button("Submit", "submit=1", , result == null && !immediate_submit)
+ dat += render_buttons()
dat += "
"
return dat
-/datum/async_input/proc/render_prompt(mob/user)
+/datum/async_input/proc/render_prompt()
return "
"
if(convo.typing)
dat += "[current_title] is typing"
dat += " "
@@ -327,17 +339,23 @@
if(check_rights(R_ADMIN, FALSE, user))
dat += "Ping"
- var/datum/browser/popup = new(user, window_id, "Messages", 1000, 600, src)
popup.set_content(dat)
popup.open()
open = TRUE
/datum/pm_tracker/proc/fancy_title(title)
- var/client/C = pms[title].client
+ var/client/C = pms[title].client || update_client(title)
if(!C)
return "[title] (Disconnected)"
return "[key_name(C, FALSE)] ([ADMIN_QUE(C.mob,"?")]) ([ADMIN_PP(C.mob,"PP")]) ([ADMIN_VV(C.mob,"VV")]) ([ADMIN_SM(C.mob,"SM")]) ([admin_jump_link(C.mob)]) (CA)"
+/datum/pm_tracker/proc/update_client(title)
+ var/client/C = GLOB.directory[ckey(title)]
+ if(C)
+ pms[title].client = C
+ return C
+ return null
+
/datum/pm_tracker/Topic(href, href_list)
if(href_list["archive"])
pms[href_list["archive"]].archived = !pms[href_list["archive"]].archived
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index e3fe5af3263..6f6b3484924 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -17,6 +17,10 @@
feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/client/proc/get_admin_say()
+ var/msg = input(src, null, "asay \"text\"") as text|null
+ cmd_admin_say(msg)
+
/client/proc/cmd_mentor_say(msg as text)
set category = "Admin"
set name = "Msay"
diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm
index 3874e26e9de..e1bbc885c75 100644
--- a/code/modules/admin/verbs/deadsay.dm
+++ b/code/modules/admin/verbs/deadsay.dm
@@ -43,3 +43,7 @@
say_dead_direct("[prefix] says, \"[msg]\"")
feedback_add_details("admin_verb","D") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/proc/get_dead_say()
+ var/msg = input(src, null, "dsay \"text\"") as text
+ dsay(msg)
\ No newline at end of file
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 0d5a866e6c5..f2fde8df758 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -116,7 +116,7 @@
a_right.holder_movement()
/obj/item/assembly_holder/Move()
- ..()
+ . = ..()
process_movement()
return
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index d6da1fb4d0e..98e59a7cbb5 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -106,7 +106,7 @@
/obj/item/assembly/infra/Move()
var/t = dir
- ..()
+ . = ..()
dir = t
qdel(first)
diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm
index 995ee519474..fd89434331e 100644
--- a/code/modules/client/client defines.dm
+++ b/code/modules/client/client defines.dm
@@ -1,4 +1,8 @@
/client
+ //////////////////////
+ //BLACK MAGIC THINGS//
+ //////////////////////
+ parent_type = /datum
////////////////
//ADMIN THINGS//
////////////////
@@ -24,7 +28,7 @@
var/adminhelped = 0
- var/gc_destroyed //Time when this object was destroyed.
+ // var/gc_destroyed //Time when this object was destroyed. [Inherits from datum]
#ifdef TESTING
var/running_find_references
@@ -89,5 +93,5 @@
// If set to true, this client can interact with atoms such as buttons and doors on top of regular machinery interaction
var/advanced_admin_interaction = FALSE
- // Has the client been varedited by an admin?
- var/var_edited = FALSE
+ // Has the client been varedited by an admin? [Inherits from datum now]
+ // var/var_edited = FALSE
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 922502698fa..4e59dc2c1cf 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -297,14 +297,14 @@
return null
if(byond_build < config.minimum_client_build)
alert(src, "You are using a byond build which is not supported by this server. Please use a build version of atleast [config.minimum_client_build].", "Incorrect build", "OK")
- del(src)
+ qdel(src)
return
if(byond_version < SUGGESTED_CLIENT_VERSION) // Update is suggested, but not required.
to_chat(src,"Your BYOND client (v: [byond_version]) is out of date. This can cause glitches. We highly suggest you download the latest client from http://www.byond.com/ before playing. ")
if(IsGuestKey(key))
alert(src,"This server doesn't allow guest accounts to play. Please go to http://www.byond.com/ and register for a key.","Guest","OK")
- del(src)
+ qdel(src)
return
// Change the way they should download resources.
@@ -317,7 +317,6 @@
GLOB.clients += src
GLOB.directory[ckey] = src
-
//Admin Authorisation
// Automatically makes localhost connection an admin
if(!config.disable_localhost_admin)
@@ -365,11 +364,14 @@
. = ..() //calls mob.Login()
+
if(ckey in clientmessages)
for(var/message in clientmessages[ckey])
to_chat(src, message)
clientmessages.Remove(ckey)
+ if(SSinput.initialized)
+ set_macros()
donator_check()
check_ip_intel()
@@ -404,8 +406,7 @@
if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them.
to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.")
-
-
+
//This is down here because of the browse() calls in tooltip/New()
if(!tooltips)
tooltips = new /datum/tooltip(src)
@@ -664,7 +665,7 @@
sleep(10) // Since browse is non-instant, and kinda async
to_chat(src, "
you're a huge nerd. wakka wakka doodle doop nobody's ever gonna see this, the chat system shouldn't be online by this point
")
- del(src)
+ qdel(src)
return TRUE
else
if (!topic || !topic["token"] || !tokens[ckey] || topic["token"] != tokens[ckey])
@@ -675,7 +676,7 @@
tokens[ckey] = cid_check_reconnect()
sleep(10) //browse is queued, we don't want them to disconnect before getting the browse() command.
- del(src)
+ qdel(src)
return TRUE
// We DO have their cached CID handy - compare it, now
if(oldcid != computer_id)
@@ -693,7 +694,7 @@
log_adminwarn("Failed Login: [key] [computer_id] [address] - CID randomizer confirmed (oldcid: [oldcid])")
- del(src)
+ qdel(src)
return TRUE
else
// don't shoot, I'm innocent
@@ -795,18 +796,15 @@
/* Mainwindow */
winset(src, "mainwindow.saybutton", "background-color=#40628a;text-color=#FFFFFF")
winset(src, "mainwindow.mebutton", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "mainwindow.hotkey_toggle", "background-color=#40628a;text-color=#FFFFFF")
///// UI ELEMENTS /////
/* Mainwindow */
winset(src, "mainwindow", "background-color=#272727")
winset(src, "mainwindow.mainvsplit", "background-color=#272727")
winset(src, "mainwindow.tooltip", "background-color=#272727")
/* Outputwindow */
- winset(src, "outputwindow.outputwindow", "background-color=#272727")
winset(src, "outputwindow.browseroutput", "background-color=#272727")
/* Rpane */
winset(src, "rpane", "background-color=#272727")
- winset(src, "rpane.rpane", "background-color=#272727")
winset(src, "rpane.rpanewindow", "background-color=#272727")
/* Browserwindow */
winset(src, "browserwindow", "background-color=#272727")
@@ -830,18 +828,15 @@
/* Mainwindow */
winset(src, "mainwindow.saybutton", "background-color=none;text-color=#000000")
winset(src, "mainwindow.mebutton", "background-color=none;text-color=#000000")
- winset(src, "mainwindow.hotkey_toggle", "background-color=none;text-color=#000000")
///// UI ELEMENTS /////
/* Mainwindow */
winset(src, "mainwindow", "background-color=none")
winset(src, "mainwindow.mainvsplit", "background-color=none")
winset(src, "mainwindow.tooltip", "background-color=none")
/* Outputwindow */
- winset(src, "outputwindow.outputwindow", "background-color=none")
winset(src, "outputwindow.browseroutput", "background-color=none")
/* Rpane */
winset(src, "rpane", "background-color=none")
- winset(src, "rpane.rpane", "background-color=none")
winset(src, "rpane.rpanewindow", "background-color=none")
/* Browserwindow */
winset(src, "browserwindow", "background-color=none")
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index 75e0f549a1d..e09fc89736a 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -81,7 +81,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
var/lastchangelog = "" //Saved changlog filesize to detect if there was a change
var/exp
var/ooccolor = "#b82e00"
- var/be_special = list() //Special role selection
+ var/list/be_special = list() //Special role selection
var/UI_style = "Midnight"
var/nanoui_fancy = TRUE
var/toggles = TOGGLES_DEFAULT
@@ -455,6 +455,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
dat += "Ghost Ears:[(toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"] "
dat += "Ghost Radio:[(toggles & CHAT_GHOSTRADIO) ? "All Chatter" : "Nearest Speakers"] "
dat += "Ghost Sight:[(toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"] "
+ dat += "Ghost PDA:[(toggles & CHAT_GHOSTPDA) ? "All PDA Messages" : "No PDA Messages"] "
if(check_rights(R_ADMIN,0))
dat += "OOC Color:Change "
if(config.allow_Metadata)
@@ -2029,6 +2030,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if("ghost_radio")
toggles ^= CHAT_GHOSTRADIO
+
+ if("ghost_pda")
+ toggles ^= CHAT_GHOSTPDA
if("ghost_anonsay")
ghost_anonsay = !ghost_anonsay
@@ -2280,3 +2284,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
/datum/preferences/proc/close_load_dialog(mob/user)
user << browse(null, "window=saves")
+
+//Check if the user has ANY job selected.
+/datum/preferences/proc/check_any_job()
+ return(job_support_high || job_support_med || job_support_low || job_medsci_high || job_medsci_med || job_medsci_low || job_engsec_high || job_engsec_med || job_engsec_low || job_karma_high || job_karma_med || job_karma_low)
diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm
index c4d7599d2de..e164a2ab843 100644
--- a/code/modules/client/preference/preferences_toggles.dm
+++ b/code/modules/client/preference/preferences_toggles.dm
@@ -241,4 +241,36 @@
to_chat(usr, "You have enabled text popup limiting.")
else
to_chat(usr, "You have disabled text popup limiting.")
+ return
+/client/verb/numpad_target()
+ set name = "Toggle Numpad targetting"
+ set category = "Preferences"
+ set desc = "This button will allow you to enable or disable Numpad Targetting"
+ prefs.toggles ^= NUMPAD_TARGET
+ prefs.save_preferences(src)
+ if (prefs.toggles & NUMPAD_TARGET)
+ to_chat(usr, "You have enabled Numpad Targetting.")
+ else
+ to_chat(usr, "You have disabled Numpad Targetting.")
+ return
+
+/client/verb/azerty_toggle()
+ set name = "Toggle QWERTY/AZERTY"
+ set category = "Preferences"
+ set desc = "This button will switch you between QWERTY and AZERTY control sets"
+ prefs.toggles ^= AZERTY
+ prefs.save_preferences(src)
+ if (prefs.toggles & AZERTY)
+ to_chat(usr, "You are now in AZERTY mode.")
+ else
+ to_chat(usr, "You are now in QWERTY mode.")
+ 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 ^= CHAT_GHOSTPDA
+ to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTPDA) ? "see all PDA messages" : "no longer see PDA messages"].")
+ prefs.save_preferences(src)
+ feedback_add_details("admin_verb","TGP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 227374bd420..8e5e658e31a 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -64,7 +64,6 @@
item_state = "lgloves"
flags = NODROP
-
/obj/item/clothing/gloves/color/yellow/stun
name = "stun gloves"
desc = "Horrendous and awful. It smells like cancer. The fact it has wires attached to it is incidental."
@@ -72,6 +71,9 @@
var/stun_strength = 5
var/stun_cost = 2000
+/obj/item/clothing/gloves/color/yellow/stun/get_cell()
+ return cell
+
/obj/item/clothing/gloves/color/yellow/stun/New()
..()
update_icon()
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 85840d5db42..b11dfd45d68 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -110,12 +110,23 @@
/obj/item/clothing/mask/muzzle/safety
name = "safety muzzle"
desc = "A muzzle designed to prevent biting."
- resist_time = 600
+ icon_state = "muzzle_secure"
+ item_state = "muzzle_secure"
+ resist_time = 0
mute = MUZZLE_MUTE_NONE
security_lock = TRUE
locked = FALSE
materials = list(MAT_METAL=500, MAT_GLASS=50)
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
+ "Grey" = 'icons/mob/species/grey/mask.dmi',
+ "Drask" = 'icons/mob/species/drask/mask.dmi'
+ )
+
/obj/item/clothing/mask/muzzle/safety/shock
name = "shock muzzle"
desc = "A muzzle designed to prevent biting. This one is fitted with a behavior correction system."
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 913e65af734..b463a513764 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -97,6 +97,9 @@
to_chat(usr, "The maintenance panel is [open ? "open" : "closed"].")
to_chat(usr, "Hardsuit systems are [offline ? "offline" : "online"].")
+/obj/item/rig/get_cell()
+ return cell
+
/obj/item/rig/New()
..()
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index adcb1639c12..91527f2dd19 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -857,3 +857,36 @@
icon_state = "burial"
item_state = "burial"
item_color = "burial"
+
+/obj/item/clothing/under/redhawaiianshirt
+ name = "red hawaiian shirt"
+ desc = "a floral shirt worn to most vacation destinations."
+ icon_state = "hawaiianred"
+ item_state = "hawaiianred"
+ item_color = "hawaiianred"
+ flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/pinkhawaiianshirt
+ name = "pink hawaiian shirt"
+ desc = "a pink floral shirt the material feels cool and comfy."
+ icon_state = "hawaiianpink"
+ item_state = "hawaiianpink"
+ item_color = "hawaiianpink"
+ flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/orangehawaiianshirt
+ name = "orange hawaiian shirt"
+ desc = "a orange floral shirt for a relaxing day in space."
+ icon_state = "hawaiianorange"
+ item_state = "hawaiianorange"
+ item_color = "hawaiianorange"
+ flags_size = ONESIZEFITSALL
+
+/obj/item/clothing/under/bluehawaiianshirt
+ name = "blue hawaiian shirt"
+ desc = "a blue floral shirt it has a oddly colored pink flower on it."
+ icon_state = "hawaiianblue"
+ item_state = "hawaiianblue"
+ item_color = "hawaiianblue"
+ flags_size = ONESIZEFITSALL
+
diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm
index e42030b6622..96fd9c11c1e 100644
--- a/code/modules/events/disease_outbreak.dm
+++ b/code/modules/events/disease_outbreak.dm
@@ -1,7 +1,7 @@
/datum/event/disease_outbreak
announceWhen = 15
- var/virus_type
+ var/datum/disease/advance/virus_type
/datum/event/disease_outbreak/setup()
announceWhen = rand(15, 30)
@@ -10,9 +10,13 @@
event_announcement.Announce("Confirmed outbreak of level 7 major viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
/datum/event/disease_outbreak/start()
- if(!virus_type)
+ if(prob(25))
virus_type = pick(/datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/brainrot, /datum/disease/magnitis, /datum/disease/beesease, /datum/disease/anxiety, /datum/disease/fake_gbs, /datum/disease/fluspanish, /datum/disease/pierrot_throat, /datum/disease/lycan)
-
+ else
+ virus_type = new /datum/disease/advance
+ virus_type.name = capitalize(pick(GLOB.adjectives)) + " " + capitalize(pick(GLOB.nouns,GLOB.verbs)) // random silly name
+ virus_type.GenerateSymptoms(1,9,6)
+ virus_type.AssignProperties(list("resistance" = rand(0,11), "stealth" = rand(0,2), "stage_rate" = rand(0,5), "transmittable" = rand(0,5), "severity" = rand(0,10)))
for(var/mob/living/carbon/human/H in shuffle(GLOB.living_mob_list))
if(issmall(H)) //don't infect monkies; that's a waste
continue
@@ -32,8 +36,8 @@
if(H.stat == DEAD || foundAlready)
continue
- var/datum/disease/D
- D = new virus_type()
+ var/datum/disease/advance/D
+ D = virus_type
D.carrier = TRUE
H.AddDisease(D)
break
diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm
index c92ec910cdc..811eed6b9de 100644
--- a/code/modules/events/wormholes.dm
+++ b/code/modules/events/wormholes.dm
@@ -41,14 +41,14 @@
icon_state = "anom"
failchance = 0
+/obj/effect/portal/wormhole/can_teleport(atom/movable/M)
+ . = ..()
+
+ if(istype(M, /obj/singularity))
+ . = FALSE
+
/obj/effect/portal/wormhole/teleport(atom/movable/M)
- if(!istype(M))
- return FALSE
-
- if(!M.simulated || iseffect(M))
- return FALSE
-
- if(M.anchored && ismecha(M))
+ if(!can_teleport(M))
return FALSE
var/turf/target
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 48b4453f6d4..3cd95f37923 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -164,7 +164,7 @@
// Virology Medical Smartfridge
// ----------------------------
/obj/machinery/smartfridge/secure/chemistry/virology
- name = "smart virus storage"
+ name = "Smart Virus Storage"
desc = "A refrigerated storage unit for volatile sample storage."
req_access_txt = "39"
spawn_meds = list(/obj/item/reagent_containers/syringe/antiviral = 4,
@@ -386,7 +386,8 @@
return data
/obj/machinery/smartfridge/Topic(href, href_list)
- if(..()) return 0
+ if(..())
+ return FALSE
var/mob/user = usr
var/datum/nanoui/ui = SSnanoui.get_open_ui(user, src, "main")
@@ -396,7 +397,7 @@
if(href_list["close"])
user.unset_machine()
ui.close()
- return 0
+ return FALSE
if(href_list["vend"])
var/index = text2num(href_list["vend"])
@@ -409,17 +410,26 @@
item_quants[K] = max(count - amount, 0)
var/i = amount
- for(var/obj/O in contents)
- if(O.name == K)
- O.forceMove(loc)
- adjust_item_drop_location(O)
- update_icon()
- i--
- if(i <= 0)
- return 1
-
- return 1
- return 0
+ if(i == 1 && Adjacent(user) && !issilicon(user))
+ for(var/obj/O in contents)
+ if(O.name == K)
+ if(!user.put_in_hands(O))
+ O.forceMove(loc)
+ adjust_item_drop_location(O)
+ update_icon()
+ break
+ return TRUE
+ else
+ for(var/obj/O in contents)
+ if(O.name == K)
+ O.forceMove(loc)
+ adjust_item_drop_location(O)
+ update_icon()
+ i--
+ if(i <= 0)
+ return TRUE
+ return TRUE
+ return FALSE
/obj/machinery/smartfridge/proc/throw_item()
var/obj/throw_item = null
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index cc6c6115097..52f188a9d1d 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -319,6 +319,8 @@
else if(href_list["create"])
var/amount = (text2num(href_list["amount"]))
+ //Can't be outside these (if you change this keep a sane limit)
+ amount = Clamp(amount, 1, 10)
var/datum/design/D = locate(href_list["create"])
create_product(D, amount)
updateUsrDialog()
diff --git a/code/modules/keybindings/bindings_admin.dm b/code/modules/keybindings/bindings_admin.dm
new file mode 100644
index 00000000000..1413d9b0f8d
--- /dev/null
+++ b/code/modules/keybindings/bindings_admin.dm
@@ -0,0 +1,21 @@
+/datum/admins/key_down(_key, client/user)
+ switch(_key)
+ if("F5")
+ user.get_admin_say()
+ return
+ if("F6")
+ user.admin_ghost()
+ return
+ if("F7")
+ player_panel_new()
+ return
+ if("F8")
+ user.cmd_admin_pm_panel()
+ return
+ if("F9")
+ user.stealth()
+ return
+ if("F10")
+ user.get_dead_say()
+ return
+ ..()
diff --git a/code/modules/keybindings/bindings_atom.dm b/code/modules/keybindings/bindings_atom.dm
new file mode 100644
index 00000000000..6b1e0afe199
--- /dev/null
+++ b/code/modules/keybindings/bindings_atom.dm
@@ -0,0 +1,21 @@
+// 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)
+ if(!user.keys_held["Ctrl"])
+ var/movement_dir = NONE
+ var/list/movement = SSinput.movement_keys
+ if(user.prefs.toggles & AZERTY)
+ movement = SSinput.alt_movement_keys
+ for(var/_key in user.keys_held)
+ movement_dir = movement_dir | movement[_key]
+ if(user.next_move_dir_add)
+ movement_dir |= user.next_move_dir_add
+ 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)
+ user.Move(get_step(src, movement_dir), movement_dir)
\ No newline at end of file
diff --git a/code/modules/keybindings/bindings_carbon.dm b/code/modules/keybindings/bindings_carbon.dm
new file mode 100644
index 00000000000..81784696b35
--- /dev/null
+++ b/code/modules/keybindings/bindings_carbon.dm
@@ -0,0 +1,20 @@
+/mob/living/carbon/key_down(_key, client/user)
+ user.keys_held[_key] = world.time
+ if(!user.keys_held["Shift"])
+ switch(_key)
+ if("R", "Southwest") // Southwest is End
+ toggle_throw_mode()
+ return
+ if("1")
+ a_intent_change("help")
+ return
+ if("2")
+ a_intent_change("disarm")
+ return
+ if("3")
+ a_intent_change("grab")
+ return
+ if("4")
+ a_intent_change("harm")
+ return
+ return ..()
\ No newline at end of file
diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm
new file mode 100644
index 00000000000..75c30f232b5
--- /dev/null
+++ b/code/modules/keybindings/bindings_client.dm
@@ -0,0 +1,56 @@
+// 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
+ keys_held[_key] = world.time
+ var/movement = SSinput.movement_keys[_key]
+ if (prefs.toggles & AZERTY) movement = SSinput.alt_movement_keys[_key]
+ if(!(next_move_dir_sub & movement) && !keys_held["Ctrl"])
+ 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.
+
+ switch(_key)
+ if("F1")
+ if(keys_held["Ctrl"] && keys_held["Shift"]) // Is this command ever used?
+ winset(src, null, "command=.options")
+ else
+ adminhelp()
+ return
+ if("F2") // Screenshot. Hold shift to choose a name and location to save in
+ ooc()
+ return
+ if("F4")
+ mob.me_verb()
+ return
+ if("F12") // Toggles minimal HUD
+ mob.button_pressed_F12()
+ return
+
+ if(holder)
+ holder.key_down(_key, src)
+ if(mob.focus)
+ mob.focus.key_down(_key, src)
+
+/client/verb/keyUp(_key as text)
+ set instant = TRUE
+ set hidden = TRUE
+ keys_held -= _key
+ var/movement = SSinput.movement_keys[_key]
+ if (prefs.toggles & AZERTY) movement = SSinput.alt_movement_keys[_key]
+ if(!(next_move_dir_add & movement))
+ next_move_dir_sub |= movement
+
+ if(holder)
+ holder.key_up(_key, src)
+ if(mob.focus)
+ mob.focus.key_up(_key, src)
+
+// Called every game tick
+/client/keyLoop()
+ if(holder)
+ holder.keyLoop(src)
+ if(mob.focus)
+ mob.focus.keyLoop(src)
\ No newline at end of file
diff --git a/code/modules/keybindings/bindings_human.dm b/code/modules/keybindings/bindings_human.dm
new file mode 100644
index 00000000000..5e8ced96ab6
--- /dev/null
+++ b/code/modules/keybindings/bindings_human.dm
@@ -0,0 +1,80 @@
+/mob/living/carbon/human/key_down(_key, client/user)
+ if(_key == "H")
+ var/obj/item/clothing/accessory/holster/H = null
+ if(istype(w_uniform, /obj/item/clothing/under))
+ var/obj/item/clothing/under/S = w_uniform
+ if(S.accessories.len)
+ H = locate() in S.accessories
+ if (!H)
+ return
+ if(!H.holstered)
+ if(!istype(get_active_hand(), /obj/item/gun))
+ to_chat(usr, "You need your gun equiped to holster it.")
+ return
+ var/obj/item/gun/W = get_active_hand()
+ H.holster(W, usr)
+ else
+ H.unholster(usr)
+ if(client.keys_held["Shift"])
+ switch(_key)
+ if("E") // Put held thing in belt or take out most recent thing from belt
+ quick_equip() // Implementing the storage component is going to take way too long
+ // var/obj/item/thing = get_active_hand()
+ // var/obj/item/equipped_belt = get_item_by_slot(slot_belt)
+ // if(!equipped_belt) // We also let you equip a belt like this
+ // if(!thing)
+ // to_chat(user, "You have no belt to take something out of.")
+ // return
+ // if(equip_to_slot_if_possible(thing, slot_belt))
+ // update_inv_r_hand()
+ // update_inv_l_hand()
+ // return
+ // if(!SEND_SIGNAL(equipped_belt, COMSIG_CONTAINS_STORAGE)) // not a storage item
+ // if(!thing)
+ // equipped_belt.attack_hand(src)
+ // else
+ // to_chat(user, "You can't fit anything in.")
+ // return
+ // if(thing) // put thing in belt
+ // if(!SEND_SIGNAL(equipped_belt, COMSIG_TRY_STORAGE_INSERT, thing, user.mob))
+ // to_chat(user, "You can't fit anything in.")
+ // return
+ // if(!equipped_belt.contents.len) // nothing to take out
+ // to_chat(user, "There's nothing in your belt to take out.")
+ // return
+ // var/obj/item/stored = equipped_belt.contents[equipped_belt.contents.len]
+ // if(!stored || stored.on_found(src))
+ // return
+ // stored.attack_hand(src) // take out thing from belt
+ // return
+
+ /* if("B") // Put held thing in backpack or take out most recent thing from backpack
+ var/obj/item/thing = get_active_hand()
+ var/obj/item/equipped_back = get_item_by_slot(slot_back)
+ if(!equipped_back) // We also let you equip a backpack like this
+ if(!thing)
+ to_chat(user, "You have no backpack to take something out of.")
+ return
+ if(equip_to_slot_if_possible(thing, slot_back))
+ update_inv_r_hand()
+ update_inv_l_hand()
+ return
+ if(!SEND_SIGNAL(equipped_back, COMSIG_CONTAINS_STORAGE)) // not a storage item
+ if(!thing)
+ equipped_back.attack_hand(src)
+ else
+ to_chat(user, "You can't fit anything in.")
+ return
+ if(thing) // put thing in backpack
+ if(!SEND_SIGNAL(equipped_back, COMSIG_TRY_STORAGE_INSERT, thing, user.mob))
+ to_chat(user, "You can't fit anything in.")
+ return
+ if(!equipped_back.contents.len) // nothing to take out
+ to_chat(user, "There's nothing in your backpack to take out.")
+ return
+ var/obj/item/stored = equipped_back.contents[equipped_back.contents.len]
+ if(!stored || stored.on_found(src))
+ return
+ stored.attack_hand(src) // take out thing from backpack
+ return */
+ return ..()
\ No newline at end of file
diff --git a/code/modules/keybindings/bindings_living.dm b/code/modules/keybindings/bindings_living.dm
new file mode 100644
index 00000000000..241bc15b608
--- /dev/null
+++ b/code/modules/keybindings/bindings_living.dm
@@ -0,0 +1,7 @@
+/mob/living/key_down(_key, client/user)
+ switch(_key)
+ if("B")
+ resist()
+ return
+
+ return ..()
\ No newline at end of file
diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm
new file mode 100644
index 00000000000..4ede6b63c7b
--- /dev/null
+++ b/code/modules/keybindings/bindings_mob.dm
@@ -0,0 +1,145 @@
+// Technically the client argument is unncessary here since that SHOULD be src.client but let's not assume things
+// All it takes is one badmin setting their focus to someone else's client to mess things up
+// Or we can have NPC's send actual keypresses and detect that by seeing no client
+
+/mob/key_down(_key, client/user)
+ if(user.prefs.toggles & AZERTY)
+ switch(_key)
+ if("Delete")
+ if(!pulling)
+ to_chat(src, "You are not pulling anything.")
+ else
+ stop_pulling()
+ return
+ if("Insert", "G")
+ a_intent_change(INTENT_HOTKEY_RIGHT)
+ return
+ if("F")
+ a_intent_change(INTENT_HOTKEY_LEFT)
+ return
+ if("X", "Northeast") // Northeast is Page-up
+ swap_hand()
+ return
+ if("Y", "W", "Southeast") // Southeast is Page-down
+ mode() // attack_self(). No idea who came up with "mode()"
+ return
+ if("A", "Northwest") // Northwest is Home
+ var/obj/item/I = get_active_hand()
+ if(!I)
+ to_chat(src, "You have nothing to drop in your hand!")
+ else
+ drop_item(I)
+ return
+ if("E")
+ quick_equip()
+ return
+ if("Alt")
+ toggle_move_intent()
+ return
+ else
+ switch(_key)
+ if("Delete")
+ if(!pulling)
+ to_chat(src, "You are not pulling anything.")
+ else
+ stop_pulling()
+ return
+ if("Insert", "G")
+ a_intent_change(INTENT_HOTKEY_RIGHT)
+ return
+ if("F")
+ a_intent_change(INTENT_HOTKEY_LEFT)
+ return
+ if("X", "Northeast") // Northeast is Page-up
+ swap_hand()
+ return
+ if("Y", "Z", "Southeast") // Southeast is Page-down
+ mode() // attack_self(). No idea who came up with "mode()"
+ return
+ if("Q", "Northwest") // Northwest is Home
+ var/obj/item/I = get_active_hand()
+ if(!I)
+ to_chat(src, "You have nothing to drop in your hand!")
+ else
+ drop_item(I)
+ return
+ if("E")
+ quick_equip()
+ return
+ if("Alt")
+ toggle_move_intent()
+ return
+ //Bodypart selections
+ if(client.prefs.toggles & NUMPAD_TARGET)
+ switch(_key)
+ if("Numpad8")
+ user.body_toggle_head()
+ return
+ if("Numpad4")
+ user.body_r_arm()
+ return
+ if("Numpad5")
+ user.body_chest()
+ return
+ if("Numpad6")
+ user.body_l_arm()
+ return
+ if("Numpad1")
+ user.body_r_leg()
+ return
+ if("Numpad2")
+ user.body_groin()
+ return
+ if("Numpad3")
+ user.body_l_leg()
+ return
+ else
+ switch(_key)
+ if("Numpad1")
+ a_intent_change("help")
+ return
+ if("Numpad2")
+ a_intent_change("disarm")
+ return
+ if("Numpad3")
+ a_intent_change("grab")
+ return
+ if("Numpad4")
+ a_intent_change("harm")
+ return
+ if(client.keys_held["Ctrl"] && client.prefs.toggles & AZERTY)
+ switch(SSinput.alt_movement_keys[_key])
+ if(NORTH)
+ northface()
+ return
+ if(SOUTH)
+ southface()
+ return
+ if(WEST)
+ westface()
+ return
+ if(EAST)
+ eastface()
+ return
+ else if(client.keys_held["Ctrl"])
+ switch(SSinput.movement_keys[_key])
+ if(NORTH)
+ northface()
+ return
+ if(SOUTH)
+ southface()
+ return
+ if(WEST)
+ westface()
+ return
+ if(EAST)
+ eastface()
+ return
+ return ..()
+
+/mob/key_up(_key, client/user)
+ switch(_key)
+ if("Alt")
+ toggle_move_intent()
+ return
+ return ..()
\ No newline at end of file
diff --git a/code/modules/keybindings/bindings_robot.dm b/code/modules/keybindings/bindings_robot.dm
new file mode 100644
index 00000000000..a6b3cd3f21e
--- /dev/null
+++ b/code/modules/keybindings/bindings_robot.dm
@@ -0,0 +1,15 @@
+/mob/living/silicon/robot/key_down(_key, client/user)
+ switch(_key)
+ if("1", "2", "3")
+ toggle_module(text2num(_key))
+ return
+ if("4")
+ a_intent_change(INTENT_HOTKEY_LEFT)
+ return
+ if("X")
+ cycle_modules()
+ return
+ if("Q")
+ uneq_active()
+ return
+ return ..()
\ No newline at end of file
diff --git a/code/modules/keybindings/focus.dm b/code/modules/keybindings/focus.dm
new file mode 100644
index 00000000000..9cfbf36c5d3
--- /dev/null
+++ b/code/modules/keybindings/focus.dm
@@ -0,0 +1,8 @@
+/mob
+ var/datum/focus //What receives our keyboard inputs. src by default
+
+/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
\ No newline at end of file
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..ad87622b709
--- /dev/null
+++ b/code/modules/keybindings/setup.dm
@@ -0,0 +1,46 @@
+/client
+ var/list/keys_held = list() // A list of any keys held currently
+ // These next two vars are to apply movement for keypresses and releases made while move delayed.
+ // Because discarding that input makes the game less responsive.
+ var/next_move_dir_add // On next move, add this dir to the move that would otherwise be done
+ var/next_move_dir_sub // On next move, subtract this dir from the move that would otherwise be done
+
+// 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) // Called when a key is pressed down initially
+ 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
+
+// removes all the existing macros
+/client/proc/erase_all_macros()
+ var/list/macro_sets = params2list(winget(src, null, "macros"))
+ var/erase_output = ""
+ for(var/i in 1 to macro_sets.len)
+ var/setname = macro_sets[i]
+ var/list/macro_set = params2list(winget(src, "[setname].*", "command")) // The third arg doesnt matter here as we're just removing them all
+ for(var/k in 1 to macro_set.len)
+ 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)
+
+/client/proc/set_macros()
+ set waitfor = FALSE
+
+ erase_all_macros()
+
+ var/list/macro_sets = SSinput.macro_sets
+ for(var/i in 1 to macro_sets.len)
+ 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 macro_set.len)
+ var/key = macro_set[k]
+ var/command = macro_set[key]
+ winset(src, "[setname]-\ref[key]", "parent=[setname];name=[key];command=[command]")
+ winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=default")
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index d846e065761..9a88dd50259 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -238,6 +238,9 @@
/obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O)
return isitem(O)
+/obj/machinery/smartfridge/survival_pod/default_unfasten_wrench()
+ return FALSE
+
/obj/machinery/smartfridge/survival_pod/empty
name = "dusty survival pod storage"
desc = "A heated storage unit. This one's seen better days."
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 10823051563..9d6ca608759 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -905,6 +905,7 @@
throw_range = 5
var/loaded = 1
var/malfunctioning = 0
+ var/revive_type = SENTIENCE_ORGANIC //So you can't revive boss monsters or robots with it
/obj/item/lazarus_injector/afterattack(atom/target, mob/user, proximity_flag)
if(!loaded)
@@ -912,6 +913,9 @@
if(istype(target, /mob/living) && proximity_flag)
if(istype(target, /mob/living/simple_animal))
var/mob/living/simple_animal/M = target
+ if(M.sentience_type != revive_type)
+ to_chat(user, "[src] does not work on this sort of creature.")
+ return
if(M.stat == DEAD)
M.faction = list("neutral")
M.revive()
diff --git a/code/modules/mining/explorer_gear.dm b/code/modules/mining/explorer_gear.dm
index 6453f54c979..a9464efe959 100644
--- a/code/modules/mining/explorer_gear.dm
+++ b/code/modules/mining/explorer_gear.dm
@@ -1,43 +1,44 @@
-/****************Explorer's Suit and Mask****************/
-/obj/item/clothing/suit/hooded/explorer
- name = "explorer suit"
- desc = "An armoured suit for exploring harsh environments."
- icon_state = "explorer"
- item_state = "explorer"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
- heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- hoodtype = /obj/item/clothing/head/hooded/explorer
- armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
- allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
- resistance_flags = FIRE_PROOF
-
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Drask" = 'icons/mob/species/drask/suit.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi'
- )
-
-/obj/item/clothing/head/hooded/explorer
- name = "explorer hood"
- desc = "An armoured hood for exploring harsh environments."
- icon_state = "explorer"
- item_state = "explorer"
- body_parts_covered = HEAD
- flags = BLOCKHAIR | NODROP
- flags_cover = HEADCOVERSEYES
- min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
- max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
- armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
- resistance_flags = FIRE_PROOF
-
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi',
- "Drask" = 'icons/mob/species/drask/head.dmi',
- "Grey" = 'icons/mob/species/grey/head.dmi',
- "Skrell" = 'icons/mob/species/skrell/head.dmi'
+/****************Explorer's Suit and Mask****************/
+/obj/item/clothing/suit/hooded/explorer
+ name = "explorer suit"
+ desc = "An armoured suit for exploring harsh environments."
+ icon_state = "explorer"
+ item_state = "explorer"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ hoodtype = /obj/item/clothing/head/hooded/explorer
+ armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
+ allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
+ resistance_flags = FIRE_PROOF
+ hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
+
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/suit.dmi',
+ "Drask" = 'icons/mob/species/drask/suit.dmi',
+ "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
+ "Unathi" = 'icons/mob/species/unathi/suit.dmi',
+ "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi'
+ )
+
+/obj/item/clothing/head/hooded/explorer
+ name = "explorer hood"
+ desc = "An armoured hood for exploring harsh environments."
+ icon_state = "explorer"
+ item_state = "explorer"
+ body_parts_covered = HEAD
+ flags = BLOCKHAIR | NODROP
+ flags_cover = HEADCOVERSEYES
+ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+ max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
+ armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
+ resistance_flags = FIRE_PROOF
+
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/head.dmi',
+ "Drask" = 'icons/mob/species/drask/head.dmi',
+ "Grey" = 'icons/mob/species/grey/head.dmi',
+ "Skrell" = 'icons/mob/species/skrell/head.dmi'
)
\ No newline at end of file
diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index d3e22e5bca2..fb2b915f146 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -1,3 +1,5 @@
+GLOBAL_LIST(labor_sheet_values)
+
/**********************Prisoners' Console**************************/
/obj/machinery/mineral/labor_claim_console
@@ -5,153 +7,153 @@
desc = "A stacking console with an electromagnetic writer, used to track ore mined by prisoners."
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
- density = 0
- anchored = 1
- var/obj/machinery/mineral/stacking_machine/laborstacker/machine = null
+ density = FALSE
+ var/obj/machinery/mineral/stacking_machine/laborstacker/stacking_machine = null
var/machinedir = SOUTH
var/obj/item/card/id/prisoner/inserted_id
var/obj/machinery/door/airlock/release_door
var/door_tag = "prisonshuttle"
- var/use_release_door = 0
var/obj/item/radio/intercom/announcer
-
-/obj/machinery/mineral/labor_claim_console/New()
- ..()
+/obj/machinery/mineral/labor_claim_console/Initialize()
+ . = ..()
announcer = new /obj/item/radio/intercom(null)
announcer.config(list("Security" = 0))
+ locate_stacking_machine()
- spawn(7)
- src.machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
- var/t
- for(var/obj/machinery/door/airlock/d in range(5,src))
- t = d.id_tag
- if(t == src.door_tag)
- src.release_door = d
- if(machine && (release_door || !use_release_door))
- machine.CONSOLE = src
+ if(!GLOB.labor_sheet_values)
+ var/sheet_list = list()
+ for(var/sheet_type in subtypesof(/obj/item/stack/sheet))
+ var/obj/item/stack/sheet/sheet = sheet_type
+ if(!initial(sheet.point_value) || (initial(sheet.merge_type) && initial(sheet.merge_type) != sheet_type)) //ignore no-value sheets and x/fifty subtypes
+ continue
+ sheet_list += list(list("ore" = initial(sheet.name), "value" = initial(sheet.point_value)))
+ GLOB.labor_sheet_values = sheet_list
+
+/obj/machinery/mineral/labor_claim_console/Destroy()
+ . = ..()
+ QDEL_NULL(announcer)
+
+/proc/cmp_sheet_list(list/a, list/b)
+ return a["value"] - b["value"]
+
+/obj/machinery/mineral/labor_claim_console/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/card/id/prisoner))
+ if(!inserted_id)
+ if(!user.unEquip(I))
+ return
+ I.forceMove(src)
+ inserted_id = I
+ to_chat(user, "You insert [I].")
+ SSnanoui.update_uis(src)
+ return
else
- qdel(src)
+ to_chat(user, "There's an ID inserted already.")
+ return ..()
+
+/obj/machinery/mineral/labor_claim_console/attack_hand(mob/user)
+ ui_interact(user)
+
+/obj/machinery/mineral/labor_claim_console/attack_ghost(mob/user)
+ attack_hand(user)
+
+/obj/machinery/mineral/labor_claim_console/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
+ ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "labor_claim_console.tmpl", name, 450, 625, state)
+ ui.open()
+
+/obj/machinery/mineral/labor_claim_console/ui_data(mob/user)
+ var/list/data = list()
+ var/can_go_home = FALSE
+
+ data["emagged"] = (emagged) ? TRUE : FALSE
+ if(inserted_id)
+ data["id"] = inserted_id
+ data["id_name"] = inserted_id.registered_name
+ data["points"] = inserted_id.points
+ data["goal"] = inserted_id.goal
+ if(check_auth())
+ can_go_home = TRUE
+
+ if(stacking_machine)
+ data["unclaimed_points"] = stacking_machine.points
+
+ data["ores"] = GLOB.labor_sheet_values
+ data["can_go_home"] = can_go_home
+
+ return data
+
+/obj/machinery/mineral/labor_claim_console/Topic(href, href_list)
+ if(..())
+ return TRUE
+
+ if(href_list["handle_id"])
+ if(inserted_id)
+ if(!usr.put_in_hands(inserted_id))
+ inserted_id.forceMove(get_turf(src))
+ inserted_id = null
+ else
+ var/obj/item/I = usr.get_active_hand()
+ if(istype(I, /obj/item/card/id/prisoner))
+ if(!usr.unEquip(I))
+ return
+ I.forceMove(src)
+ inserted_id = I
+ if(href_list["claim_points"])
+ inserted_id.points += stacking_machine.points
+ stacking_machine.points = 0
+ to_chat(usr, "Points transferred.")
+ if(href_list["move_shuttle"])
+ if(!alone_in_area(get_area(src), usr))
+ to_chat(usr, "Prisoners are only allowed to be released while alone.")
+ else
+ switch(SSshuttle.moveShuttle("laborcamp", "laborcamp_home", TRUE))
+ if(1)
+ to_chat(usr, "Shuttle not found.")
+ if(2)
+ to_chat(usr, "Shuttle already at station.")
+ if(3)
+ to_chat(usr, "No permission to dock could be granted.")
+ else
+ if(!(emagged))
+ var/message = "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval."
+ announcer.autosay(message, "Labor Camp Controller", "Security")
+ to_chat(usr, "Shuttle received message and will be sent shortly.")
+
+ return TRUE
/obj/machinery/mineral/labor_claim_console/proc/check_auth()
- if(emagged) return 1 //Shuttle is emagged, let any ol' person through
+ if(emagged)
+ return TRUE //Shuttle is emagged, let any ol' person through
return (istype(inserted_id) && inserted_id.points >= inserted_id.goal) //Otherwise, only let them out if the prisoner's reached his quota.
+/obj/machinery/mineral/labor_claim_console/proc/locate_stacking_machine()
+ stacking_machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
+ if(stacking_machine)
+ stacking_machine.CONSOLE = src
+ else
+ qdel(src)
-/obj/machinery/mineral/labor_claim_console/attack_hand(user as mob)
- var/dat
- dat += text("Point Claim Console
")
- if(emagged) //Shit's broken
- dat += text("QU&#t0A In%aL*D ")
- else if(istype(inserted_id)) //There's an ID in there.
- dat += text("ID: [inserted_id.registered_name] Eject ID. ")
- dat += text("Points Collected:[inserted_id.points] ")
- dat += text("Point Quota: [inserted_id.goal] - Reach your quota to earn your release ")
- dat += text("Unclaimed Collection Points: [machine.points]. Claim points. ")
- else //No ID in sight. Complain about it.
- dat += text("No ID inserted. Insert ID. ")
- if(check_auth())
- dat += text("Proceed to station. ")
- if(use_release_door)
- dat += text("Open release door. ")
- if(machine)
- dat += text("Mineral Value List: [machine.get_ore_values()]")
-
-
- user << browse("[dat]", "window=console_stacking_machine")
-
-
-/obj/machinery/mineral/labor_claim_console/attackby(obj/item/I as obj, mob/user as mob, params)
- if(istype(I, /obj/item/card/id))
- return attack_hand(user)
- ..()
-
-/obj/machinery/mineral/labor_claim_console/emag_act(user as mob)
- emag(user)
-
-/obj/machinery/mineral/labor_claim_console/proc/emag(mob/user as mob)
- if(!emagged)
- emagged = 1
+/obj/machinery/mineral/labor_claim_console/emag_act(mob/user)
+ if(!(emagged))
+ emagged = TRUE
to_chat(user, "PZZTTPFFFT")
-
-/obj/machinery/mineral/labor_claim_console/Topic(href, href_list)
- usr.set_machine(src)
- src.add_fingerprint(usr)
- if(href_list["choice"])
- if(istype(inserted_id)) //Sanity check against href spoofs
- if(href_list["choice"] == "eject")
- inserted_id.loc = loc
- inserted_id.verb_pickup()
- inserted_id = null
- if(href_list["choice"] == "claim")
- inserted_id.points += machine.points
- machine.points = 0
- to_chat(src, "Points transferred.")
- else if(href_list["choice"] == "insert")
- var/obj/item/card/id/prisoner/I = usr.get_active_hand()
- if(istype(I))
- usr.drop_item()
- I.loc = src
- inserted_id = I
- else
- to_chat(usr, "Invalid ID.")
- if(check_auth()) //Sanity check against hef spoofs
- if(href_list["choice"] == "station")
- if(!alone_in_area(get_area(src), usr))
- to_chat(usr, "Prisoners are only allowed to be released while alone.")
- else
- switch(SSshuttle.moveShuttle("laborcamp","laborcamp_home"))
- if(1)
- to_chat(usr, "Shuttle not found")
- if(2)
- to_chat(usr, "Shuttle already at station")
- if(3)
- to_chat(usr, "No permission to dock could be granted.")
- else
- var/message = "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval."
- announcer.autosay(message, "Labor Camp Controller", "Security")
- to_chat(usr, "Shuttle received message and will be sent shortly.")
-
- if(href_list["choice"] == "release")
- if(alone_in_area(get_area(loc), usr))
- var/obj/docking_port/stationary/S = SSshuttle.getDock("laborcamp_home")
- if(S && S.get_docked())
- if(release_door && release_door.density)
- release_door.open()
- else
- to_chat(usr, "Prisoners can only be released while docked with the station.")
- else
- to_chat(usr, "Prisoners are only allowed to be released while alone.")
-
- src.updateUsrDialog()
- return
-
-
/**********************Prisoner Collection Unit**************************/
-
-
/obj/machinery/mineral/stacking_machine/laborstacker
- var/points = 0 //The unclaimed value of ore stacked. Value for each ore loosely relative to its rarity.
- var/list/ore_values = list(("glass" = 1), ("metal" = 2), ("solid plasma" = 20), ("plasteel" = 23), ("reinforced glass" = 4), ("gold" = 20), ("silver" = 20), ("uranium" = 20), ("diamond" = 25), ("bananium" = 50), ("tranquillite" = 50))
-
-/obj/machinery/mineral/stacking_machine/laborstacker/proc/get_ore_values()
- var/dat = "
"
- for(var/ore in ore_values)
- var/value = ore_values[ore]
- dat += "
[capitalize(ore)]
[value]
"
- dat += "
"
- return dat
+ var/points = 0 //The unclaimed value of ore stacked.
/obj/machinery/mineral/stacking_machine/laborstacker/process_sheet(obj/item/stack/sheet/inp)
- if(istype(inp))
- var/n = inp.name
- var/a = inp.amount
- if(n in ore_values)
- points += ore_values[n] * a
+ points += inp.point_value * inp.amount
..()
+/obj/machinery/mineral/stacking_machine/laborstacker/attackby(obj/item/I, mob/living/user)
+ if(istype(I, /obj/item/stack/sheet) && user.canUnEquip(I))
+ var/obj/item/stack/sheet/inp = I
+ points += inp.point_value * inp.amount
+ return ..()
/**********************Point Lookup Console**************************/
/obj/machinery/mineral/labor_points_checker
@@ -159,13 +161,15 @@
desc = "A console used by prisoners to check the progress on their quotas. Simply swipe a prisoner ID."
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
- density = 0
- anchored = 1
+ density = FALSE
/obj/machinery/mineral/labor_points_checker/attack_hand(mob/user)
- user.examine(src)
+ . = ..()
+ if(.)
+ return
+ user.examinate(src)
-/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I as obj, mob/user as mob, params)
+/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/card/id))
if(istype(I, /obj/item/card/id/prisoner))
var/obj/item/card/id/prisoner/prisoner_id = I
@@ -175,5 +179,5 @@
to_chat(user, "Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release.")
else
to_chat(user, "Error: Invalid ID")
- return
- ..()
+ else
+ return ..()
\ No newline at end of file
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 8ba8b13c09c..f10b78dc526 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -82,6 +82,7 @@
/obj/item/flashlight/lantern
name = "lantern"
icon_state = "lantern"
+ item_state = "lantern"
desc = "A mining lantern."
brightness_on = 6 // luminosity when on
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index c8c7d5c32e3..2d1ff8d82da 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -263,7 +263,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
..()
statpanel("Status")
if(client.statpanel == "Status")
- show_stat_station_time()
show_stat_emergency_shuttle_eta()
stat(null, "Respawnability: [(src in GLOB.respawnable_list) ? "Yes" : "No"]")
@@ -402,9 +401,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
to_chat(usr, "Not when you're not dead!")
return
- var/area/A = input("Area to jump to", "BOOYEA") as null|anything in ghostteleportlocs
- var/area/thearea = ghostteleportlocs[A]
+ var/datum/async_input/A = input_autocomplete_async(usr, "Area to jump to: ", ghostteleportlocs)
+ A.on_close(CALLBACK(src, .proc/teleport))
+/mob/dead/observer/proc/teleport(area/thearea)
if(!thearea)
return
@@ -425,9 +425,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set desc = "Follow and orbit a mob."
var/list/mobs = getpois(skip_mindless=1)
- var/input = input("Please, select a mob!", "Haunt", null, null) as null|anything in mobs
- var/mob/target = mobs[input]
- ManualFollow(target)
+ var/datum/async_input/A = input_autocomplete_async(usr, "Please, select a mob: ", mobs)
+ A.on_close(CALLBACK(src, .proc/ManualFollow))
// This is the ghost's follow verb with an argument
/mob/dead/observer/proc/ManualFollow(var/atom/movable/target)
@@ -499,25 +498,21 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set name = "Jump to Mob"
set desc = "Teleport to a mob"
- if(isobserver(usr)) //Make sure they're an observer!
- var/list/dest = list() //List of possible destinations (mobs)
- var/target = null //Chosen target.
+ if(isobserver(usr)) //Make sure they're an observer!
+ var/list/dest = getpois(mobs_only=1) //Fill list, prompt user with list
+ var/datum/async_input/A = input_autocomplete_async(usr, "Enter a mob name: ", dest)
+ A.on_close(CALLBACK(src, .proc/jump_to_mob))
- dest += getpois(mobs_only=1) //Fill list, prompt user with list
- target = input("Please, select a mob!", "Jump to Mob", null, null) as null|anything in dest
-
- if(!target) //Make sure we actually have a target
- return
- else
- var/mob/M = dest[target] //Destination mob
- var/mob/A = src //Source mob
- var/turf/T = get_turf(M) //Turf of the destination mob
-
- if(T && isturf(T)) //Make sure the turf exists, then move the source to that destination.
- A.forceMove(T)
- else
- to_chat(A, "This mob is not located in the game world.")
+/mob/dead/observer/proc/jump_to_mob(mob/M)
+ if(!M)
+ return
+ var/mob/A = src //Source mob
+ var/turf/T = get_turf(M) //Turf of the destination mob
+ if(T && isturf(T)) //Make sure the turf exists, then move the source to that destination.
+ A.forceMove(T)
+ return
+ to_chat(A, "This mob is not located in the game world.")
/* Now a spell. See spells.dm
/mob/dead/observer/verb/boo()
diff --git a/code/modules/mob/dead/observer/spells.dm b/code/modules/mob/dead/observer/spells.dm
index 916ff9aa9b8..e890098b29b 100644
--- a/code/modules/mob/dead/observer/spells.dm
+++ b/code/modules/mob/dead/observer/spells.dm
@@ -15,6 +15,7 @@ GLOBAL_LIST_INIT(boo_phrases, list(
ghost = TRUE
+ action_icon_state = "boo"
school = "transmutation"
charge_max = 600
starts_charged = FALSE
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index bb7bcfc94e1..35a08d0ce10 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -6,6 +6,14 @@
if(hand) return l_hand
else return r_hand
+/mob/verb/quick_equip()
+ set name = "quick-equip"
+ set hidden = 1
+
+ var/obj/item/I = get_active_hand()
+ if(I)
+ I.equip_to_best_slot(src)
+
/mob/proc/is_in_active_hand(obj/item/I)
var/obj/item/item_to_test = get_active_hand()
@@ -254,3 +262,4 @@
if(slot_r_hand)
return r_hand
return null
+
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index df0afa62f49..8d17b84c724 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -95,7 +95,6 @@ I'm using this for Stat to give it a more nifty interface to work with
..()
if(has_synthetic_assistance())
statpanel("Status")
- show_stat_station_time()
show_stat_emergency_shuttle_eta()
if(client.statpanel == "Status")
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 2c7a2d67c55..a8dbaa7ac2f 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -216,56 +216,7 @@
add_attack_logs(M, src, "Shaked", ATKLOG_ALL)
if(health >= HEALTH_THRESHOLD_CRIT)
if(src == M && ishuman(src))
- var/mob/living/carbon/human/H = src
- visible_message( \
- text("[src] examines [].",gender==MALE?"himself":"herself"), \
- "You check yourself for injuries." \
- )
-
- var/list/missing = list("head", "chest", "groin", "l_arm", "r_arm", "l_hand", "r_hand", "l_leg", "r_leg", "l_foot", "r_foot")
- for(var/X in H.bodyparts)
- var/obj/item/organ/external/LB = X
- missing -= LB.limb_name
- var/status = ""
- var/brutedamage = LB.brute_dam
- var/burndamage = LB.burn_dam
-
- if(brutedamage > 0)
- status = "bruised"
- if(brutedamage > 20)
- status = "battered"
- if(brutedamage > 40)
- status = "mangled"
- if(brutedamage > 0 && burndamage > 0)
- status += " and "
- if(burndamage > 40)
- status += "peeling away"
-
- else if(burndamage > 10)
- status += "blistered"
- else if(burndamage > 0)
- status += "numb"
- if(LB.status & ORGAN_MUTATED)
- status = "weirdly shapen."
- if(status == "")
- status = "OK"
- to_chat(src, "\t Your [LB.name] is [status].")
-
- for(var/obj/item/I in LB.embedded_objects)
- to_chat(src, "\t There is \a [I] embedded in your [LB.name]!")
-
- for(var/t in missing)
- to_chat(src, "Your [parse_zone(t)] is missing!")
-
- if(H.bleed_rate)
- to_chat(src, "You are bleeding!")
- if(staminaloss)
- if(staminaloss > 30)
- to_chat(src, "You're completely exhausted.")
- else
- to_chat(src, "You feel fatigued.")
- if((SKELETON in H.mutations) && (!H.w_uniform) && (!H.wear_suit))
- H.play_xylophone()
+ check_self_for_injuries()
else
if(player_logged)
M.visible_message("[M] shakes [src], but [p_they()] [p_do()] not respond. Probably suffering from SSD.", \
@@ -308,6 +259,58 @@
else if(H.w_uniform)
H.w_uniform.add_fingerprint(M)
+/mob/living/carbon/proc/check_self_for_injuries()
+ var/mob/living/carbon/human/H = src
+ visible_message( \
+ text("[src] examines [].",gender==MALE?"himself":"herself"), \
+ "You check yourself for injuries." \
+ )
+
+ var/list/missing = list("head", "chest", "groin", "l_arm", "r_arm", "l_hand", "r_hand", "l_leg", "r_leg", "l_foot", "r_foot")
+ for(var/X in H.bodyparts)
+ var/obj/item/organ/external/LB = X
+ missing -= LB.limb_name
+ var/status = ""
+ var/brutedamage = LB.brute_dam
+ var/burndamage = LB.burn_dam
+
+ if(brutedamage > 0)
+ status = "bruised"
+ if(brutedamage > 20)
+ status = "battered"
+ if(brutedamage > 40)
+ status = "mangled"
+ if(brutedamage > 0 && burndamage > 0)
+ status += " and "
+ if(burndamage > 40)
+ status += "peeling away"
+
+ else if(burndamage > 10)
+ status += "blistered"
+ else if(burndamage > 0)
+ status += "numb"
+ if(LB.status & ORGAN_MUTATED)
+ status = "weirdly shapen."
+ if(status == "")
+ status = "OK"
+ to_chat(src, "\t Your [LB.name] is [status].")
+
+ for(var/obj/item/I in LB.embedded_objects)
+ to_chat(src, "\t There is \a [I] embedded in your [LB.name]!")
+
+ for(var/t in missing)
+ to_chat(src, "Your [parse_zone(t)] is missing!")
+
+ if(H.bleed_rate)
+ to_chat(src, "You are bleeding!")
+ if(staminaloss)
+ if(staminaloss > 30)
+ to_chat(src, "You're completely exhausted.")
+ else
+ to_chat(src, "You feel fatigued.")
+ if((SKELETON in H.mutations) && (!H.w_uniform) && (!H.wear_suit))
+ H.play_xylophone()
+
/mob/living/carbon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0)
. = ..()
var/damage = intensity - check_eye_prot()
@@ -972,6 +975,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
to_chat(src, "You [slipVerb]ped on [description]!")
playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
// Something something don't run with scissors
+ moving_diagonally = 0 //If this was part of diagonal move slipping will stop it.
Stun(stun)
Weaken(weaken)
return 1
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 52636efb896..c0e8badf35d 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -106,6 +106,12 @@
else //Everyone else fails, skip the emote attempt
return
+ if("warble", "warbles")
+ if(isskrell(src)) //Only Skrell can warble.
+ on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm'
+ else //Everyone else fails, skip the emote attempt
+ return
+
if("scream", "screams")
on_CD = handle_emote_CD(50) //longer cooldown
if("fart", "farts", "flip", "flips", "snap", "snaps")
@@ -221,6 +227,13 @@
playsound(loc, 'sound/effects/voxrustle.ogg', 50, 0) //Credit to sound-ideas (freesfx.co.uk) for the sound.
m_type = 2
+ if("warble", "warbles")
+ var/M = handle_emote_param(param)
+
+ message = "[src] warbles[M ? " at [M]" : ""]."
+ playsound(loc, 'sound/effects/warble.ogg', 50, 0) // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound.
+ m_type = 2
+
if("yes")
var/M = handle_emote_param(param)
@@ -904,6 +917,8 @@
emotelist += "\nVox specific emotes :- quill(s)"
if("Diona")
emotelist += "\nDiona specific emotes :- creak(s)"
+ if("Skrell")
+ emotelist += "\nSkrell specific emotes :- warble(s)"
if(ismachine(src))
emotelist += "\nMachine specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob, buzz2-(none)/mob"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index bc0c33c233d..6481f6bc04a 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -162,8 +162,6 @@
stat(null, "Intent: [a_intent]")
stat(null, "Move Mode: [m_intent]")
- show_stat_station_time()
-
show_stat_emergency_shuttle_eta()
if(client.statpanel == "Status")
@@ -1480,19 +1478,22 @@
if(usr != src)
return 0 //something is terribly wrong
-
+ if(incapacitated())
+ 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
- if(src.gloves)
- to_chat(src, "Your [src.gloves] are getting in the way.")
+ if(gloves)
+ to_chat(src, "[gloves] are preventing you from writing anything down!")
return
- var/turf/simulated/T = src.loc
+ var/turf/simulated/T = loc
if(!istype(T)) //to prevent doodling out of mechs and lockers
to_chat(src, "You cannot reach the floor.")
return
+ var/turf/origin = T
var/direction = input(src,"Which way?","Tile selection") as anything in list("Here","North","South","East","West")
if(direction != "Here")
T = get_step(T,text2dir(direction))
@@ -1510,7 +1511,9 @@
var/max_length = bloody_hands * 30 //tweeter style
var/message = stripped_input(src,"Write a message. It cannot be longer than [max_length] characters.","Blood writing", "")
-
+ if(origin != loc)
+ to_chat(src, "Stay still while writing!")
+ return
if(message)
var/used_blood_amount = round(length(message) / 30, 1)
bloody_hands = max(0, bloody_hands - used_blood_amount) //use up some blood
@@ -1518,7 +1521,8 @@
if(length(message) > max_length)
message += "-"
to_chat(src, "You ran out of blood to write with!")
-
+ else
+ to_chat(src, "You daub '[message]' on [T] in shiny red lettering.")
var/obj/effect/decal/cleanable/blood/writing/W = new(T)
W.message = message
W.add_fingerprint(src)
@@ -1935,7 +1939,6 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
. += "---"
.["Set Species"] = "?_src_=vars;setspecies=[UID()]"
.["Make AI"] = "?_src_=vars;makeai=[UID()]"
- .["Make Mask of Nar'sie"] = "?_src_=vars;makemask=[UID()]"
.["Make cyborg"] = "?_src_=vars;makerobot=[UID()]"
.["Make monkey"] = "?_src_=vars;makemonkey=[UID()]"
.["Make alien"] = "?_src_=vars;makealien=[UID()]"
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 47dd5622379..cf9fcfd632c 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -1,11 +1,3 @@
-/mob/living/carbon/human/verb/quick_equip()
- set name = "quick-equip"
- set hidden = 1
-
- var/obj/item/I = get_active_hand()
- if(I)
- I.equip_to_best_slot(src)
-
/mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = 1)
for(var/slot in slots)
if(equip_to_slot_if_possible(W, slots[slot], del_on_fail = 0))
diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm
index 85f491f71f0..438d3386948 100644
--- a/code/modules/mob/living/carbon/human/species/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/_species.dm
@@ -341,9 +341,6 @@
if(SKELETON in target.mutations)
to_chat(user, "There is no blood in a skeleton!")
return
- if(issmall(target) && !target.ckey) //Monkeyized humans are okay, humanized monkeys are okay, NPC monkeys are not.
- to_chat(user, "Blood from a monkey is useless!")
- return
//we're good to suck the blood, blaah
user.mind.vampire.handle_bloodsucking(target)
add_attack_logs(user, target, "vampirebit")
@@ -603,20 +600,37 @@
H.healthdoll.cached_healthdoll_overlays = new_overlays
/datum/species/proc/handle_hud_icons_nutrition(mob/living/carbon/human/H)
- switch(H.nutrition)
- if(NUTRITION_LEVEL_FULL to INFINITY)
- H.throw_alert("nutrition", /obj/screen/alert/fat)
- if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL)
- H.throw_alert("nutrition", /obj/screen/alert/full)
- if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED)
- H.throw_alert("nutrition", /obj/screen/alert/well_fed)
- if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED)
- H.throw_alert("nutrition", /obj/screen/alert/fed)
- if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
- H.throw_alert("nutrition", /obj/screen/alert/hungry)
- else
- H.throw_alert("nutrition", /obj/screen/alert/starving)
- return 1
+ if(H.mind && H.mind.vampire && (H.mind in SSticker.mode.vampires)) //Vampires
+ switch(H.nutrition)
+ if(NUTRITION_LEVEL_FULL to INFINITY)
+ H.throw_alert("nutrition", /obj/screen/alert/fat/vampire)
+ if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL)
+ H.throw_alert("nutrition", /obj/screen/alert/full/vampire)
+ if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED)
+ H.throw_alert("nutrition", /obj/screen/alert/well_fed/vampire)
+ if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED)
+ H.throw_alert("nutrition", /obj/screen/alert/fed/vampire)
+ if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
+ H.throw_alert("nutrition", /obj/screen/alert/hungry/vampire)
+ else
+ H.throw_alert("nutrition", /obj/screen/alert/starving/vampire)
+ return 1
+
+ else ///Any other non-vampires
+ switch(H.nutrition)
+ if(NUTRITION_LEVEL_FULL to INFINITY)
+ H.throw_alert("nutrition", /obj/screen/alert/fat)
+ if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL)
+ H.throw_alert("nutrition", /obj/screen/alert/full)
+ if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED)
+ H.throw_alert("nutrition", /obj/screen/alert/well_fed)
+ if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED)
+ H.throw_alert("nutrition", /obj/screen/alert/fed)
+ if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
+ H.throw_alert("nutrition", /obj/screen/alert/hungry)
+ else
+ H.throw_alert("nutrition", /obj/screen/alert/starving)
+ return 1
/*
Returns the path corresponding to the corresponding organ
@@ -675,7 +689,7 @@ It'll return null if the organ doesn't correspond, so include null checks when u
H.see_invisible = G.invis_override
else
H.see_invisible = min(G.invis_view, H.see_invisible)
-
+
if(!isnull(G.lighting_alpha))
H.lighting_alpha = min(G.lighting_alpha, H.lighting_alpha)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 727c900ac9c..f9dba949b4b 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -528,7 +528,7 @@
return
var/pull_dir = get_dir(src, pulling)
- if(get_dist(src, pulling) > 1 || ((pull_dir - 1) & pull_dir)) // puller and pullee more than one tile away or in diagonal position
+ if(get_dist(src, pulling) > 1 || (moving_diagonally != SECOND_DIAG_STEP && ((pull_dir - 1) & pull_dir))) // puller and pullee more than one tile away or in diagonal position
if(isliving(pulling))
var/mob/living/M = pulling
if(M.lying && !M.buckled && (prob(M.getBruteLoss() * 200 / M.maxHealth)))
diff --git a/code/modules/mob/living/silicon/robot/login.dm b/code/modules/mob/living/silicon/robot/login.dm
index d0262df743c..cf55cdd5f91 100644
--- a/code/modules/mob/living/silicon/robot/login.dm
+++ b/code/modules/mob/living/silicon/robot/login.dm
@@ -2,6 +2,3 @@
..()
regenerate_icons()
show_laws(0)
-
- var/datum/hotkey_mode/cyborg/C = new(src)
- C.set_winset_values()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 100dd1ffbba..0c6ddf80fc6 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -103,6 +103,9 @@ var/list/robot_verbs_default = list(
var/datum/action/item_action/toggle_research_scanner/scanner = null
var/list/module_actions = list()
+/mob/living/silicon/robot/get_cell()
+ return cell
+
/mob/living/silicon/robot/New(loc,var/syndie = 0,var/unfinished = 0, var/alien = 0)
spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 4a8d8c48f5b..2cb9ddf6252 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -156,7 +156,6 @@
/mob/living/silicon/Stat()
..()
if(statpanel("Status"))
- show_stat_station_time()
show_stat_emergency_shuttle_eta()
show_system_integrity()
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index 77eb74e5696..5feebb53059 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -594,7 +594,7 @@ var/robot_arm = /obj/item/robot_parts/l_arm
qdel(src)
/obj/item/honkbot_arm_assembly
- name = "incomplete honkbot assembly."
+ name = "incomplete honkbot assembly"
desc = "A clown box with a robot arm permanently grafted to it."
icon = 'icons/obj/aibots.dmi'
icon_state = "honkbot_arm"
@@ -625,8 +625,8 @@ var/robot_arm = /obj/item/robot_parts/l_arm
if(istype(W, /obj/item/instrument/trombone))
if(!user.unEquip(W))
return
- to_chat(user, "You add the trombone to [src]! Heeeenk! ")
+ to_chat(user, "You add the trombone to [src]! Heeeenk!")
qdel(W)
- var/mob/living/simple_animal/bot/honkbot/A = new /mob/living/simple_animal/bot/honkbot(T)
+ var/mob/living/simple_animal/bot/honkbot/A = new /mob/living/simple_animal/bot/honkbot(get_turf(src))
A.robot_arm = robot_arm
qdel(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm
index 958f493e309..45b10950669 100644
--- a/code/modules/mob/living/simple_animal/bot/honkbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm
@@ -37,7 +37,7 @@
. = ..()
update_icon()
auto_patrol = TRUE
- var/datum/job/clown/J = new/datum/job/clown
+ var/datum/job/clown/J = new /datum/job/clown()
access_card.access += J.get_access()
prev_access = access_card.access
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 49a3b2718db..1db149418c7 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -50,6 +50,9 @@
var/currentBloodColor = "#A10808"
var/currentDNA = null
+/mob/living/simple_animal/bot/mulebot/get_cell()
+ return cell
+
/mob/living/simple_animal/bot/mulebot/New()
..()
wires = new /datum/wires/mulebot(src)
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index ab9253b96cc..d5fabe96be4 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -113,7 +113,7 @@
status_flags = 0
const_type = "juggernaut"
mob_size = MOB_SIZE_LARGE
- construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall)
+ construct_spells = list(/obj/effect/proc_holder/spell/targeted/night_vision, /obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall)
force_threshold = 11
playstyle_string = "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, \
create shield walls, rip apart enemies and walls alike, and even deflect energy weapons."
@@ -171,7 +171,7 @@
see_in_dark = 8
attack_sound = 'sound/weapons/bladeslice.ogg'
const_type = "wraith"
- construct_spells = list(/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift)
+ construct_spells = list(/obj/effect/proc_holder/spell/targeted/night_vision, /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift)
retreat_distance = 2 //AI wraiths will move in and out of combat
playstyle_string = "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls."
@@ -202,7 +202,8 @@
minimum_distance = 10 //AI artificers will flee like fuck
attack_sound = 'sound/weapons/punch2.ogg'
const_type = "builder"
- construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser,
+ construct_spells = list(/obj/effect/proc_holder/spell/targeted/night_vision,
+ /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser,
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall,
/obj/effect/proc_holder/spell/aoe_turf/conjure/floor,
/obj/effect/proc_holder/spell/aoe_turf/conjure/pylon,
@@ -311,7 +312,8 @@
see_in_dark = 8
attack_sound = 'sound/weapons/tap.ogg'
const_type = "harvester"
- construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/wall,
+ construct_spells = list(/obj/effect/proc_holder/spell/targeted/night_vision,
+ /obj/effect/proc_holder/spell/aoe_turf/conjure/wall,
/obj/effect/proc_holder/spell/aoe_turf/conjure/floor,
/obj/effect/proc_holder/spell/targeted/smoke/disable)
retreat_distance = 2 //AI harvesters will move in and out of combat, like wraiths, but shittier
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 5fd5b4e9231..7fd32bd71ec 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
@@ -1,265 +1,265 @@
-#define MINER_DASH_RANGE 4
-
-/*
-
-BLOOD-DRUNK MINER
-
-Effectively a highly aggressive miner, the blood-drunk miner has very few attacks but compensates by being highly aggressive.
-
-The blood-drunk miner's attacks are as follows
-- If not in KA range, it will rapidly dash at its target
-- If in KA range, it will fire its kinetic accelerator
-- If in melee range, will rapidly attack, akin to an actual player
-- After any of these attacks, may transform its cleaving saw:
- Untransformed, it attacks very rapidly for smaller amounts of damage
- Transformed, it attacks at normal speed for higher damage and cleaves enemies hit
-
-When the blood-drunk miner dies, it leaves behind the cleaving saw it was using and its kinetic accelerator.
-
-Difficulty: Medium
-
-*/
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner
- name = "blood-drunk miner"
- desc = "A miner destined to wander forever, engaged in an endless hunt."
- health = 900
- maxHealth = 900
- icon_state = "miner"
- icon_living = "miner"
- icon = 'icons/mob/alienqueen.dmi'
- light_color = "#E4C7C5"
- speak_emote = list("roars")
- speed = 1
- move_to_delay = 3
- projectiletype = /obj/item/projectile/kinetic/miner
- projectilesound = 'sound/weapons/kenetic_accel.ogg'
- ranged = 1
- ranged_cooldown_time = 16
- pixel_x = -16
- loot = list(/obj/item/melee/energy/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator)
- wander = FALSE
- del_on_death = TRUE
- blood_volume = BLOOD_VOLUME_NORMAL
- var/obj/item/melee/energy/cleaving_saw/miner/miner_saw
- var/time_until_next_transform = 0
- var/dashing = FALSE
- var/dash_cooldown = 15
- var/guidance = FALSE
- deathmessage = "falls to the ground, decaying into glowing particles."
- death_sound = "bodyfall"
-
-/obj/item/gps/internal/miner
- icon_state = null
- gpstag = "Resonant Signal"
- desc = "The sweet blood, oh, it sings to me."
- invisibility = 100
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/guidance
- guidance = TRUE
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/hunter/AttackingTarget()
- . = ..()
- if(. && prob(12))
- INVOKE_ASYNC(src, .proc/dash)
-
-/obj/item/melee/energy/cleaving_saw/miner //nerfed saw because it is very murdery
- force = 6
- force_on = 10
-
-/obj/item/melee/energy/cleaving_saw/miner/attack(mob/living/target, mob/living/carbon/human/user)
- target.add_stun_absorption("miner", 10, INFINITY)
- ..()
- target.stun_absorption -= "miner"
-
-/obj/item/projectile/kinetic/miner
- damage = 20
- speed = 0.9
- icon_state = "ka_tracer"
- range = MINER_DASH_RANGE
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/Initialize()
- . = ..()
- miner_saw = new(src)
- internal_gps = new/obj/item/gps/internal/miner(src)
-
- // Add a zone selection UI; otherwise the mob can't melee attack properly.
- zone_sel = new /obj/screen/zone_sel()
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
- var/adjustment_amount = amount * 0.1
- if(world.time + adjustment_amount > next_move)
- changeNext_move(adjustment_amount) //attacking it interrupts it attacking, but only briefly
- . = ..()
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/death()
- if(health > 0)
- return
- new /obj/effect/temp_visual/dir_setting/miner_death(loc, dir)
- return ..()
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/Move(atom/newloc)
- if(dashing || (newloc && newloc.z == z && (islava(newloc) || ischasm(newloc)))) //we're not stupid!
- return FALSE
- return ..()
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/ex_act(severity, target)
- if(dash())
- return
- return ..()
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/AttackingTarget()
- if(QDELETED(target))
- return
- if(next_move > world.time || !Adjacent(target)) //some cheating
- INVOKE_ASYNC(src, .proc/quick_attack_loop)
- return
- face_atom(target)
- if(isliving(target))
- var/mob/living/L = target
- if(L.stat == DEAD)
- visible_message("[src] butchers [L]!",
- "You butcher [L], restoring your health!")
- if(!is_station_level(z) || client) //NPC monsters won't heal while on station
- if(guidance)
- adjustHealth(-L.maxHealth)
- else
- adjustHealth(-(L.maxHealth * 0.5))
- L.gib()
- return TRUE
- changeNext_move(CLICK_CD_MELEE)
- miner_saw.melee_attack_chain(src, target)
- if(guidance)
- adjustHealth(-2)
- transform_weapon()
- INVOKE_ASYNC(src, .proc/quick_attack_loop)
- return TRUE
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect)
- if(!used_item && !isturf(A))
- used_item = miner_saw
- ..()
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/GiveTarget(new_target)
- var/targets_the_same = (new_target == target)
- . = ..()
- if(. && target && !targets_the_same)
- wander = TRUE
- transform_weapon()
- INVOKE_ASYNC(src, .proc/quick_attack_loop)
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/OpenFire()
- Goto(target, move_to_delay, minimum_distance)
- if(get_dist(src, target) > MINER_DASH_RANGE && dash_cooldown <= world.time)
- INVOKE_ASYNC(src, .proc/dash, target)
- else
- shoot_ka()
- transform_weapon()
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/shoot_ka()
- if(ranged_cooldown <= world.time && get_dist(src, target) <= MINER_DASH_RANGE && !Adjacent(target))
- ranged_cooldown = world.time + ranged_cooldown_time
- visible_message("[src] fires the proto-kinetic accelerator!")
- face_atom(target)
- new /obj/effect/temp_visual/dir_setting/firing_effect(loc, dir)
- Shoot(target)
- changeNext_move(CLICK_CD_RANGE)
-
-//I'm still of the belief that this entire proc needs to be wiped from existence.
-// do not take my touching of it to be endorsement of it. ~mso
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/quick_attack_loop()
- while(!QDELETED(target) && next_move <= world.time) //this is done this way because next_move can change to be sooner while we sleep.
- stoplag(1)
- sleep((next_move - world.time) * 1.5) //but don't ask me what the fuck this is about
- if(QDELETED(target))
- return
- if(dashing || next_move > world.time || !Adjacent(target))
- if(dashing && next_move <= world.time)
- next_move = world.time + 1
- INVOKE_ASYNC(src, .proc/quick_attack_loop) //lets try that again.
- return
- AttackingTarget()
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/dash(atom/dash_target)
- if(world.time < dash_cooldown)
- return
- var/list/accessable_turfs = list()
- var/self_dist_to_target = 0
- var/turf/own_turf = get_turf(src)
- if(!QDELETED(dash_target))
- self_dist_to_target += get_dist(dash_target, own_turf)
- for(var/turf/simulated/O in RANGE_TURFS(MINER_DASH_RANGE, own_turf))
- var/turf_dist_to_target = 0
- if(!QDELETED(dash_target))
- turf_dist_to_target += get_dist(dash_target, O)
- if(get_dist(src, O) >= MINER_DASH_RANGE && turf_dist_to_target <= self_dist_to_target && !islava(O) && !ischasm(O))
- var/valid = TRUE
- for(var/turf/T in getline(own_turf, O))
- if(is_blocked_turf(T, TRUE))
- valid = FALSE
- continue
- if(valid)
- accessable_turfs[O] = turf_dist_to_target
- var/turf/target_turf
- if(!QDELETED(dash_target))
- var/closest_dist = MINER_DASH_RANGE
- for(var/t in accessable_turfs)
- if(accessable_turfs[t] < closest_dist)
- closest_dist = accessable_turfs[t]
- for(var/t in accessable_turfs)
- if(accessable_turfs[t] != closest_dist)
- accessable_turfs -= t
- if(!LAZYLEN(accessable_turfs))
- return
- dash_cooldown = world.time + initial(dash_cooldown)
- target_turf = pick(accessable_turfs)
- var/turf/step_back_turf = get_step(target_turf, get_cardinal_dir(target_turf, own_turf))
- var/turf/step_forward_turf = get_step(own_turf, get_cardinal_dir(own_turf, target_turf))
- new /obj/effect/temp_visual/small_smoke/halfsecond(step_back_turf)
- new /obj/effect/temp_visual/small_smoke/halfsecond(step_forward_turf)
- var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc, src)
- animate(D, alpha = 0, time = 5)
- forceMove(step_back_turf)
- playsound(own_turf, 'sound/weapons/punchmiss.ogg', 40, 1, -1)
- dashing = TRUE
- alpha = 0
- animate(src, alpha = 255, time = 5)
- sleep(2)
- D.forceMove(step_forward_turf)
- forceMove(target_turf)
- playsound(target_turf, 'sound/weapons/punchmiss.ogg', 40, 1, -1)
- sleep(1)
- dashing = FALSE
- shoot_ka()
- return TRUE
-
-/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/transform_weapon()
- if(time_until_next_transform <= world.time)
- miner_saw.transform_cooldown = 0
- miner_saw.transform_weapon(src, TRUE)
- icon_state = "miner[miner_saw.active ? "_transformed":""]"
- icon_living = "miner[miner_saw.active ? "_transformed":""]"
- time_until_next_transform = world.time + rand(50, 100)
-
-/obj/effect/temp_visual/dir_setting/miner_death
- icon_state = "miner_death"
- duration = 15
-
-/obj/effect/temp_visual/dir_setting/miner_death/Initialize(mapload, set_dir)
- . = ..()
- INVOKE_ASYNC(src, .proc/fade_out)
-
-/obj/effect/temp_visual/dir_setting/miner_death/proc/fade_out()
- var/matrix/M = new
- M.Turn(pick(90, 270))
- var/final_dir = dir
- if(dir & (EAST|WEST)) //Facing east or west
- final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass
-
- animate(src, transform = M, pixel_y = -6, dir = final_dir, time = 2, easing = EASE_IN|EASE_OUT)
- sleep(5)
- animate(src, color = list("#A7A19E", "#A7A19E", "#A7A19E", list(0, 0, 0)), time = 10, easing = EASE_IN, flags = ANIMATION_PARALLEL)
- sleep(4)
- animate(src, alpha = 0, time = 6, easing = EASE_OUT, flags = ANIMATION_PARALLEL)
-
+#define MINER_DASH_RANGE 4
+
+/*
+
+BLOOD-DRUNK MINER
+
+Effectively a highly aggressive miner, the blood-drunk miner has very few attacks but compensates by being highly aggressive.
+
+The blood-drunk miner's attacks are as follows
+- If not in KA range, it will rapidly dash at its target
+- If in KA range, it will fire its kinetic accelerator
+- If in melee range, will rapidly attack, akin to an actual player
+- After any of these attacks, may transform its cleaving saw:
+ Untransformed, it attacks very rapidly for smaller amounts of damage
+ Transformed, it attacks at normal speed for higher damage and cleaves enemies hit
+
+When the blood-drunk miner dies, it leaves behind the cleaving saw it was using and its kinetic accelerator.
+
+Difficulty: Medium
+
+*/
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner
+ name = "blood-drunk miner"
+ desc = "A miner destined to wander forever, engaged in an endless hunt."
+ health = 900
+ maxHealth = 900
+ icon_state = "miner"
+ icon_living = "miner"
+ icon = 'icons/mob/alienqueen.dmi'
+ light_color = "#E4C7C5"
+ speak_emote = list("roars")
+ speed = 1
+ move_to_delay = 3
+ projectiletype = /obj/item/projectile/kinetic/miner
+ projectilesound = 'sound/weapons/kenetic_accel.ogg'
+ ranged = 1
+ ranged_cooldown_time = 16
+ pixel_x = -16
+ loot = list(/obj/item/melee/energy/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator)
+ wander = FALSE
+ del_on_death = TRUE
+ blood_volume = BLOOD_VOLUME_NORMAL
+ var/obj/item/melee/energy/cleaving_saw/miner/miner_saw
+ var/time_until_next_transform = 0
+ var/dashing = FALSE
+ var/dash_cooldown = 15
+ var/guidance = FALSE
+ deathmessage = "falls to the ground, decaying into glowing particles."
+ death_sound = "bodyfall"
+
+/obj/item/gps/internal/miner
+ icon_state = null
+ gpstag = "Resonant Signal"
+ desc = "The sweet blood, oh, it sings to me."
+ invisibility = 100
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/guidance
+ guidance = TRUE
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/hunter/AttackingTarget()
+ . = ..()
+ if(. && prob(12))
+ INVOKE_ASYNC(src, .proc/dash)
+
+/obj/item/melee/energy/cleaving_saw/miner //nerfed saw because it is very murdery
+ force = 6
+ force_on = 10
+
+/obj/item/melee/energy/cleaving_saw/miner/attack(mob/living/target, mob/living/carbon/human/user)
+ target.add_stun_absorption("miner", 10, INFINITY)
+ ..()
+ target.stun_absorption -= "miner"
+
+/obj/item/projectile/kinetic/miner
+ damage = 20
+ speed = 0.9
+ icon_state = "ka_tracer"
+ range = MINER_DASH_RANGE
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/Initialize()
+ . = ..()
+ miner_saw = new(src)
+ internal_gps = new/obj/item/gps/internal/miner(src)
+
+ // Add a zone selection UI; otherwise the mob can't melee attack properly.
+ zone_sel = new /obj/screen/zone_sel()
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
+ var/adjustment_amount = amount * 0.1
+ if(world.time + adjustment_amount > next_move)
+ changeNext_move(adjustment_amount) //attacking it interrupts it attacking, but only briefly
+ . = ..()
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/death()
+ if(health > 0)
+ return
+ new /obj/effect/temp_visual/dir_setting/miner_death(loc, dir)
+ return ..()
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/Move(atom/newloc)
+ if(dashing || (newloc && newloc.z == z && (islava(newloc) || ischasm(newloc)))) //we're not stupid!
+ return FALSE
+ return ..()
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/ex_act(severity, target)
+ if(dash())
+ return
+ return ..()
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/AttackingTarget()
+ if(QDELETED(target))
+ return
+ if(next_move > world.time || !Adjacent(target)) //some cheating
+ INVOKE_ASYNC(src, .proc/quick_attack_loop)
+ return
+ face_atom(target)
+ if(isliving(target))
+ var/mob/living/L = target
+ if(L.stat == DEAD)
+ visible_message("[src] butchers [L]!",
+ "You butcher [L], restoring your health!")
+ if(!is_station_level(z) || client) //NPC monsters won't heal while on station
+ if(guidance)
+ adjustHealth(-L.maxHealth)
+ else
+ adjustHealth(-(L.maxHealth * 0.5))
+ L.gib()
+ return TRUE
+ changeNext_move(CLICK_CD_MELEE)
+ miner_saw.melee_attack_chain(src, target)
+ if(guidance)
+ adjustHealth(-2)
+ transform_weapon()
+ INVOKE_ASYNC(src, .proc/quick_attack_loop)
+ return TRUE
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect)
+ if(!used_item && !isturf(A))
+ used_item = miner_saw
+ ..()
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/GiveTarget(new_target)
+ var/targets_the_same = (new_target == target)
+ . = ..()
+ if(. && target && !targets_the_same)
+ wander = TRUE
+ transform_weapon()
+ INVOKE_ASYNC(src, .proc/quick_attack_loop)
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/OpenFire()
+ Goto(target, move_to_delay, minimum_distance)
+ if(get_dist(src, target) > MINER_DASH_RANGE && dash_cooldown <= world.time)
+ INVOKE_ASYNC(src, .proc/dash, target)
+ else
+ shoot_ka()
+ transform_weapon()
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/shoot_ka()
+ if(ranged_cooldown <= world.time && get_dist(src, target) <= MINER_DASH_RANGE && !Adjacent(target))
+ ranged_cooldown = world.time + ranged_cooldown_time
+ visible_message("[src] fires the proto-kinetic accelerator!")
+ face_atom(target)
+ new /obj/effect/temp_visual/dir_setting/firing_effect(loc, dir)
+ Shoot(target)
+ changeNext_move(CLICK_CD_RANGE)
+
+//I'm still of the belief that this entire proc needs to be wiped from existence.
+// do not take my touching of it to be endorsement of it. ~mso
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/quick_attack_loop()
+ while(!QDELETED(target) && next_move <= world.time) //this is done this way because next_move can change to be sooner while we sleep.
+ stoplag(1)
+ sleep((next_move - world.time) * 1.5) //but don't ask me what the fuck this is about
+ if(QDELETED(target))
+ return
+ if(dashing || next_move > world.time || !Adjacent(target))
+ if(dashing && next_move <= world.time)
+ next_move = world.time + 1
+ INVOKE_ASYNC(src, .proc/quick_attack_loop) //lets try that again.
+ return
+ AttackingTarget()
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/dash(atom/dash_target)
+ if(world.time < dash_cooldown)
+ return
+ var/list/accessable_turfs = list()
+ var/self_dist_to_target = 0
+ var/turf/own_turf = get_turf(src)
+ if(!QDELETED(dash_target))
+ self_dist_to_target += get_dist(dash_target, own_turf)
+ for(var/turf/simulated/O in RANGE_TURFS(MINER_DASH_RANGE, own_turf))
+ var/turf_dist_to_target = 0
+ if(!QDELETED(dash_target))
+ turf_dist_to_target += get_dist(dash_target, O)
+ if(get_dist(src, O) >= MINER_DASH_RANGE && turf_dist_to_target <= self_dist_to_target && !islava(O) && !ischasm(O))
+ var/valid = TRUE
+ for(var/turf/T in getline(own_turf, O))
+ if(is_blocked_turf(T, TRUE))
+ valid = FALSE
+ continue
+ if(valid)
+ accessable_turfs[O] = turf_dist_to_target
+ var/turf/target_turf
+ if(!QDELETED(dash_target))
+ var/closest_dist = MINER_DASH_RANGE
+ for(var/t in accessable_turfs)
+ if(accessable_turfs[t] < closest_dist)
+ closest_dist = accessable_turfs[t]
+ for(var/t in accessable_turfs)
+ if(accessable_turfs[t] != closest_dist)
+ accessable_turfs -= t
+ if(!LAZYLEN(accessable_turfs))
+ return
+ dash_cooldown = world.time + initial(dash_cooldown)
+ target_turf = pick(accessable_turfs)
+ var/turf/step_back_turf = get_step(target_turf, get_cardinal_dir(target_turf, own_turf))
+ var/turf/step_forward_turf = get_step(own_turf, get_cardinal_dir(own_turf, target_turf))
+ new /obj/effect/temp_visual/small_smoke/halfsecond(step_back_turf)
+ new /obj/effect/temp_visual/small_smoke/halfsecond(step_forward_turf)
+ var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc, src)
+ animate(D, alpha = 0, time = 5)
+ forceMove(step_back_turf)
+ playsound(own_turf, 'sound/weapons/punchmiss.ogg', 40, 1, -1)
+ dashing = TRUE
+ alpha = 0
+ animate(src, alpha = 255, time = 5)
+ sleep(2)
+ D.forceMove(step_forward_turf)
+ forceMove(target_turf)
+ playsound(target_turf, 'sound/weapons/punchmiss.ogg', 40, 1, -1)
+ sleep(1)
+ dashing = FALSE
+ shoot_ka()
+ return TRUE
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/transform_weapon()
+ if(time_until_next_transform <= world.time)
+ miner_saw.transform_cooldown = 0
+ miner_saw.transform_weapon(src, TRUE)
+ icon_state = "miner[miner_saw.active ? "_transformed":""]"
+ icon_living = "miner[miner_saw.active ? "_transformed":""]"
+ time_until_next_transform = world.time + rand(50, 100)
+
+/obj/effect/temp_visual/dir_setting/miner_death
+ icon_state = "miner_death"
+ duration = 15
+
+/obj/effect/temp_visual/dir_setting/miner_death/Initialize(mapload, set_dir)
+ . = ..()
+ INVOKE_ASYNC(src, .proc/fade_out)
+
+/obj/effect/temp_visual/dir_setting/miner_death/proc/fade_out()
+ var/matrix/M = new
+ M.Turn(pick(90, 270))
+ var/final_dir = dir
+ if(dir & (EAST|WEST)) //Facing east or west
+ final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass
+
+ animate(src, transform = M, pixel_y = -6, dir = final_dir, time = 2, easing = EASE_IN|EASE_OUT)
+ sleep(5)
+ animate(src, color = list("#A7A19E", "#A7A19E", "#A7A19E", list(0, 0, 0)), time = 10, easing = EASE_IN, flags = ANIMATION_PARALLEL)
+ sleep(4)
+ animate(src, alpha = 0, time = 6, easing = EASE_OUT, flags = ANIMATION_PARALLEL)
+
#undef MINER_DASH_RANGE
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm
index d73fe3ca77c..6e5c840a401 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm
@@ -64,7 +64,7 @@
..()
/mob/living/simple_animal/hostile/asteroid/gutlunch/AttackingTarget()
- if(is_type_in_list(target, wanted_objects)) //we eats
+ if(is_type_in_typecache(target, wanted_objects)) //we eats
udder.generateMilk()
regenerate_icons()
visible_message("[src] slurps up [target].")
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
index 3f649eae984..2e1e7508e1c 100644
--- a/code/modules/mob/living/simple_animal/hostile/statue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/statue.dm
@@ -189,35 +189,6 @@
L.EyeBlind(4)
return
-//Toggle Night Vision
-/obj/effect/proc_holder/spell/targeted/night_vision
- name = "Toggle Nightvision"
- desc = "Toggle your nightvision mode."
-
- charge_max = 10
- clothes_req = 0
-
- message = "You toggle your night vision!"
- range = -1
- include_user = 1
-
-/obj/effect/proc_holder/spell/targeted/night_vision/cast(list/targets, mob/user = usr)
- for(var/mob/living/target in targets)
- switch(target.lighting_alpha)
- if (LIGHTING_PLANE_ALPHA_VISIBLE)
- target.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
- name = "Toggle Nightvision \[More]"
- if (LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
- target.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- name = "Toggle Nightvision \[Full]"
- if (LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE)
- target.lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
- name = "Toggle Nightvision \[OFF]"
- else
- target.lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
- name = "Toggle Nightvision \[ON]"
- target.update_sight()
-
/mob/living/simple_animal/hostile/statue/sentience_act()
faction -= "neutral"
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 f73ee07441a..5b82f8d35dd 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
@@ -202,7 +202,7 @@ var/global/list/ts_spiderling_list = list()
var/obj/machinery/door/airlock/A = target
if(A.density)
try_open_airlock(A)
- else if(isliving(target))
+ else if(isliving(target) && (!client || a_intent == INTENT_HARM))
var/mob/living/G = target
if(issilicon(G))
G.attack_animal(src)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c74d7545473..4e486baba20 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -2,6 +2,7 @@
GLOB.mob_list -= src
GLOB.dead_mob_list -= src
GLOB.living_mob_list -= src
+ focus = null
QDEL_NULL(hud_used)
if(mind && mind.current == src)
spellremove(src)
@@ -30,6 +31,7 @@
GLOB.dead_mob_list += src
else
GLOB.living_mob_list += src
+ set_focus(src)
prepare_huds()
..()
@@ -50,7 +52,6 @@
/mob/proc/GetAltName()
return ""
-
/mob/proc/Cell()
set category = "Admin"
set hidden = 1
@@ -173,6 +174,7 @@
return 0
/mob/proc/Life(seconds, times_fired)
+ set waitfor = FALSE
if(forced_look)
if(!isnum(forced_look))
var/atom/A = locateUID(forced_look)
@@ -988,6 +990,9 @@ var/list/slot_equipment_priority = list( \
statpanel("Status") // Switch to the Status panel again, for the sake of the lazy Stat procs
+ if(client && client.statpanel == "Status" && SSticker)
+ show_stat_station_time()
+
// this function displays the station time in the status panel
/mob/proc/show_stat_station_time()
stat(null, "Round Time: [worldtime2text()]")
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index beb474539f1..a26131b9504 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -399,9 +399,6 @@ var/list/intents = list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM)
set name = "Rest"
set category = "IC"
- if(world.time < client.move_delay)
- return
-
if(!resting)
client.move_delay = world.time + 20
to_chat(src, "You are now resting.")
@@ -641,5 +638,26 @@ var/list/intents = list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM)
// Cast to 1/0
return !!(client.prefs.toggles & toggleflag)
+// Used to make sure that a player has a valid job preference setup, used to knock players out of eligibility for anything if their prefs don't make sense.
+// A "valid job preference setup" in this situation means at least having one job set to low, or not having "return to lobby" enabled
+// Prevents "antag rolling" by setting antag prefs on, all jobs to never, and "return to lobby if preferences not availible"
+// Doing so would previously allow you to roll for antag, then send you back to lobby if you didn't get an antag role
+// This also does some admin notification and logging as well
+/mob/proc/has_valid_preferences()
+ if(!client)
+ return FALSE //Not sure how this would get run without the mob having a client, but let's just be safe.
+ if(client.prefs.alternate_option != RETURN_TO_LOBBY)
+ return TRUE
+ // If they have antags enabled, they're potentially doing this on purpose instead of by accident. Notify admins if so.
+ var/has_antags = FALSE
+ if(client.prefs.be_special.len > 0)
+ has_antags = TRUE
+ if(!client.prefs.check_any_job())
+ to_chat(src, "You have no jobs enabled, along with return to lobby if job is unavailable. This makes you ineligible for any round start role, please update your job preferences.")
+ if(has_antags)
+ log_admin("[src.ckey] just got booted back to lobby with no jobs, but antags enabled.")
+ message_admins("[src.ckey] just got booted back to lobby with no jobs enabled, but antag rolling enabled. Likely antag rolling abuse.")
+ return FALSE //This is the only case someone should actually be completely blocked from antag rolling as well
+ return TRUE
#define isterrorspider(A) (istype((A), /mob/living/simple_animal/hostile/poison/terror_spider))
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index f26961eace9..47909a5d0b9 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -15,102 +15,6 @@
return 1
return (!mover.density || !density || lying)
-//The byond version of these verbs wait for the next tick before acting.
-// instant verbs however can run mid tick or even during the time between ticks.
-#define DO_MOVE(this_dir) var/final_dir = turn(this_dir, -dir2angle(dir)); Move(get_step(mob, final_dir), final_dir);
-
-/client/verb/moveup()
- set name = ".moveup"
- set instant = 1
- DO_MOVE(NORTH)
-
-/client/verb/movedown()
- set name = ".movedown"
- set instant = 1
- DO_MOVE(SOUTH)
-
-/client/verb/moveright()
- set name = ".moveright"
- set instant = 1
- DO_MOVE(EAST)
-
-/client/verb/moveleft()
- set name = ".moveleft"
- set instant = 1
- DO_MOVE(WEST)
-
-#undef DO_MOVE
-
-/client/Northeast()
- swap_hand()
- return
-
-
-/client/Southeast()
- attack_self()
- return
-
-
-/client/Southwest()
- if(iscarbon(usr))
- var/mob/living/carbon/C = usr
- C.toggle_throw_mode()
- else if(isrobot(usr))
- var/mob/living/silicon/robot/R = usr
- var/module = R.get_selected_module()
- if(!module)
- to_chat(usr, "You have no module selected.")
- return
- R.cycle_modules()
- R.uneq_numbered(module)
- else
- to_chat(usr, "This mob type cannot throw items.")
- return
-
-
-/client/Northwest()
- if(iscarbon(usr))
- var/mob/living/carbon/C = usr
- if(!C.get_active_hand())
- to_chat(usr, "You have nothing to drop in your hand.")
- return
- drop_item()
- else if(isrobot(usr))
- var/mob/living/silicon/robot/R = usr
- if(!R.get_selected_module())
- to_chat(usr, "You have no module selected.")
- return
- R.deselect_module(R.get_selected_module())
- else
- to_chat(usr, "This mob type cannot drop items.")
- return
-
-//This gets called when you press the delete button.
-/client/verb/delete_key_pressed()
- set hidden = 1
-
- if(!usr.pulling)
- to_chat(usr, "You are not pulling anything.")
- return
- usr.stop_pulling()
-
-/client/verb/swap_hand()
- set hidden = 1
- if(istype(mob, /mob/living/carbon))
- mob:swap_hand()
- if(istype(mob,/mob/living/silicon/robot))
- var/mob/living/silicon/robot/R = mob
- R.cycle_modules()
- return
-
-
-
-/client/verb/attack_self()
- set hidden = 1
- if(mob)
- mob.mode()
- return
-
/client/verb/toggle_throw_mode()
set hidden = 1
@@ -128,7 +32,7 @@
return
-/client/Center()
+/* /client/Center()
/* No 3D movement in 2D spessman game. dir 16 is Z Up
if(isobj(mob.loc))
var/obj/O = mob.loc
@@ -136,7 +40,7 @@
return O.relaymove(mob, 16)
*/
return
-
+ */
/client/proc/Move_object(direct)
@@ -155,11 +59,17 @@
/client/Move(n, direct)
if(world.time < move_delay)
return
+ else
+ next_move_dir_add = 0
+ next_move_dir_sub = 0
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
if(!mob || !mob.loc)
return 0
+ if(!n || !direct) // why did we never check this before?
+ return FALSE
+
if(mob.notransform)
return 0 //This is sota the goto stop mobs from moving var
@@ -226,9 +136,9 @@
moving = 1
var/delay = mob.movement_delay()
if(old_move_delay + (delay * MOVEMENT_DELAY_BUFFER_DELTA) + MOVEMENT_DELAY_BUFFER > world.time)
- move_delay = old_move_delay + delay
+ move_delay = old_move_delay
else
- move_delay = delay + world.time
+ move_delay = world.time
mob.last_movement = world.time
if(locate(/obj/item/grab, mob))
@@ -264,19 +174,29 @@
return
else if(mob.confused)
- step(mob, pick(cardinal))
- else
- . = ..()
+ var/newdir = 0
+ if(mob.confused > 40)
+ newdir = pick(alldirs)
+ else if(prob(mob.confused * 1.5))
+ newdir = angle2dir(dir2angle(direct) + pick(90, -90))
+ else if(prob(mob.confused * 3))
+ newdir = angle2dir(dir2angle(direct) + pick(45, -45))
+ if(newdir)
+ direct = newdir
+ n = get_step(mob, direct)
+ . = ..()
mob.setDir(direct)
for(var/obj/item/grab/G in mob)
if(G.state == GRAB_NECK)
- mob.setDir(reverse_dir[direct])
+ mob.setDir(angle2dir((dir2angle(direct) + 202.5) % 365))
G.adjust_position()
for(var/obj/item/grab/G in mob.grabbed_by)
G.adjust_position()
-
+ if((direct & (direct - 1)) && mob.loc == n) //moved diagonally successfully
+ delay = mob.movement_delay() * 2
+ move_delay += delay
moving = 0
if(mob && .)
if(mob.throwing)
@@ -461,3 +381,123 @@
/mob/proc/update_gravity()
return
+/client/proc/check_has_body_select()
+ return mob && mob.hud_used && mob.zone_sel && istype(mob.zone_sel, /obj/screen/zone_sel)
+
+/client/verb/body_toggle_head()
+ set name = "body-toggle-head"
+ set hidden = 1
+
+ if(!check_has_body_select())
+ return
+
+ var/next_in_line
+ switch(mob.zone_sel.selecting)
+ if(BODY_ZONE_HEAD)
+ next_in_line = BODY_ZONE_PRECISE_EYES
+ if(BODY_ZONE_PRECISE_EYES)
+ next_in_line = BODY_ZONE_PRECISE_MOUTH
+ else
+ next_in_line = BODY_ZONE_HEAD
+
+ var/obj/screen/zone_sel/selector = mob.zone_sel
+ selector.set_selected_zone(next_in_line, mob)
+
+/client/verb/body_r_arm()
+ set name = "body-r-arm"
+ set hidden = 1
+ if(!check_has_body_select())
+ return
+
+ var/next_in_line
+ if(mob.zone_sel.selecting == BODY_ZONE_R_ARM)
+ next_in_line = BODY_ZONE_PRECISE_R_HAND
+ else
+ next_in_line = BODY_ZONE_R_ARM
+
+ var/obj/screen/zone_sel/selector = mob.zone_sel
+ selector.set_selected_zone(next_in_line, mob)
+
+/client/verb/body_chest()
+ set name = "body-chest"
+ set hidden = 1
+
+ if(!check_has_body_select())
+ return
+
+ var/obj/screen/zone_sel/selector = mob.zone_sel
+ selector.set_selected_zone(BODY_ZONE_CHEST, mob)
+
+/client/verb/body_l_arm()
+ set name = "body-l-arm"
+ set hidden = 1
+
+ if(!check_has_body_select())
+ return
+
+ var/next_in_line
+ if(mob.zone_sel.selecting == BODY_ZONE_L_ARM)
+ next_in_line = BODY_ZONE_PRECISE_L_HAND
+ else
+ next_in_line = BODY_ZONE_L_ARM
+
+ var/obj/screen/zone_sel/selector = mob.zone_sel
+ selector.set_selected_zone(next_in_line, mob)
+
+/client/verb/body_r_leg()
+ set name = "body-r-leg"
+ set hidden = 1
+
+ if(!check_has_body_select())
+ return
+
+ var/next_in_line
+ if(mob.zone_sel.selecting == BODY_ZONE_R_LEG)
+ next_in_line = BODY_ZONE_PRECISE_R_FOOT
+ else
+ next_in_line = BODY_ZONE_R_LEG
+
+ var/obj/screen/zone_sel/selector = mob.zone_sel
+ selector.set_selected_zone(next_in_line, mob)
+
+/client/verb/body_groin()
+ set name = "body-groin"
+ set hidden = 1
+
+ if(!check_has_body_select())
+ return
+
+ var/obj/screen/zone_sel/selector = mob.zone_sel
+ selector.set_selected_zone(BODY_ZONE_PRECISE_GROIN, mob)
+
+/client/verb/body_l_leg()
+ set name = "body-l-leg"
+ set hidden = 1
+
+ if(!check_has_body_select())
+ return
+
+ var/next_in_line
+ if(mob.zone_sel.selecting == BODY_ZONE_L_LEG)
+ next_in_line = BODY_ZONE_PRECISE_L_FOOT
+ else
+ next_in_line = BODY_ZONE_L_LEG
+
+ var/obj/screen/zone_sel/selector = mob.zone_sel
+ selector.set_selected_zone(next_in_line, mob)
+
+/client/verb/toggle_walk_run()
+ set name = "toggle-walk-run"
+ set hidden = TRUE
+ set instant = TRUE
+ if(mob)
+ mob.toggle_move_intent(usr)
+
+/mob/proc/toggle_move_intent(mob/user)
+ if(m_intent == MOVE_INTENT_RUN)
+ m_intent = MOVE_INTENT_WALK
+ else
+ m_intent = MOVE_INTENT_RUN
+ if(hud_used && hud_used.static_inventory)
+ for(var/obj/screen/mov_intent/selector in hud_used.static_inventory)
+ selector.update_icon(src)
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index a87cbf6c8d3..47a4e4a5d0e 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -136,8 +136,6 @@
..()
statpanel("Status")
- if(client.statpanel == "Status" && SSticker)
- show_stat_station_time()
/mob/new_player/Topic(href, href_list[])
diff --git a/code/modules/modular_computers/computers/item/computer_power.dm b/code/modules/modular_computers/computers/item/computer_power.dm
index 0a7955cfe52..27c81d48190 100644
--- a/code/modules/modular_computers/computers/item/computer_power.dm
+++ b/code/modules/modular_computers/computers/item/computer_power.dm
@@ -26,6 +26,10 @@
return battery_module.battery.give(amount)
return 0
+/obj/item/modular_computer/get_cell()
+ var/obj/item/computer_hardware/battery/battery_module = all_components[MC_CELL]
+ if(battery_module && battery_module.battery)
+ return battery_module.battery
// Used in following function to reduce copypaste
/obj/item/modular_computer/proc/power_failure()
diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm
index 65b4ef1f640..98f1ab5667e 100644
--- a/code/modules/modular_computers/hardware/battery_module.dm
+++ b/code/modules/modular_computers/hardware/battery_module.dm
@@ -8,6 +8,9 @@
var/obj/item/stock_parts/cell/battery = null
device_type = MC_CELL
+/obj/item/computer_hardware/battery/get_cell()
+ return battery
+
/obj/item/computer_hardware/battery/New(loc, battery_type = null)
if(battery_type)
battery = new battery_type(src)
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index dfd430a5754..6e550e64893 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -27,6 +27,9 @@ Contents:
var/obj/item/clothing/mask/gas/space_ninja/suitMask
var/mob/living/carbon/human/suitOccupant
+/obj/item/clothing/suit/space/space_ninja/get_cell()
+ return suitCell
+
/obj/item/clothing/suit/space/space_ninja/proc/toggle_suit_lock(mob/living/carbon/human/user)
if(!suitActive)
if(!istype(user.wear_suit, /obj/item/clothing/suit/space/space_ninja))
diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm
index ab6250a2b0f..2a2683a2826 100644
--- a/code/modules/ninja/suit/suit_attackby.dm
+++ b/code/modules/ninja/suit/suit_attackby.dm
@@ -1,5 +1,3 @@
-
-
/obj/item/clothing/suit/space/space_ninja/attackby(obj/item/I, mob/U, params)
if(U==suitOccupant)//Safety, in case you try doing this without wearing the suit/being the person with the suit.
if(istype(I, /obj/item/stock_parts/cell))
@@ -21,4 +19,4 @@
else
to_chat(U, "Procedure interrupted. Protocol terminated.")
return
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 451687cd38c..23a37e06409 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -75,16 +75,19 @@
assets.send(user)
var/data
- if((!user.say_understands(null, GLOB.all_languages["Galactic Common"]) && !forceshow) || forcestars) //assuming all paper is written in common is better than hardcoded type checks
- data = "[name][stars(info)][stamps]"
- if(view)
- usr << browse(data, "window=[name];size=[paper_width]x[paper_height]")
- onclose(usr, "[name]")
+ var/stars = (!user.say_understands(null, GLOB.all_languages["Galactic Common"]) && !forceshow) || forcestars
+ if(stars) //assuming all paper is written in common is better than hardcoded type checks
+ data = "[stars(info)][stamps]"
else
- data = "[name][infolinks ? info_links : info][stamps]"
- if(view)
- usr << browse(data, "window=[name];size=[paper_width]x[paper_height]")
- onclose(usr, "[name]")
+ data = "