", "\[hr\]") + t = replacetext(t, "
- ", "\[list\]")
+ t = replacetext(t, "
", "\[logo\]")
+ t = replacetext(t, "
", "\[redlogo\]")
+ t = replacetext(t, "
", "\[sglogo\]")
+ t = replacetext(t, "", "\[field\]")
+ t = replacetext(t, "R E D A C T E D", "\[redacted\]")
+ t = strip_html_properly(t)
+ return t
+
// Random password generator
/proc/GenerateKey()
//Feel free to move to Helpers.
diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm
index 717d7a927b..4c60b7a9bc 100644
--- a/code/_helpers/unsorted.dm
+++ b/code/_helpers/unsorted.dm
@@ -1154,7 +1154,7 @@ var/list/WALLITEMS = list(
if(length(temp_col )<2)
temp_col = "0[temp_col]"
colour += temp_col
- return colour
+ return "#[colour]"
/proc/color_square(red, green, blue, hex)
var/color = hex ? hex : "#[num2hex(red, 2)][num2hex(green, 2)][num2hex(blue, 2)]"
@@ -1171,7 +1171,7 @@ var/mob/dview/dview_mob = new
log_error("Had to recreate the dview mob!")
dview_mob.loc = center
-
+
dview_mob.see_invisible = invis_flags
. = view(range, dview_mob)
@@ -1490,7 +1490,7 @@ GLOBAL_REAL_VAR(list/stack_trace_storage)
. += new /obj/screen/plane_master/lighting //Lighting system (but different!)
. += new /obj/screen/plane_master/o_light_visual //Object lighting (using masks)
. += new /obj/screen/plane_master/emissive //Emissive overlays
-
+
. += new /obj/screen/plane_master/ghosts //Ghosts!
. += new /obj/screen/plane_master{plane = PLANE_AI_EYE} //AI Eye!
diff --git a/code/_helpers/unsorted_vr.dm b/code/_helpers/unsorted_vr.dm
index daf4db48d7..0890c1f9c6 100644
--- a/code/_helpers/unsorted_vr.dm
+++ b/code/_helpers/unsorted_vr.dm
@@ -18,7 +18,8 @@
continue
if(vent.welded)
continue
- if(istype(get_area(vent), /area/crew_quarters/sleep)) //No going to dorms
+ var/area/A = get_area(vent)
+ if(A.forbid_events)
continue
vent_list += vent
if(!vent_list.len)
diff --git a/code/_macros.dm b/code/_macros.dm
index d122d9045f..737b317abe 100644
--- a/code/_macros.dm
+++ b/code/_macros.dm
@@ -42,4 +42,6 @@
#define WORLD_ICON_SIZE 32 //Needed for the R-UST port
-#define PIXEL_MULTIPLIER WORLD_ICON_SIZE/32 //Needed for the R-UST port
\ No newline at end of file
+#define PIXEL_MULTIPLIER WORLD_ICON_SIZE/32 //Needed for the R-UST port
+
+#define JOINTEXT(X) jointext(X, null)
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 03fd9bac74..8954bf45bc 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -19,7 +19,7 @@
/obj/screen/Destroy()
master = null
return ..()
-
+
/obj/screen/proc/component_click(obj/screen/component_button/component, params)
return
@@ -46,9 +46,8 @@
object_overlays.Cut()
/obj/screen/inventory/proc/add_overlays()
- var/mob/user = hud.mymob
-
- if(hud && user && slot_id)
+ if(hud && hud.mymob && slot_id)
+ var/mob/user = hud.mymob
var/obj/item/holding = user.get_active_hand()
if(!holding || user.get_equipped_item(slot_id))
@@ -619,7 +618,7 @@
var/mob/living/carbon/C = hud.mymob
if(C.handcuffed)
add_overlay(handcuff_overlay)
-
+
// PIP stuff
/obj/screen/component_button
var/obj/screen/parent
@@ -634,7 +633,7 @@
// Character setup stuff
/obj/screen/setup_preview
-
+
var/datum/preferences/pref
/obj/screen/setup_preview/Destroy()
@@ -704,7 +703,7 @@
* size of the screen. This is not ideal, as filter() is faster, and has
* alpha masks, but the alpha masks it has can't be animated, so the 'ping'
* mode of this device isn't possible using that technique.
- *
+ *
* The markers use that technique, though, so at least there's that.
*/
/obj/screen/movable/mapper_holder
@@ -722,7 +721,7 @@
var/obj/screen/mapper/mask_full/mask_full
var/obj/screen/mapper/mask_ping/mask_ping
var/obj/screen/mapper/bg/bg
-
+
var/obj/screen/mapper/frame/frame
var/obj/screen/mapper/powbutton/powbutton
var/obj/screen/mapper/mapbutton/mapbutton
@@ -732,7 +731,7 @@
/obj/screen/movable/mapper_holder/Initialize(mapload, newowner)
owner = newowner
-
+
mask_full = new(src) // Full white square mask
mask_ping = new(src) // Animated 'pinging' mask
bg = new(src) // Background color, holds map in vis_contents, uses mult against masks
@@ -740,19 +739,19 @@
frame = new(src) // Decorative frame
powbutton = new(src) // Clickable button
mapbutton = new(src) // Clickable button
-
+
frame.icon_state = initial(frame.icon_state)+owner.hud_frame_hint
/**
* The vis_contents layout is: this(frame,extras_holder,mask(bg(map)))
* bg is set to BLEND_MULTIPLY against the mask to crop it.
*/
-
+
mask_full.vis_contents.Add(bg)
mask_ping.vis_contents.Add(bg)
frame.vis_contents.Add(powbutton,mapbutton)
vis_contents.Add(frame)
-
+
/obj/screen/movable/mapper_holder/Destroy()
qdel_null(mask_full)
@@ -772,12 +771,12 @@
running = TRUE
if(ping)
vis_contents.Add(mask_ping)
- else
+ else
vis_contents.Add(mask_full)
bg.vis_contents.Cut()
bg.vis_contents.Add(map)
-
+
if(extras && !extras_holder)
extras_holder = extras
vis_contents += extras_holder
@@ -790,7 +789,7 @@
off()
else
on()
-
+
/obj/screen/movable/mapper_holder/proc/mapClick()
if(owner)
if(running)
@@ -818,7 +817,7 @@
mouse_opacity = 0
var/obj/screen/movable/mapper_holder/parent
-/obj/screen/mapper/New()
+/obj/screen/mapper/New()
..()
parent = loc
@@ -921,10 +920,10 @@
var/static/list/ammo_screen_loc_list = list(ui_ammo_hud1, ui_ammo_hud2, ui_ammo_hud3 ,ui_ammo_hud4)
/obj/screen/ammo/proc/add_hud(var/mob/living/user, var/obj/item/weapon/gun/G)
-
+
if(!user?.client)
return
-
+
if(!G)
CRASH("/obj/screen/ammo/proc/add_hud() has been called from [src] without the required param of G")
diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm
index 3839853567..acfa32d52f 100644
--- a/code/controllers/communications.dm
+++ b/code/controllers/communications.dm
@@ -126,6 +126,7 @@ var/const/MED_I_FREQ = 1485
var/const/SEC_I_FREQ = 1475
var/const/TALON_FREQ = 1363 //VOREStation Add
+var/const/CSN_FREQ = 1365 //VOREStation Add
var/list/radiochannels = list(
"Common" = PUB_FREQ,
@@ -145,7 +146,8 @@ var/list/radiochannels = list(
"Entertainment" = ENT_FREQ,
"Medical(I)" = MED_I_FREQ,
"Security(I)" = SEC_I_FREQ,
- "Talon" = TALON_FREQ //VOREStation Add
+ "Talon" = TALON_FREQ, //VOREStation Add
+ "Casino" = CSN_FREQ,
)
// Hey, if anyone ever needs to update tgui/packages/tgui/constants.js with new radio channels
@@ -155,7 +157,7 @@ var/list/radiochannels = list(
set category = "Generate TGUI Radio Constants"
var/list/channel_info = list()
-
+
for(var/i in RADIO_LOW_FREQ to RADIO_HIGH_FREQ)
for(var/key in radiochannels)
if(i == radiochannels[key])
@@ -192,7 +194,7 @@ var/list/ANTAG_FREQS = list(SYND_FREQ, RAID_FREQ)
//Department channels, arranged lexically
var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, ENT_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ)
-var/list/OFFMAP_FREQS = list(TALON_FREQ) //VOREStation Add
+var/list/OFFMAP_FREQS = list(TALON_FREQ, CSN_FREQ) //VOREStation Add
/proc/frequency_span_class(var/frequency)
// Antags!
diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index f265f39955..2aa6d84cb6 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -131,12 +131,13 @@ SUBSYSTEM_DEF(job)
return department_datums[primary_department]
+/datum/controller/subsystem/job/proc/get_ping_role(var/role)
+ var/datum/job/J = get_job(role)
+ if(J.requestable)
+ return get_primary_department_of_job(J)
+
// Someday it might be good to port code/game/jobs/job_controller.dm to here and clean it up.
-
-
-
-
/datum/controller/subsystem/job/proc/job_debug_message(message)
if(debug_messages)
log_debug("JOB DEBUG: [message]")
\ No newline at end of file
diff --git a/code/controllers/subsystems/persist_vr.dm b/code/controllers/subsystems/persist_vr.dm
index ea29ae2238..0bde0599cb 100644
--- a/code/controllers/subsystems/persist_vr.dm
+++ b/code/controllers/subsystems/persist_vr.dm
@@ -59,6 +59,8 @@ SUBSYSTEM_DEF(persist)
var/client/C = M.client
var/wait_in_hours = wait / (1 HOUR)
var/pto_factored = wait_in_hours * J.timeoff_factor
+ if(J.playtime_only)
+ pto_factored = 0
LAZYINITLIST(C.department_hours)
LAZYINITLIST(C.play_hours)
var/dept_hours = C.department_hours
diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index 20a9ffeaa4..ea8873e717 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -50,9 +50,9 @@ var/global/datum/controller/subsystem/ticker/ticker
pregame_timeleft = config.pregame_time
send2mainirc("Server lobby is loaded and open at byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]")
SSwebhooks.send(
- WEBHOOK_ROUNDPREP,
+ WEBHOOK_ROUNDPREP,
list(
- "map" = station_name(),
+ "map" = station_name(),
"url" = get_world_url()
)
)
@@ -397,14 +397,19 @@ var/global/datum/controller/subsystem/ticker/ticker
if(player && player.ready && player.mind?.assigned_role)
var/datum/job/J = SSjob.get_job(player.mind.assigned_role)
+ // Ask their new_player mob to spawn them
+ if(!player.spawn_checks_vr(player.mind.assigned_role))
+ var/datum/job/job_datum = job_master.GetJob(J.title)
+ job_datum.current_positions--
+ player.mind.assigned_role = null
+ continue //VOREStation Add
+
// Snowflakey AI treatment
if(J?.mob_type & JOB_SILICON_AI)
player.close_spawn_windows()
player.AIize(move = TRUE)
continue
- // Ask their new_player mob to spawn them
- if(!player.spawn_checks_vr(player.mind.assigned_role)) continue //VOREStation Add
var/mob/living/carbon/human/new_char = player.create_character()
// Created their playable character, delete their /mob/new_player
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 8da8bab272..fef1bcd25d 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -68,7 +68,7 @@
names += componentsubtypes
names += "---Elements---"
names += sortTim(subtypesof(/datum/element), /proc/cmp_typepaths_asc)
- var/result = tgui_input_text(usr, "Choose a component/element to add:", "Add Component/Element", names)
+ var/result = tgui_input_list(usr, "Choose a component/element to add:", "Add Component/Element", names)
if(!usr || !result || result == "---Components---" || result == "---Elements---")
return
if(QDELETED(src))
diff --git a/code/datums/uplink/badassery.dm b/code/datums/uplink/badassery.dm
index 8addcc3f64..8208894af4 100644
--- a/code/datums/uplink/badassery.dm
+++ b/code/datums/uplink/badassery.dm
@@ -91,4 +91,4 @@
var/obj/structure/largecrate/C = /obj/structure/largecrate
icon = image(initial(C.icon), initial(C.icon_state))
- return "[bicon(icon)]"
\ No newline at end of file
+ return "\icon[icon][bicon(icon)]"
\ No newline at end of file
diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm
index 2abb5a1d1a..e5defa6023 100644
--- a/code/datums/uplink/uplink_items.dm
+++ b/code/datums/uplink/uplink_items.dm
@@ -130,7 +130,7 @@ var/datum/uplink/uplink = new()
/datum/uplink_item/item/log_icon()
var/obj/I = path
- return "[bicon(I)]"
+ return "\icon[I][bicon(I)]"
/********************************
* *
@@ -144,7 +144,7 @@ var/datum/uplink/uplink = new()
if(!default_abstract_uplink_icon)
default_abstract_uplink_icon = image('icons/obj/pda.dmi', "pda-syn")
- return "[bicon(default_abstract_uplink_icon)]"
+ return "\icon[default_abstract_uplink_icon][bicon(default_abstract_uplink_icon)]"
/*
* Crated goods.
diff --git a/code/datums/wires/camera.dm b/code/datums/wires/camera.dm
index 571e2a22e6..c572ad8d27 100644
--- a/code/datums/wires/camera.dm
+++ b/code/datums/wires/camera.dm
@@ -57,7 +57,7 @@
C.light_disabled = !C.light_disabled
if(WIRE_CAM_ALARM)
- C.visible_message("[bicon(C)] *beep*", "[bicon(C)] *beep*")
+ C.visible_message("\icon[C][bicon(C)] *beep*", "\icon[C][bicon(C)] *beep*")
..()
/datum/wires/camera/proc/CanDeconstruct()
diff --git a/code/datums/wires/jukebox.dm b/code/datums/wires/jukebox.dm
index 125bbd78ef..cec0f4d370 100644
--- a/code/datums/wires/jukebox.dm
+++ b/code/datums/wires/jukebox.dm
@@ -31,16 +31,16 @@
var/obj/machinery/media/jukebox/A = holder
switch(wire)
if(WIRE_MAIN_POWER1)
- holder.visible_message("[bicon(holder)] The power light flickers.")
+ holder.visible_message("\icon[holder][bicon(holder)] The power light flickers.")
A.shock(usr, 90)
if(WIRE_JUKEBOX_HACK)
- holder.visible_message("[bicon(holder)] The parental guidance light flickers.")
+ holder.visible_message("\icon[holder][bicon(holder)] The parental guidance light flickers.")
if(WIRE_REVERSE)
- holder.visible_message("[bicon(holder)] The data light blinks ominously.")
+ holder.visible_message("\icon[holder][bicon(holder)] The data light blinks ominously.")
if(WIRE_SPEEDUP)
- holder.visible_message("[bicon(holder)] The speakers squeaks.")
+ holder.visible_message("\icon[holder][bicon(holder)] The speakers squeaks.")
if(WIRE_SPEEDDOWN)
- holder.visible_message("[bicon(holder)] The speakers rumble.")
+ holder.visible_message("\icon[holder][bicon(holder)] The speakers rumble.")
if(WIRE_START)
A.StartPlaying()
if(WIRE_STOP)
diff --git a/code/datums/wires/mines.dm b/code/datums/wires/mines.dm
index 5e757ad16c..55ea718c3f 100644
--- a/code/datums/wires/mines.dm
+++ b/code/datums/wires/mines.dm
@@ -21,15 +21,15 @@
switch(wire)
if(WIRE_EXPLODE)
- C.visible_message("[bicon(C)] *BEEE-*", "[bicon(C)] *BEEE-*")
+ C.visible_message("\icon[C][bicon(C)] *BEEE-*", "\icon[C][bicon(C)] *BEEE-*")
C.explode()
if(WIRE_EXPLODE_DELAY)
- C.visible_message("[bicon(C)] *BEEE-*", "[bicon(C)] *BEEE-*")
+ C.visible_message("\icon[C][bicon(C)] *BEEE-*", "\icon[C][bicon(C)] *BEEE-*")
C.explode()
if(WIRE_DISARM)
- C.visible_message("[bicon(C)] *click!*", "[bicon(C)] *click!*")
+ C.visible_message("\icon[C][bicon(C)] *click!*", "\icon[C][bicon(C)] *click!*")
var/obj/effect/mine/MI = new C.mineitemtype(get_turf(C))
if(C.trap)
@@ -41,15 +41,15 @@
qdel(C)
if(WIRE_BADDISARM)
- C.visible_message("[bicon(C)] *BEEPBEEPBEEP*", "[bicon(C)] *BEEPBEEPBEEP*")
+ C.visible_message("\icon[C][bicon(C)] *BEEPBEEPBEEP*", "\icon[C][bicon(C)] *BEEPBEEPBEEP*")
spawn(20)
C.explode()
if(WIRE_TRAP)
- C.visible_message("[bicon(C)] *click!*", "[bicon(C)] *click!*")
+ C.visible_message("\icon[C][bicon(C)] *click!*", "\icon[C][bicon(C)] *click!*")
if(mend)
- C.visible_message("[bicon(C)] - The mine recalibrates[C.camo_net ? ", revealing \the [C.trap] inside." : "."]")
+ C.visible_message("\icon[C][bicon(C)] - The mine recalibrates[C.camo_net ? ", revealing \the [C.trap] inside." : "."]")
C.alpha = 255
@@ -61,21 +61,21 @@
return
switch(wire)
if(WIRE_EXPLODE)
- C.visible_message("[bicon(C)] *beep*", "[bicon(C)] *beep*")
+ C.visible_message("\icon[C][bicon(C)] *beep*", "\icon[C][bicon(C)] *beep*")
if(WIRE_EXPLODE_DELAY)
- C.visible_message("[bicon(C)] *BEEPBEEPBEEP*", "[bicon(C)] *BEEPBEEPBEEP*")
+ C.visible_message("\icon[C][bicon(C)] *BEEPBEEPBEEP*", "\icon[C][bicon(C)] *BEEPBEEPBEEP*")
spawn(20)
C.explode()
if(WIRE_DISARM)
- C.visible_message("[bicon(C)] *ping*", "[bicon(C)] *ping*")
+ C.visible_message("\icon[C][bicon(C)] *ping*", "\icon[C][bicon(C)] *ping*")
if(WIRE_BADDISARM)
- C.visible_message("[bicon(C)] *ping*", "[bicon(C)] *ping*")
+ C.visible_message("\icon[C][bicon(C)] *ping*", "\icon[C][bicon(C)] *ping*")
if(WIRE_TRAP)
- C.visible_message("[bicon(C)] *ping*", "[bicon(C)] *ping*")
+ C.visible_message("\icon[C][bicon(C)] *ping*", "\icon[C][bicon(C)] *ping*")
..()
diff --git a/code/datums/wires/particle_accelerator.dm b/code/datums/wires/particle_accelerator.dm
index e3fd198b3b..1787039622 100644
--- a/code/datums/wires/particle_accelerator.dm
+++ b/code/datums/wires/particle_accelerator.dm
@@ -26,7 +26,7 @@
C.interface_control = !C.interface_control
if(WIRE_PARTICLE_POWER_LIMIT)
- C.visible_message("[bicon(C)][C] makes a large whirring noise.")
+ C.visible_message("\icon[C][bicon(C)][C] makes a large whirring noise.")
/datum/wires/particle_acc/control_box/on_cut(wire, mend)
var/obj/machinery/particle_accelerator/control_box/C = holder
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index eac4e10ea0..033183a639 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -40,7 +40,7 @@
if(!msg_sanitized)
message = sanitize(message, extra = 0)
- message_title = sanitizeSafe(message_title)
+ message_title = sanitizeSafe(message_title)
var/list/zlevels
if(zlevel)
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index d86e526e39..d08c7a7246 100755
--- a/code/game/area/Space Station 13 areas.dm
+++ b/code/game/area/Space Station 13 areas.dm
@@ -806,11 +806,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "\improper Shuttle Dock Hallway - Dock One"
icon_state = "entry_D1"
base_turf = /turf/space
+ forbid_events = TRUE
/area/hallway/secondary/entry/D2
name = "\improper Shuttle Dock Hallway - Dock Two"
icon_state = "entry_D2"
base_turf = /turf/space
+ forbid_events = TRUE
/area/hallway/secondary/entry/D2/arrivals
name = "\improper Shuttle Dock Hallway - Dock Two"
@@ -822,6 +824,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "\improper Shuttle Dock Hallway - Dock Three"
icon_state = "entry_D3"
base_turf = /turf/space
+ forbid_events = TRUE
/area/hallway/secondary/entry/D4
name = "\improper Shuttle Dock Hallway - Dock Four"
@@ -963,6 +966,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "Sleep"
ambience = AMBIENCE_GENERIC
forbid_events = TRUE
+ forbid_singulo = TRUE
/area/crew_quarters/toilet
name = "\improper Dormitory Toilets"
diff --git a/code/game/area/Space Station 13 areas_ch.dm b/code/game/area/Space Station 13 areas_ch.dm
index 473b7fb02d..4d69fe8e4e 100644
--- a/code/game/area/Space Station 13 areas_ch.dm
+++ b/code/game/area/Space Station 13 areas_ch.dm
@@ -29,6 +29,7 @@
/area/surface/outpost/main/dorms
name = "\improper Main Outpost Dorms"
soundproofed = TRUE
+ forbid_events = TRUE
/area/surface/outpost/main/dorms/dorm_1
name = "\improper Main Outpost Dorm One"
@@ -72,6 +73,7 @@
/area/crew_quarters/sleep
soundproofed = TRUE
+ forbid_events = TRUE
/area/crew_quarters/sleep/vistor_room_1
limit_mob_size = FALSE
@@ -110,4 +112,5 @@
limit_mob_size = FALSE
/area/medical/cryo/autoresleeve
- name = "\improper Medical Autoresleeving"
\ No newline at end of file
+ name = "\improper Medical Autoresleeving"
+ forbid_events = TRUE
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index ad9ef7a6dd..31d1d07f2b 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -51,6 +51,7 @@
var/sound_env = STANDARD_STATION
var/turf/base_turf //The base turf type of the area, which can be used to override the z-level's base turf
var/forbid_events = FALSE // If true, random events will not start inside this area.
+ var/forbid_singulo = FALSE // If true singulo will not move in.
var/no_spoilers = FALSE // If true, makes it much more difficult to see what is inside an area with things like mesons.
var/soundproofed = FALSE // If true, blocks sounds from other areas and prevents hearers on other areas from hearing the sounds within.
@@ -379,7 +380,7 @@ var/list/mob/living/forced_ambiance_list = new
/area/Entered(mob/M)
if(!istype(M) || !M.ckey)
return
-
+
if(!isliving(M))
M.lastarea = src
return
@@ -450,6 +451,8 @@ var/list/mob/living/forced_ambiance_list = new
return
if(H.incorporeal_move) // VOREstation edit - Phaseshifted beings should not be affected by gravity
return
+ if(H.species.can_zero_g_move || H.species.can_space_freemove)
+ return
if(H.m_intent == "run")
H.AdjustStunned(6)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 5ef2fd6818..d1640d64cd 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -225,7 +225,7 @@
else
f_name += "oil-stained [name][infix]."
- var/list/output = list("[bicon(src)] That's [f_name] [suffix]", desc)
+ var/list/output = list("\icon[src.examine_icon()][bicon(src)] That's [f_name] [suffix]", desc)
if(user.client?.prefs.examine_text_mode == EXAMINE_MODE_INCLUDE_USAGE)
output += description_info
diff --git a/code/game/gamemodes/cult/construct_spells.dm b/code/game/gamemodes/cult/construct_spells.dm
index 62cdd5bf48..5bd8929555 100644
--- a/code/game/gamemodes/cult/construct_spells.dm
+++ b/code/game/gamemodes/cult/construct_spells.dm
@@ -512,7 +512,7 @@
var/obj/item/projectile/new_projectile = make_projectile(spell_projectile, user)
new_projectile.old_style_target(hit_atom)
new_projectile.fire()
- log_and_message_admins("has casted [src] at \the [hit_atom].")
+ log_attack("has casted [src] at \the [hit_atom].")//CHOMPEdit from log_and_message_admins
if(fire_sound)
playsound(src, fire_sound, 75, 1)
return 1
diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm
index bfcf3037b4..1aa1f7cb55 100644
--- a/code/game/jobs/job/assistant_vr.dm
+++ b/code/game/jobs/job/assistant_vr.dm
@@ -27,6 +27,7 @@
job_description = "An Intern does whatever is requested of them, often doing so in process of learning \
another job. Though they are part of the crew, they have no real authority."
timeoff_factor = 0 // Interns, noh
+ requestable = FALSE
/datum/alt_title/intern_eng
title = "Apprentice Engineer"
@@ -96,6 +97,7 @@
supervisors = "nobody! You don't work here"
job_description = "A Visitor is just there to visit the place. They have no real authority or responsibility."
timeoff_factor = 0
+ requestable = FALSE
alt_titles = list("Guest" = /datum/alt_title/guest, "Traveler" = /datum/alt_title/traveler)
/datum/job/assistant/New()
diff --git a/code/game/jobs/job/engineering_vr.dm b/code/game/jobs/job/engineering_vr.dm
index 0c698587b6..e0ca7bac7e 100644
--- a/code/game/jobs/job/engineering_vr.dm
+++ b/code/game/jobs/job/engineering_vr.dm
@@ -23,17 +23,28 @@
/datum/alt_title/maintenance_manager
title = "Maintenance Manager"
+/datum/job/chief_engineer/get_request_reasons()
+ return list("Engine setup", "Construction project", "Repairs necessary")
+
/datum/job/engineer
pto_type = PTO_ENGINEERING
alt_titles = list("Maintenance Technician" = /datum/alt_title/maint_tech, "Engine Technician" = /datum/alt_title/engine_tech,
- "Electrician" = /datum/alt_title/electrician, "Construction Engineer" = /datum/alt_title/construction_engi)
+ "Electrician" = /datum/alt_title/electrician, "Construction Engineer" = /datum/alt_title/construction_engi, "Engineering Contractor" = /datum/alt_title/engineering_contractor)
/datum/alt_title/construction_engi
title = "Construction Engineer"
title_blurb = "A Construction Engineer fulfills similar duties to other engineers, but usually occupies spare time with construction of extra facilities in dedicated areas or \
as additions to station layout."
+/datum/alt_title/engineering_contractor
+ title = "Engineering Contractor"
+ title_blurb = "An Engineering Contractor fulfills similar duties to other engineers, but isn't directly employed by NT proper."
+
+/datum/job/engineer/get_request_reasons()
+ return list("Engine setup", "Construction project", "Repairs necessary")
+
+
/datum/job/atmos
@@ -50,3 +61,6 @@
/datum/alt_title/disposals_tech
title = "Disposals Technician"
title_blurb = "A Disposals Technician is an Atmospheric Technician still and can fulfill all the same duties, although specializes more in disposals delivery system's operations and configurations."
+
+/datum/job/atmos/get_request_reasons()
+ return list("Construction project", "Repairs necessary")
\ No newline at end of file
diff --git a/code/game/jobs/job/job_vr.dm b/code/game/jobs/job/job_vr.dm
index a416a3af48..ac8b6be0b4 100644
--- a/code/game/jobs/job/job_vr.dm
+++ b/code/game/jobs/job/job_vr.dm
@@ -17,6 +17,11 @@
//Time required in the department as other jobs before playing this one (in hours)
var/dept_time_required = 0
+ //Do we forbid ourselves from earning PTO?
+ var/playtime_only = FALSE
+
+ var/requestable = TRUE
+
// Check client-specific availability rules.
/datum/job/proc/player_has_enough_pto(client/C)
return timeoff_factor >= 0 || (C && LAZYACCESS(C.department_hours, pto_type) > 0)
@@ -39,7 +44,7 @@
if(C && config.use_playtime_restriction_for_jobs && dept_time_required)
var/remaining_time_needed = dept_time_required
for(var/key in C.play_hours)
- if(isnum(C.play_hours[key]))
+ if(isnum(C.play_hours[key]) && !(key == PTO_TALON))
remaining_time_needed = max(0, remaining_time_needed - C.play_hours[key])
return remaining_time_needed
return 0
@@ -55,4 +60,7 @@
if(isnum(C.play_hours[PTO_EXPLORATION]))
remaining_time_needed = max(0, remaining_time_needed - C.play_hours[PTO_EXPLORATION])
return remaining_time_needed
- return 0
\ No newline at end of file
+ return 0
+
+/datum/job/proc/get_request_reasons()
+ return list()
\ No newline at end of file
diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm
index 120d538e4a..5fc2081ebd 100644
--- a/code/game/jobs/job/medical_vr.dm
+++ b/code/game/jobs/job/medical_vr.dm
@@ -21,14 +21,16 @@
/datum/alt_title/healthcare_manager
title = "Healthcare Manager"
+/datum/job/cmo/get_request_reasons()
+ return list("Surgery pending", "Viral outbreak")
+
/datum/job/doctor
spawn_positions = 5
pto_type = PTO_MEDICAL
alt_titles = list("Physician" = /datum/alt_title/physician, "Medical Practitioner" = /datum/alt_title/medical_practitioner, "Surgeon" = /datum/alt_title/surgeon,
"Emergency Physician" = /datum/alt_title/emergency_physician, "Nurse" = /datum/alt_title/nurse, "Orderly" = /datum/alt_title/orderly,
- "Virologist" = /datum/alt_title/virologist)
-
+ "Virologist" = /datum/alt_title/virologist, "Medical Contractor" = /datum/alt_title/medical_contractor)
/datum/alt_title/physician
title = "Physician"
@@ -42,6 +44,13 @@
and dirty labor around the department."
title_outfit = /decl/hierarchy/outfit/job/medical/doctor/nurse
+/datum/alt_title/medical_contractor
+ title = "Medical Contractor"
+ title_blurb = "A Medical Contractor can be anything from a full-blown doctor to the likes of a nurse or orderly, but isn't directly employed by NT proper."
+
+/datum/job/doctor/get_request_reasons()
+ return list("Surgery pending", "Viral outbreak")
+
/datum/job/chemist
pto_type = PTO_MEDICAL
@@ -71,10 +80,15 @@
/datum/job/paramedic
pto_type = PTO_MEDICAL
- alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder)
+ alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder) //CHOMPedit: Removed SAR because that's an actual job here
/datum/alt_title/medical_responder
title = "Medical Responder"
title_blurb = "A Medical Responder is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \
own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training."
title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt
+
+/* //CHOMPedit: Commented out because this is an actual job here
+/datum/alt_title/sar
+ title = "Search and Rescue"
+*/
diff --git a/code/game/jobs/job/security_vr.dm b/code/game/jobs/job/security_vr.dm
index b6b704660f..22de747d7b 100644
--- a/code/game/jobs/job/security_vr.dm
+++ b/code/game/jobs/job/security_vr.dm
@@ -16,6 +16,9 @@
/datum/alt_title/security_manager
title = "Security Manager"
+/datum/job/hos/get_request_reasons()
+ return list("Wildlife management", "Forensic investigation")
+
/datum/job/warden
pto_type = PTO_SECURITY
@@ -28,6 +31,9 @@
/datum/alt_title/armory_superintendent
title = "Armory Superintendent"
+/datum/job/warden/get_request_reasons()
+ return list("Wildlife management")
+
/datum/job/detective
pto_type = PTO_SECURITY
@@ -39,13 +45,16 @@
/datum/alt_title/security_inspector
title = "Security Inspector"
+/datum/job/detective/get_request_reasons()
+ return list("Forensic investigation")
+
/datum/job/officer
total_positions = 5
spawn_positions = 5
pto_type = PTO_SECURITY
alt_titles = list("Patrol Officer" = /datum/alt_title/patrol_officer, "Security Guard" = /datum/alt_title/security_guard,
- "Security Deputy" = /datum/alt_title/security_guard, "Junior Officer" = /datum/alt_title/junior_officer)
+ "Security Deputy" = /datum/alt_title/security_guard, "Junior Officer" = /datum/alt_title/junior_officer, "Security Contractor" = /datum/alt_title/security_contractor)
/datum/alt_title/patrol_officer
title = "Patrol Officer"
@@ -55,3 +64,9 @@
/datum/alt_title/security_deputy
title = "Security Deputy"
+
+/datum/alt_title/security_contractor
+ title = "Security Contractor"
+
+/datum/job/officer/get_request_reasons()
+ return list("Wildlife management")
diff --git a/code/game/jobs/job/special_vr.dm b/code/game/jobs/job/special_vr.dm
index 54e8c157da..3a10a23df5 100644
--- a/code/game/jobs/job/special_vr.dm
+++ b/code/game/jobs/job/special_vr.dm
@@ -113,6 +113,7 @@
job_description = "A Clown is there to entertain the crew and keep high morale using various harmless pranks and ridiculous jokes!"
whitelist_only = 1
latejoin_only = 0
+ requestable = FALSE
outfit_type = /decl/hierarchy/outfit/job/clown
pto_type = PTO_CIVILIAN
alt_titles = list("Jester" = /datum/alt_title/jester, "Fool" = /datum/alt_title/fool)
@@ -144,6 +145,7 @@
alt_titles = list("Poseur" = /datum/alt_title/poseur)
whitelist_only = 1
latejoin_only = 0
+ requestable = FALSE
outfit_type = /decl/hierarchy/outfit/job/mime
pto_type = PTO_CIVILIAN
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 046db35f33..5a414430ea 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -355,7 +355,7 @@ var/global/datum/controller/occupations/job_master
return 1
-/datum/controller/occupations/proc/EquipRank(var/mob/living/carbon/human/H, var/rank, var/joined_late = 0)
+/datum/controller/occupations/proc/EquipRank(var/mob/living/carbon/human/H, var/rank, var/joined_late = 0, var/announce = TRUE)
if(!H) return null
var/datum/job/job = GetJob(rank)
@@ -494,7 +494,7 @@ var/global/datum/controller/occupations/job_master
return H
// TWEET PEEP
- if(rank == "Site Manager")
+ if(rank == "Site Manager" && announce)
var/sound/announce_sound = (ticker.current_state <= GAME_STATE_SETTING_UP) ? null : sound('sound/misc/boatswain.ogg', volume=20)
captain_announcement.Announce("All hands, [alt_title ? alt_title : "Site Manager"] [H.real_name] on deck!", new_sound = announce_sound, zlevel = H.z)
diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm
index ca40f0dc53..8d3933faca 100644
--- a/code/game/machinery/air_alarm.dm
+++ b/code/game/machinery/air_alarm.dm
@@ -835,7 +835,18 @@
TLV["temperature"] = list(T0C - 40, T0C - 20, T0C + 40, T0C + 66) // K, Lower Temperature for Freezer Air Alarms (This is because TLV is hardcoded to be generated on first_run, and therefore the only way to modify this without changing TLV generation)
-// VOREStation Edit End
+// VOREStation Edit End, CHOMPEdit START
+/obj/machinery/alarm/sifwilderness
+ breach_detection = 0
+ report_danger_level = 0
+
+/obj/machinery/alarm/sifwilderness/first_run()
+ . = ..()
+
+ TLV["oxygen"] = list(16, 17, 135, 140)
+ TLV["pressure"] = list(0,ONE_ATMOSPHERE*0.10,ONE_ATMOSPHERE*1.50,ONE_ATMOSPHERE*1.60)
+ TLV["temperature"] = list(T0C - 40, T0C - 31, T0C + 40, T0C + 120)
+// CHOMPEdit END
#undef LOAD_TLV_VALUES
#undef TEST_TLV_VALUES
#undef DECLARE_TLV_VALUES
\ No newline at end of file
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 7def7f8b8e..188fd356dc 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -1125,7 +1125,7 @@
// This is not a status display message, since it's something the character
// themselves is meant to see BEFORE putting the money in
- to_chat(usr, "[bicon(cashmoney)] That is not enough money.")
+ to_chat(usr, "\icon[cashmoney][bicon(cashmoney)] That is not enough money.")
return 0
if(istype(cashmoney, /obj/item/weapon/spacecash))
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 137d3a7adb..6ceab53895 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -111,7 +111,7 @@ Class Procs:
var/clickvol = 40 // volume
var/interact_offline = 0 // Can the machine be interacted with while de-powered.
var/obj/item/weapon/circuitboard/circuit = null
-
+
// 0.0 - 1.0 multipler for prob() based on bullet structure damage
// So if this is 1.0 then a 100 damage bullet will always break this structure
// If this is 0.5 then a 50 damage bullet will break this structure 25% of the time
@@ -284,7 +284,7 @@ Class Procs:
/obj/machinery/proc/state(var/msg)
for(var/mob/O in hearers(src, null))
- O.show_message("[bicon(src)] [msg]", 2)
+ O.show_message("\icon[src][bicon(src)] [msg]", 2)
/obj/machinery/proc/ping(text=null)
if(!text)
@@ -439,7 +439,7 @@ Class Procs:
for(var/obj/I in contents)
if(istype(I,/obj/item/weapon/card/id))
I.forceMove(src.loc)
-
+
if(!circuit)
return 0
var/obj/structure/frame/A = new /obj/structure/frame(src.loc)
@@ -499,7 +499,7 @@ Class Procs:
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
-
+
var/atom/droploc = drop_location()
if(!droploc || !contents.len) // not even a circuit?
playsound(src, 'sound/machines/machine_die_short.ogg')
@@ -513,17 +513,17 @@ Class Procs:
if(severity != 1)
for(var/obj/item/weapon/card/id/I in contents)
surviving_parts |= I
-
+
// May populate some items to throw around
if(!LAZYLEN(component_parts) && circuit)
circuit.apply_default_parts(src)
-
+
var/survivability
switch(severity)
// No survivors
if(1)
survivability = 0
-
+
// 1 part survives
if(2)
survivability = 0
@@ -534,15 +534,15 @@ Class Procs:
// 50% of parts destroyed on average
if(3)
survivability = 50
-
+
// No parts destroyed, but you lose the frame
else
survivability = 100
-
+
for(var/atom/movable/P in contents)
if(prob(survivability))
surviving_parts |= P
-
+
if(circuit && severity >= 2)
var/datum/frame/frame_types/FT = circuit.board_type
if(istype(FT))
diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm
index 705914f794..c63ea1f1d8 100644
--- a/code/game/machinery/overview.dm
+++ b/code/game/machinery/overview.dm
@@ -138,7 +138,7 @@
var/icon/I = imap[1+(ix + icx*iy)*2]
var/icon/I2 = imap[2+(ix + icx*iy)*2]
- //to_world("icon: [bicon(I)]")
+ //to_world("icon: \icon[I][bicon(I)]")
I.DrawBox(colour, rx, ry, rx+1, ry+1)
@@ -153,7 +153,7 @@
H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]"
- //to_world("[bicon(I)] at [H.screen_loc]")
+ //to_world("\icon[I][bicon(I)] at [H.screen_loc]")
H.name = (i==0)?"maprefresh":"map"
@@ -266,7 +266,7 @@
//to_world("trying [ix],[iy] : [ix+icx*iy]")
var/icon/I = imap[1+(ix + icx*iy)]
- //to_world("icon: [bicon(I)]")
+ //to_world("icon: \icon[I][bicon(I)]")
I.DrawBox(colour, rx, ry, rx, ry)
@@ -279,7 +279,7 @@
H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]"
- //to_world("[bicon(I)] at [H.screen_loc]")
+ //to_world("\icon[I][bicon(I)] at [H.screen_loc]")
H.name = (i==0)?"maprefresh":"map"
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index eaad936be4..81e04792c1 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -419,7 +419,7 @@
return
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, "PortableTurret", name, 500, 400)
+ ui = new(user, src, "PortableTurret", name, ui_x = 500, ui_y = 400)
ui.open()
/obj/machinery/porta_turret/tgui_data(mob/user)
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index f52c14da46..115e5e710a 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -10,7 +10,7 @@
active_power_usage = 40000 //40 kW
var/efficiency = 40000 //will provide the modified power rate when upgraded
var/obj/item/charging = null
- var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/modular_computer, /obj/item/weapon/computer_hardware/battery_module, /obj/item/weapon/cell, /obj/item/device/suit_cooling_unit/emergency, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/device/flash, /obj/item/device/defib_kit, /obj/item/ammo_casing/microbattery, /obj/item/ammo_magazine/cell_mag, /obj/item/weapon/gun/projectile/cell_loaded) //VOREStation Add - NSFW Batteries
+ var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/modular_computer, /obj/item/weapon/computer_hardware/battery_module, /obj/item/weapon/cell, /obj/item/device/suit_cooling_unit/emergency, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/device/flash, /obj/item/device/defib_kit, /obj/item/ammo_casing/microbattery, /obj/item/device/paicard, /obj/item/ammo_magazine/cell_mag, /obj/item/weapon/gun/projectile/cell_loaded) // CHOMPedit: medigun stuff
var/icon_state_charged = "recharger2"
var/icon_state_charging = "recharger1"
var/icon_state_idle = "recharger0" //also when unpowered
@@ -68,7 +68,7 @@
if(EW.use_external_power)
to_chat(user, "\The [EW] has no recharge port.")
return
- else if(istype(G, /obj/item/ammo_magazine/cell_mag))
+ else if(istype(G, /obj/item/ammo_magazine/cell_mag)) // CHOMPedit start
var/obj/item/ammo_magazine/cell_mag/maggy = G
if(maggy.stored_ammo.len < 1)
to_chat(user, "\The [G] does not have any cells installed.")
@@ -81,7 +81,18 @@
to_chat(user, "\The [G] does not have any cell in its magazine installed.")
return
else
- to_chat(user, "\The [G] does not have a magazine installed..")
+ to_chat(user, "\The [G] does not have a magazine installed..") // CHOMPedit end
+ if(istype(G, /obj/item/device/paicard))
+ var/obj/item/device/paicard/ourcard = G
+ if(ourcard.panel_open)
+ to_chat(user, "\The [ourcard] won't fit in the recharger with its panel open.")
+ return
+ if(ourcard.pai)
+ if(ourcard.pai.stat == CONSCIOUS)
+ to_chat(user, "\The [ourcard] boops... it doesn't need to be recharged!")
+ return
+ else
+ to_chat(user, "\The [ourcard] doesn't have a personality!")
return
user.drop_item()
@@ -134,6 +145,25 @@
if(!charging)
update_use_power(USE_POWER_IDLE)
icon_state = icon_state_idle
+ //VOREStation Edit Start - pAI revival!
+ else if(istype(charging, /obj/item/device/paicard))
+ var/obj/item/device/paicard/pcard = charging
+ if(pcard.is_damage_critical())
+ pcard.forceMove(get_turf(src))
+ charging = null
+ pcard.damage_random_component()
+ update_icon()
+ else if(pcard.pai.bruteloss)
+ pcard.pai.adjustBruteLoss(-5)
+ else if(pcard.pai.fireloss)
+ pcard.pai.adjustFireLoss(-5)
+ else
+ charging = null
+ update_icon()
+ src.visible_message("\The [src] ejects the [pcard]!")
+ pcard.forceMove(get_turf(src))
+ pcard.pai.full_restore()
+ //VOREStation Edit End
else
var/obj/item/weapon/cell/C = charging.get_cell()
if(istype(C))
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index a1d44b9838..d2adbad8da 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -198,7 +198,7 @@
desc += "It is capable of repairing burn damage." /obj/machinery/recharge_station/proc/build_overlays() - cut_overlay() + cut_overlays() switch(round(chargepercentage())) if(1 to 20) add_overlay("statn_c0") @@ -323,4 +323,4 @@ icon_state = "borg_pod_opened" if(icon_update_tick == 0) - build_overlays() \ No newline at end of file + build_overlays() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 7350ca0c1e..6b6fc6df6a 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -98,7 +98,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console/update_icon() cut_overlays() - + if(stat & NOPOWER) set_light(0) set_light_on(FALSE) @@ -145,9 +145,9 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console/tgui_act(action, list/params) if(..()) return TRUE - + add_fingerprint(usr) - + switch(action) if("write") if(reject_bad_text(params["write"])) @@ -198,7 +198,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() screen = RCS_SENTPASS message_log += list(list("Message sent to [recipient]", "[message]")) else - audible_message(text("[bicon(src)] *The Requests Console beeps: 'NOTICE: No server detected!'"),,4) + audible_message(text("\icon[src][bicon(src)] *The Requests Console beeps: 'NOTICE: No server detected!'"),,4) . = TRUE //Handle printing diff --git a/code/game/machinery/suit_cycler_datums.dm b/code/game/machinery/suit_cycler_datums.dm index 4d84d116af..6cc706aea1 100644 --- a/code/game/machinery/suit_cycler_datums.dm +++ b/code/game/machinery/suit_cycler_datums.dm @@ -346,3 +346,5 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) name = SPECIES_SERGAL /datum/suit_cycler_choice/species/vulpkanin name = SPECIES_VULPKANIN +/datum/suit_cycler_choice/species/altevian + name = SPECIES_ALTEVIAN diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 175434088d..9ee8ad6f6e 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -520,7 +520,7 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) /datum/suit_cycler_choice/department/sec/riot, /datum/suit_cycler_choice/department/sec/eva ) - + /// Species that the cycler can refit suits for. Null assumes all except specially excluded ones. var/list/limit_species @@ -544,13 +544,13 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) species = load_species() emagged_departments = load_emagged() limit_departments = null // just for mem - + target_department = departments["No Change"] target_species = species["No Change"] if(!target_department || !target_species) stat |= BROKEN - + wires = new(src) /obj/machinery/suit_cycler/Destroy() @@ -704,7 +704,7 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) /obj/machinery/suit_cycler/vintage/rugged name = "Vintage Ruggedized suit cycler" model_text = "Vintage Ruggedized" - + limit_departments = list( /datum/suit_cycler_choice/department/vintage/eng, /datum/suit_cycler_choice/department/vintage/marine, @@ -925,17 +925,17 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) /obj/machinery/suit_cycler/tgui_static_data(mob/user) var/list/data = list() - + // tgui gets angy if you pass values too var/list/department_keys = list() for(var/key in departments) department_keys += key - + // emagged at the bottom if(emagged) for(var/key in emagged_departments) department_keys += key - + var/list/species_keys = list() for(var/key in species) species_keys += key @@ -943,7 +943,7 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) data["departments"] = department_keys data["species"] = species_keys - return data + return data /obj/machinery/suit_cycler/tgui_act(action, params) if(..()) @@ -1063,7 +1063,7 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) /obj/machinery/suit_cycler/proc/finished_job() var/turf/T = get_turf(src) - T.visible_message("[bicon(src)]The [src] beeps several times.") + T.visible_message("\icon[src][bicon(src)]The [src] beeps several times.") icon_state = initial(icon_state) active = 0 playsound(src, 'sound/machines/boobeebeep.ogg', 50) @@ -1114,7 +1114,7 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) /obj/machinery/suit_cycler/proc/apply_paintjob() if(!target_species || !target_department) return - + // Helmet to new paint if(target_department.can_refit_helmet(helmet)) target_department.do_refit_helmet(helmet) @@ -1129,5 +1129,5 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) if(target_species.can_refit_to(helmet, suit, suit?.helmet)) target_species.do_refit_to(helmet, suit, suit?.helmet) else - visible_message("[bicon(src)]Unable to apply specified cosmetics with specified species. Please try again with a different species or cosmetic option selected.") + visible_message("\icon[src][bicon(src)]Unable to apply specified cosmetics with specified species. Please try again with a different species or cosmetic option selected.") return diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 5a4932fd0a..686a03cb25 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -454,7 +454,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/part_b_extra = "" if(data == DATA_ANTAG) // intercepted radio message part_b_extra = " (Intercepted)" - var/part_a = "[bicon(radio)]\[[freq_text]\][part_b_extra] " // goes in the actual output + var/part_a = "\icon[radio][bicon(radio)]\[[freq_text]\][part_b_extra] " // goes in the actual output // --- Some more pre-message formatting --- var/part_b = " [bicon(radio)]\[[freq_text]\][part_b_extra] \icon[radio][bicon(radio)]\[[freq_text]\][part_b_extra] \[[freq_text]\] " diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index cb9226ad99..6e684974aa 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -125,7 +125,7 @@ /obj/machinery/turretid/tgui_interact(mob/user, datum/tgui/ui = null) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "PortableTurret", name) // 500, 400 + ui = new(user, src, "PortableTurret", name, ui_x = 500, ui_y = 400) // 500, 400 ui.open() /obj/machinery/turretid/tgui_data(mob/user) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 892867c316..033cc181a1 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -280,7 +280,7 @@ /obj/item/mecha_parts/mecha_equipment/proc/occupant_message(message) if(chassis) - chassis.occupant_message("[bicon(src)] [message]") + chassis.occupant_message("\icon[src][bicon(src)] [message]") return /obj/item/mecha_parts/mecha_equipment/proc/log_message(message) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index b038d90c42..7d384f6bf8 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -95,3 +95,9 @@ P.accuracy += M.accuracy if(!isnull(M.accuracy_dispersion)) P.dispersion = max(P.dispersion + M.accuracy_dispersion, 0) + + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(H.species) + P.accuracy += H.species.gun_accuracy_mod + P.dispersion = max(P.dispersion + H.species.gun_accuracy_dispersion_mod, 0) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index d728d2c1e1..ab210dc8dc 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -654,20 +654,20 @@ switch(emagged) if(0) emagged = 0.5 - visible_message("[bicon(src)] [src] beeps: \"DB error \[Code 0x00F1\]\"") + visible_message("\icon[src][bicon(src)] [src] beeps: \"DB error \[Code 0x00F1\]\"") sleep(10) - visible_message("[bicon(src)] [src] beeps: \"Attempting auto-repair\"") + visible_message("\icon[src][bicon(src)] [src] beeps: \"Attempting auto-repair\"") sleep(15) - visible_message("[bicon(src)] [src] beeps: \"User DB corrupted \[Code 0x00FA\]. Truncating data structure...\"") + visible_message("\icon[src][bicon(src)] [src] beeps: \"User DB corrupted \[Code 0x00FA\]. Truncating data structure...\"") sleep(30) - visible_message("[bicon(src)] [src] beeps: \"User DB truncated. Please contact your [using_map.company_name] system operator for future assistance.\"") + visible_message("\icon[src][bicon(src)] [src] beeps: \"User DB truncated. Please contact your [using_map.company_name] system operator for future assistance.\"") req_access = null emagged = 1 return 1 if(0.5) - visible_message("[bicon(src)] [src] beeps: \"DB not responding \[Code 0x0003\]...\"") + visible_message("\icon[src][bicon(src)] [src] beeps: \"DB not responding \[Code 0x0003\]...\"") if(1) - visible_message("[bicon(src)] [src] beeps: \"No records in User DB\"") + visible_message("\icon[src][bicon(src)] [src] beeps: \"No records in User DB\"") /obj/machinery/mecha_part_fabricator/proc/eject_materials(var/material, var/amount) // 0 amount = 0 means ejecting a full stack; -1 means eject everything var/recursive = amount == -1 ? TRUE : FALSE diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index 470ede8a0f..d87ae30027 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -61,6 +61,7 @@ "Cyborg Parts", "Cyborg Internals", "Cybernetics", + "pAI Parts", //VOREStation Add "Implants", "Control Interfaces", "Other", diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 62736a48fb..8d3ab1c8b4 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -549,7 +549,7 @@ if(equipment?.len) . += "It's equipped with:" for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) - . += "[bicon(ME)] [ME]" + . += "\icon[ME][bicon(ME)] [ME]" /obj/mecha/proc/drop_item()//Derpfix, but may be useful in future for engineering exosuits. return @@ -572,7 +572,6 @@ /obj/mecha/proc/show_radial_occupant(var/mob/user) var/list/choices = list( - "Eject" = radial_image_eject, "Toggle Airtank" = radial_image_airtoggle, "Toggle Light" = radial_image_lighttoggle, "View Stats" = radial_image_statpanel @@ -584,9 +583,6 @@ if(!choice) return switch(choice) - if("Eject") - go_out() - add_fingerprint(usr) if("Toggle Airtank") use_internal_tank = !use_internal_tank occupant_message("Now taking air from [use_internal_tank?"internal airtank":"environment"].") @@ -2449,7 +2445,7 @@ /obj/mecha/proc/occupant_message(message as text) if(message) if(src.occupant && src.occupant.client) - to_chat(src.occupant, "[bicon(src)] [message]") + to_chat(src.occupant, "\icon[src][bicon(src)] [message]") return /obj/mecha/proc/log_message(message as text,red=null) diff --git a/code/game/mecha/micro/micro.dm b/code/game/mecha/micro/micro.dm index abc39eb5a2..bea6f6f1dd 100644 --- a/code/game/mecha/micro/micro.dm +++ b/code/game/mecha/micro/micro.dm @@ -122,7 +122,7 @@ /obj/mecha/micro/move_inside() var/mob/living/carbon/C = usr - if (C.size_multiplier >= 0.5) + if (C.get_effective_size(TRUE) >= 0.5) to_chat(C, "You can't fit in this suit!") return else @@ -130,7 +130,7 @@ /obj/mecha/micro/move_inside_passenger() var/mob/living/carbon/C = usr - if (C.size_multiplier >= 0.5) + if (C.get_effective_size(TRUE) >= 0.5) to_chat(C, "You can't fit in this suit!") return else diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index b32777c65a..6f96ec1689 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -52,7 +52,7 @@ var/global/list/image/splatter_cache=list() addtimer(CALLBACK(src, .proc/dry), DRYING_TIME * (amount+1)) /obj/effect/decal/cleanable/blood/update_icon() - if(basecolor == "rainbow") basecolor = "#[get_random_colour(1)]" + if(basecolor == "rainbow") basecolor = get_random_colour(1) color = basecolor if(basecolor == SYNTH_BLOOD_COLOUR) @@ -184,11 +184,11 @@ var/global/list/image/splatter_cache=list() var/image/giblets = new(base_icon, "[icon_state]_flesh", dir) if(!fleshcolor || fleshcolor == "rainbow") - fleshcolor = "#[get_random_colour(1)]" + fleshcolor = get_random_colour(1) giblets.color = fleshcolor var/icon/blood = new(base_icon,"[icon_state]",dir) - if(basecolor == "rainbow") basecolor = "#[get_random_colour(1)]" + if(basecolor == "rainbow") basecolor = get_random_colour(1) blood.Blend(basecolor,ICON_MULTIPLY) icon = blood diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index e68ce7aa4e..cf26c6463d 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -38,6 +38,12 @@ icon_state = "dirt" mouse_opacity = 0 +/obj/effect/decal/cleanable/Initialize(var/mapload, var/_age) + .=..() + var/turf/simulated/our_turf = src.loc + if(our_turf && istype(our_turf) && our_turf.can_dirty && _age) + our_turf.dirt = 101 + /obj/effect/decal/cleanable/flour name = "flour" desc = "It's still good. Four second rule!" diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 8545ca174e..db61554bd1 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -269,7 +269,7 @@ walk_to(src, target_atom, 5) if(prob(25)) src.visible_message("\The [src] skitters[pick(" away"," around","")].") - else if(prob(5)) + else if(amount_grown < 75 && prob(5)) //vent crawl! for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src)) if(!v.welded) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index a7b053ae93..2ed58f88ee 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -161,6 +161,10 @@ var/obj/item/organ/external/hand = H.organs_by_name[check_hand] if(istype(hand) && hand.is_usable()) return TRUE + var/mob/living/simple_mob/S = M + if(istype(S) && S.has_hands) //Are they a mob? And do they have hands? + return TRUE + return FALSE @@ -256,6 +260,15 @@ var/obj/effect/temporary_effect/item_pickup_ghost/ghost = new(old_loc) ghost.assumeform(src) ghost.animate_towards(user) + //VORESTATION EDIT START. This handles possessed items. + if(src.possessed_voice && src.possessed_voice.len && !(user.ckey in warned_of_possession)) //Is this item possessed? + warned_of_possession |= user.ckey + tgui_alert_async(user,{" + THIS ITEM IS POSSESSED BY A PLAYER CURRENTLY IN THE ROUND. This could be by anomalous means or otherwise. + If this is not something you wish to partake in, it is highly suggested you place the item back down. + If this is fine to you, ensure that the other player is fine with you doing things to them beforehand! + "},"OOC Warning") + //VORESTATION EDIT END. return /obj/item/attack_ai(mob/user as mob) @@ -814,8 +827,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. standing.alpha = alpha standing.color = color standing.layer = layer2use - if(istype(clip_mask)) //VOREStation Edit - For taur bodies/tails clipping off parts of uniforms and suits. - standing.filters += filter(type = "alpha", icon = clip_mask) if(istype(clip_mask)) //For taur bodies/tails clipping off parts of uniforms and suits. standing.filters += filter(type = "alpha", icon = clip_mask) @@ -995,3 +1006,6 @@ Note: This proc can be overwritten to allow for different types of auto-alignmen // this gets called when the item gets chucked by the vending machine /obj/item/proc/vendor_action(var/obj/machinery/vending/V) return + +/obj/item/proc/on_holder_escape(var/obj/item/weapon/holder/H) + return diff --git a/code/game/objects/items/devices/ai_detector.dm b/code/game/objects/items/devices/ai_detector.dm index 94d3a35912..7bb92bf216 100644 --- a/code/game/objects/items/devices/ai_detector.dm +++ b/code/game/objects/items/devices/ai_detector.dm @@ -94,22 +94,22 @@ if(new_state != old_state) switch(new_state) if(PROXIMITY_OFF_CAMERANET) - to_chat(carrier, "[bicon(src)] Now outside of camera network.") + to_chat(carrier, "\icon[src][bicon(src)] Now outside of camera network.") carrier << 'sound/machines/defib_failed.ogg' if(PROXIMITY_NONE) - to_chat(carrier, "[bicon(src)] Now within camera network, AI and cameras unfocused.") + to_chat(carrier, "\icon[src][bicon(src)] Now within camera network, AI and cameras unfocused.") carrier << 'sound/machines/defib_safetyOff.ogg' if(PROXIMITY_NEAR) - to_chat(carrier, "[bicon(src)] Warning: AI focus at nearby location.") + to_chat(carrier, "\icon[src][bicon(src)] Warning: AI focus at nearby location.") carrier << 'sound/machines/defib_SafetyOn.ogg' if(PROXIMITY_ON_SCREEN) - to_chat(carrier, "[bicon(src)] Alert: AI or camera focused at current location!") + to_chat(carrier, "\icon[src][bicon(src)] Alert: AI or camera focused at current location!") carrier <<'sound/machines/defib_ready.ogg' if(PROXIMITY_TRACKING) - to_chat(carrier, "[bicon(src)] Danger: AI is actively tracking you!") + to_chat(carrier, "\icon[src][bicon(src)] Danger: AI is actively tracking you!") carrier << 'sound/machines/defib_success.ogg' if(PROXIMITY_TRACKING_FAIL) - to_chat(carrier, "[bicon(src)] Danger: AI is attempting to actively track you, but you are outside of the camera network!") + to_chat(carrier, "\icon[src][bicon(src)] Danger: AI is attempting to actively track you, but you are outside of the camera network!") carrier <<'sound/machines/defib_ready.ogg' diff --git a/code/game/objects/items/devices/communicator/UI_tgui.dm b/code/game/objects/items/devices/communicator/UI_tgui.dm index 34b0e845c2..092b45cea2 100644 --- a/code/game/objects/items/devices/communicator/UI_tgui.dm +++ b/code/game/objects/items/devices/communicator/UI_tgui.dm @@ -85,7 +85,7 @@ cam_screen.vis_contents = visible_turfs cam_background.icon_state = "clear" cam_background.fill_rect(1, 1, (video_range * 2), (video_range * 2)) - + local_skybox.cut_overlays() local_skybox.add_overlay(SSskybox.get_skybox(get_z(last_camera_turf))) local_skybox.scale_to_view(video_range * 2) @@ -381,6 +381,8 @@ exonet.send_message(their_address, "text", text) im_list += list(list("address" = exonet.address, "to_address" = their_address, "im" = text)) log_pda("(COMM: [src]) sent \"[text]\" to [exonet.get_atom_from_address(their_address)]", usr) + var/obj/item/device/communicator/comm = exonet.get_atom_from_address(their_address) + to_chat(usr, "\icon[src][bicon(src)] Sent message to [comm.owner], \"[text]\" (Reply)") for(var/mob/M in player_list) if(M.stat == DEAD && M.is_preference_enabled(/datum/client_preference/ghost_ears)) if(istype(M, /mob/new_player) || M.forbid_seeing_deadchat) diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm index 89fbdef224..8ecd9a5007 100644 --- a/code/game/objects/items/devices/communicator/communicator.dm +++ b/code/game/objects/items/devices/communicator/communicator.dm @@ -142,10 +142,10 @@ var/global/list/obj/item/device/communicator/all_communicators = list() // Description: Shows all the voice mobs inside the device, and their status. /obj/item/device/communicator/examine(mob/user) . = ..() - + for(var/mob/living/voice/voice in contents) . += "On the screen, you can see a image feed of [voice]." - + if(voice && voice.key) switch(voice.stat) if(CONSCIOUS) @@ -302,7 +302,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list() /obj/item/device/communicator/Destroy() for(var/mob/living/voice/voice in contents) voice_mobs.Remove(voice) - to_chat(voice, "[bicon(src)] Connection timed out with remote host.") + to_chat(voice, "\icon[src][bicon(src)] Connection timed out with remote host.") qdel(voice) close_connection(reason = "Connection timed out") diff --git a/code/game/objects/items/devices/communicator/messaging.dm b/code/game/objects/items/devices/communicator/messaging.dm index d7ac0e7824..5c27d8a850 100644 --- a/code/game/objects/items/devices/communicator/messaging.dm +++ b/code/game/objects/items/devices/communicator/messaging.dm @@ -34,7 +34,7 @@ if(src in comm.voice_invites) comm.open_connection(src) return - to_chat(src, "[bicon(origin_atom)] Receiving communicator request from [origin_atom]. To answer, use the Call Communicator \ + to_chat(src, "\icon[origin_atom][bicon(origin_atom)] Receiving communicator request from [origin_atom]. To answer, use the Call Communicator \ verb, and select that name to answer the call.") src << 'sound/machines/defib_SafetyOn.ogg' comm.voice_invites |= src @@ -44,7 +44,7 @@ random = random / 10 exonet.send_message(origin_address, "64 bytes received from [exonet.address] ecmp_seq=1 ttl=51 time=[random] ms") if(message == "text") - to_chat(src, "[bicon(origin_atom)] Received text message from [origin_atom]: \"[text]\"") + to_chat(src, "\icon[origin_atom][bicon(origin_atom)] Received text message from [origin_atom]: \"[text]\"") src << 'sound/machines/defib_safetyOff.ogg' exonet_messages.Add("From [origin_atom]:
[text]") return @@ -84,7 +84,7 @@ playsound(src, S, 50, 1) for (var/mob/O in hearers(2, loc)) - O.show_message(text("[bicon(src)] *[ttone]*")) + O.show_message(text("\icon[src][bicon(src)] *[ttone]*")) alert_called = 1 update_icon() @@ -95,7 +95,7 @@ L = loc if(L) - to_chat(L, "[bicon(src)] Message from [who]: \"[text]\" (Reply)") + to_chat(L, "\icon[src][bicon(src)] Message from [who]: \"[text]\" (Reply)") // This is the only Topic the communicators really uses /obj/item/device/communicator/Topic(href, href_list) @@ -108,7 +108,7 @@ exonet.send_message(comm.exonet.address, "text", message) im_list += list(list("address" = exonet.address, "to_address" = comm.exonet.address, "im" = message)) log_pda("(COMM: [src]) sent \"[message]\" to [exonet.get_atom_from_address(comm.exonet.address)]", usr) - to_chat(usr, "[bicon(src)] Sent message to [comm.owner], \"[message]\"") + to_chat(usr, "\icon[src][bicon(src)] Sent message to [comm.owner], \"[message]\" (Reply)") // Verb: text_communicator() // Parameters: None diff --git a/code/game/objects/items/devices/communicator/phone.dm b/code/game/objects/items/devices/communicator/phone.dm index e938276bdc..671598a6ef 100644 --- a/code/game/objects/items/devices/communicator/phone.dm +++ b/code/game/objects/items/devices/communicator/phone.dm @@ -39,15 +39,15 @@ comm.voice_requests.Remove(src) if(user) - comm.visible_message("[bicon(src)] Connecting to [src].") - to_chat(user, "[bicon(src)] Attempting to call [comm].") + comm.visible_message("\icon[src][bicon(src)] Connecting to [src].") + to_chat(user, "\icon[src][bicon(src)] Attempting to call [comm].") sleep(10) - to_chat(user, "[bicon(src)] Dialing internally from [station_name()], [system_name()].") + to_chat(user, "\icon[src][bicon(src)] Dialing internally from [station_name()], [system_name()].") sleep(20) //If they don't have an exonet something is very wrong and we want a runtime. - to_chat(user, "[bicon(src)] Connection re-routed to [comm] at [comm.exonet.address].") + to_chat(user, "\icon[src][bicon(src)] Connection re-routed to [comm] at [comm.exonet.address].") sleep(40) - to_chat(user, "[bicon(src)] Connection to [comm] at [comm.exonet.address] established.") - comm.visible_message("[bicon(src)] Connection to [src] at [exonet.address] established.") + to_chat(user, "\icon[src][bicon(src)] Connection to [comm] at [comm.exonet.address] established.") + comm.visible_message("\icon[src][bicon(src)] Connection to [src] at [exonet.address] established.") sleep(20) src.add_communicating(comm) @@ -86,28 +86,28 @@ //Now for some connection fluff. if(user) - to_chat(user, "[bicon(src)] Connecting to [candidate].") - to_chat(new_voice, "[bicon(src)] Attempting to call [src].") + to_chat(user, "\icon[src][bicon(src)] Connecting to [candidate].") + to_chat(new_voice, "\icon[src][bicon(src)] Attempting to call [src].") sleep(10) - to_chat(new_voice, "[bicon(src)] Dialing to [station_name()], Kara Subsystem, [system_name()].") + to_chat(new_voice, "\icon[src][bicon(src)] Dialing to [station_name()], Kara Subsystem, [system_name()].") sleep(20) - to_chat(new_voice, "[bicon(src)] Connecting to [station_name()] telecommunications array.") + to_chat(new_voice, "\icon[src][bicon(src)] Connecting to [station_name()] telecommunications array.") sleep(40) - to_chat(new_voice, "[bicon(src)] Connection to [station_name()] telecommunications array established. Redirecting signal to [src].") + to_chat(new_voice, "\icon[src][bicon(src)] Connection to [station_name()] telecommunications array established. Redirecting signal to [src].") sleep(20) //We're connected, no need to hide everything. new_voice.client.screen.Remove(blackness) qdel(blackness) - to_chat(new_voice, "[bicon(src)] Connection to [src] established.") + to_chat(new_voice, "\icon[src][bicon(src)] Connection to [src] established.") to_chat(new_voice, "To talk to the person on the other end of the call, just talk normally.") to_chat(new_voice, "If you want to end the call, use the 'Hang Up' verb. The other person can also hang up at any time.") to_chat(new_voice, "Remember, your character does not know anything you've learned from observing!") if(new_voice.mind) new_voice.mind.assigned_role = "Disembodied Voice" if(user) - to_chat(user, "[bicon(src)] Your communicator is now connected to [candidate]'s communicator.") + to_chat(user, "\icon[src][bicon(src)] Your communicator is now connected to [candidate]'s communicator.") // Proc: close_connection() // Parameters: 3 (user - the user who initiated the disconnect, target - the mob or device being disconnected, reason - string shown when disconnected) @@ -120,8 +120,8 @@ for(var/mob/living/voice/voice in voice_mobs) //Handle ghost-callers if(target && voice != target) //If no target is inputted, it deletes all of them. continue - to_chat(voice, "[bicon(src)] [reason].") - visible_message("[bicon(src)] [reason].") + to_chat(voice, "\icon[src][bicon(src)] [reason].") + visible_message("\icon[src][bicon(src)] [reason].") voice_mobs.Remove(voice) qdel(voice) update_icon() @@ -131,8 +131,8 @@ continue src.del_communicating(comm) comm.del_communicating(src) - comm.visible_message("[bicon(src)] [reason].") - visible_message("[bicon(src)] [reason].") + comm.visible_message("\icon[src][bicon(src)] [reason].") + visible_message("\icon[src][bicon(src)] [reason].") if(comm.camera && video_source == comm.camera) //We hung up on the person on video end_video() if(camera && comm.video_source == camera) //We hung up on them while they were watching us @@ -163,7 +163,7 @@ if(ringer) playsound(src, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(2, loc)) - O.show_message(text("[bicon(src)] *beep*")) + O.show_message(text("\icon[src][bicon(src)] *beep*")) alert_called = 1 update_icon() @@ -174,7 +174,7 @@ L = loc if(L) - to_chat(L, "[bicon(src)] Communications request from [who].") + to_chat(L, "\icon[src][bicon(src)] Communications request from [who].") // Proc: del_request() // Parameters: 1 (candidate - the ghost or communicator to be declined) @@ -197,13 +197,13 @@ us = loc if(us) - to_chat(us, "[bicon(src)] Declined request.") + to_chat(us, "\icon[src][bicon(src)] Declined request.") // Proc: see_emote() // Parameters: 2 (M - the mob the emote originated from, text - the emote's contents) // Description: Relays the emote to all linked communicators. /obj/item/device/communicator/see_emote(mob/living/M, text) - var/rendered = "[bicon(src)] " + var/rendered = "\icon[src][bicon(src)] " for(var/obj/item/device/communicator/comm in communicating) var/turf/T = get_turf(comm) if(!T) return @@ -250,14 +250,14 @@ var/message = combined["formatted"] var/name_used = M.GetVoice() var/rendered = null - rendered = "[bicon(src)] [name_used] [message]" + rendered = "\icon[src][bicon(src)] [name_used] [message]" mob.show_message(rendered, 2) // Proc: show_message() // Parameters: 4 (msg - the message, type - number to determine if message is visible or audible, alt - unknown, alt_type - unknown) // Description: Relays the message to all linked communicators. /obj/item/device/communicator/show_message(msg, type, alt, alt_type) - var/rendered = "[bicon(src)] " + var/rendered = "\icon[src][bicon(src)] " for(var/obj/item/device/communicator/comm in communicating) var/turf/T = get_turf(comm) if(!T) return @@ -339,15 +339,15 @@ return if(!(src in comm.communicating) || !comm.camera) //You called someone with a broken communicator or one that's fake or yourself or something - to_chat(user, "[bicon(src)]ERROR: Video failed. Either bandwidth is too low, or the other communicator is malfunctioning.") + to_chat(user, "\icon[src][bicon(src)]ERROR: Video failed. Either bandwidth is too low, or the other communicator is malfunctioning.") return - to_chat(user, "[bicon(src)] Attempting to start video over existing call.") + to_chat(user, "\icon[src][bicon(src)] Attempting to start video over existing call.") sleep(30) - to_chat(user, "[bicon(src)] Please wait...") + to_chat(user, "\icon[src][bicon(src)] Please wait...") video_source = comm.camera - comm.visible_message("[bicon(src)] New video connection from [comm].") + comm.visible_message("\icon[src][bicon(src)] New video connection from [comm].") update_active_camera_screen() GLOB.moved_event.register(video_source, src, .proc/update_active_camera_screen) update_icon() @@ -360,7 +360,7 @@ show_static() video_source = null - . = "[bicon(src)] [reason ? reason : "Video session ended"]." + . = "\icon[src][bicon(src)] [reason ? reason : "Video session ended"]." visible_message(.) update_icon() diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm index 2b7a31eb2c..d127fe9404 100644 --- a/code/game/objects/items/devices/geiger.dm +++ b/code/game/objects/items/devices/geiger.dm @@ -65,7 +65,7 @@ STOP_PROCESSING(SSobj, src) update_icon() update_sound() - to_chat(user, "[bicon(src)] You switch [scanning ? "on" : "off"] \the [src].") + to_chat(user, "\icon[src][bicon(src)] You switch [scanning ? "on" : "off"] \the [src].") /obj/item/device/geiger/update_icon() if(!scanning) diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm index e92c45e151..5d6b46c6a7 100644 --- a/code/game/objects/items/devices/hacktool.dm +++ b/code/game/objects/items/devices/hacktool.dm @@ -47,7 +47,7 @@ to_chat(user, "You are already hacking!") return 0 if(!is_type_in_list(target, supported_types)) - to_chat(user, "[bicon(src)] Unable to hack this target!") + to_chat(user, "\icon[src][bicon(src)] Unable to hack this target!") return 0 var/found = known_targets.Find(target) if(found) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 380c5f8e63..a944d8c172 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) icon_state = "pai" item_state = "electronic" w_class = ITEMSIZE_SMALL - slot_flags = SLOT_BELT + slot_flags = SLOT_BELT | SLOT_HOLSTER origin_tech = list(TECH_DATA = 2) show_messages = 0 preserve_item = 1 @@ -58,11 +58,24 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) /obj/item/device/paicard/attack_ghost(mob/user as mob) if(pai != null) //Have a person in them already? return ..() - + if(is_damage_critical()) + to_chat(usr, "That card is too damaged to activate!") + return + var/time_till_respawn = user.time_till_respawn() + if(time_till_respawn == -1) // Special case, never allowed to respawn + to_chat(usr, "Respawning is not allowed!") + else if(time_till_respawn) // Nonzero time to respawn + to_chat(usr, "You can't do that yet! You died too recently. You need to wait another [round(time_till_respawn/10/60, 0.1)] minutes.") + return if(jobban_isbanned(usr, "pAI")) to_chat(usr,"You cannot join a pAI card when you are banned from playing as a pAI.") return + for(var/ourkey in paikeys) + if(ourkey == user.ckey) + to_chat(usr, "You can't just rejoin any old pAI card!!! Your card still exists.") + return + var/choice = tgui_alert(user, "You sure you want to inhabit this PAI, or submit yourself to being recruited?", "Confirmation", list("Inhabit", "Recruit", "Cancel")) if(choice == "Cancel") return ..() @@ -81,12 +94,14 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) var/obj/item/device/paicard/typeb/card = new(location) var/mob/living/silicon/pai/new_pai = new(card) new_pai.key = user.key + paikeys |= new_pai.ckey card.setPersonality(new_pai) new_pai.SetName(actual_pai_name) else var/obj/item/device/paicard/card = new(location) var/mob/living/silicon/pai/new_pai = new(card) new_pai.key = user.key + paikeys |= new_pai.ckey card.setPersonality(new_pai) new_pai.SetName(actual_pai_name) @@ -95,6 +110,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) var/obj/item/device/paicard/typeb/card = new(location) var/mob/living/silicon/pai/new_pai = new(card) new_pai.key = user.key + paikeys |= new_pai.ckey card.setPersonality(new_pai) if(!new_pai.savefile_load(new_pai)) var/pai_name = tgui_input_text(new_pai, "Choose your character's name", "Character Name") @@ -105,6 +121,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) var/obj/item/device/paicard/card = new(location) var/mob/living/silicon/pai/new_pai = new(card) new_pai.key = user.key + paikeys |= new_pai.ckey card.setPersonality(new_pai) if(!new_pai.savefile_load(new_pai)) var/pai_name = tgui_input_text(new_pai, "Choose your character's name", "Character Name") @@ -117,7 +134,10 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) // VOREStation Edit End -/obj/item/device/paicard/attack_self(mob/user) +/obj/item/device/paicard/proc/access_screen(mob/user) + if(is_damage_critical()) + to_chat(user, "WARNING: CRITICAL HARDWARE FAILURE, SERVICE DEVICE IMMEDIATELY") + return if (!in_range(src, user)) return user.set_machine(src) @@ -222,8 +242,10 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) Personal AI Device
| Installed Personality: | -[pai.name] | +[pai.name] | +
| Integrity: [pai.health] | ||
| Prime directive: | @@ -511,6 +533,5 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) return pick(/obj/item/device/paicard ,/obj/item/device/paicard/typeb) /obj/item/device/paicard/digest_act(var/atom/movable/item_storage = null) - if(!pai.digestable) - return - . = ..() + if(pai.digestable) + return ..() diff --git a/code/game/objects/items/devices/paicard_vr.dm b/code/game/objects/items/devices/paicard_vr.dm new file mode 100644 index 0000000000..7283966d47 --- /dev/null +++ b/code/game/objects/items/devices/paicard_vr.dm @@ -0,0 +1,385 @@ +#define PP_FUNCTIONAL 0 +#define PP_BROKEN 1 +#define PP_MISSING 2 + +var/global/list/paikeys = list() + +/obj/item/device/paicard + var/panel_open = FALSE + var/cell = PP_FUNCTIONAL //critical- power + var/processor = PP_FUNCTIONAL //critical- the thinky part + var/board = PP_FUNCTIONAL //critical- makes everything work + var/capacitor = PP_FUNCTIONAL //critical- power processing + var/projector = PP_FUNCTIONAL //non-critical- affects unfolding + var/emitter = PP_FUNCTIONAL //non-critical- affects unfolding + var/speech_synthesizer = PP_FUNCTIONAL //non-critical- affects speech + +/obj/item/device/paicard/attackby(var/obj/item/I as obj, mob/user as mob) + if(istype(I,/obj/item/weapon/tool/screwdriver)) + if(panel_open) + panel_open = FALSE + user.visible_message("\The [user] secured \the [src]'s maintenance panel.") + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) + else if(pai) + if(do_after(user, 3 SECONDS)) + panel_open = TRUE + user.visible_message("\The [user] opened \the [src]'s maintenance panel.") + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) + if(istype(I,/obj/item/device/robotanalyzer)) + if(!panel_open) + to_chat(user, "The panel isn't open. You will need to unscrew it to open it.") + else + if(cell == PP_FUNCTIONAL) + to_chat(user,"Power cell: functional") + else if(cell == PP_BROKEN) + to_chat(user,"Power cell: damaged - CRITICAL") + else + to_chat(user,"Power cell: missing - CRITICAL") + + if(processor == PP_FUNCTIONAL) + to_chat(user,"Processor: functional") + else if(processor == PP_BROKEN) + to_chat(user,"Processor: damaged - CRITICAL") + else + to_chat(user,"Processor: missing - CRITICAL") + + if(board == PP_FUNCTIONAL) + to_chat(user,"Board: functional") + else if(board == PP_BROKEN) + to_chat(user,"Board: damaged - CRITICAL") + else + to_chat(user,"Board: missing - CRITICAL") + + if(capacitor == PP_FUNCTIONAL) + to_chat(user,"Capacitors: functional") + else if(capacitor == PP_BROKEN) + to_chat(user,"Capacitors: damaged - CRITICAL") + else + to_chat(user,"Capacitors: missing - CRITICAL") + + if(projector == PP_FUNCTIONAL) + to_chat(user,"Projectors: functional") + else if(projector == PP_BROKEN) + to_chat(user,"Projectors: damaged") + else + to_chat(user,"Projectors: missing") + + if(emitter == PP_FUNCTIONAL) + to_chat(user,"Emitters: functional") + else if(emitter == PP_BROKEN) + to_chat(user,"Emitters: damaged") + else + to_chat(user,"Emitters: missing") + + if(speech_synthesizer == PP_FUNCTIONAL) + to_chat(user,"Speech Synthesizer: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Speech Synthesizer: damaged") + else + to_chat(user,"Speech Synthesizer: missing") + + if(istype(I,/obj/item/device/multitool)) + if(!panel_open) + to_chat(user, "You can't do that in this state.") + else + var/list/parts = list() + if(cell != PP_MISSING) + parts |= "cell" + if(processor != PP_MISSING) + parts |= "processor" + if(board != PP_MISSING) + parts |= "board" + if(capacitor != PP_MISSING) + parts |= "capacitor" + if(projector != PP_MISSING) + parts |= "projector" + if(emitter != PP_MISSING) + parts |= "emitter" + if(speech_synthesizer != PP_MISSING) + parts |= "speech synthesizer" + + var/choice = tgui_input_list(user, "Which part would you like to check?", "Check part", parts) + switch(choice) + if("cell") + if(cell == PP_FUNCTIONAL) + to_chat(user,"Power cell: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Power cell: damaged") + else + to_chat(user,"Power cell: missing") + + if("processor") + if(processor == PP_FUNCTIONAL) + to_chat(user,"Processor: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Processor: damaged") + else + to_chat(user,"Processor: missing") + + if("board") + if(board == PP_FUNCTIONAL) + to_chat(user,"Board: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Board: damaged") + else + to_chat(user,"Board: missing") + + if("capacitor") + if(capacitor == PP_FUNCTIONAL) + to_chat(user,"Capacitors: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Capacitors: damaged") + else + to_chat(user,"Capacitors: missing") + + if("projector") + if(projector == PP_FUNCTIONAL) + to_chat(user,"Projectors: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Projectors: damaged") + else + to_chat(user,"Projectors: missing") + + if("emitter") + if(emitter == PP_FUNCTIONAL) + to_chat(user,"Emitters: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Emitters: damaged") + else + to_chat(user,"Emitters: missing") + + if("speech synthesizer") + if(speech_synthesizer == PP_FUNCTIONAL) + to_chat(user,"Speech Synthesizer: functional") + else if(speech_synthesizer == PP_BROKEN) + to_chat(user,"Speech Synthesizer: damaged") + else + to_chat(user,"Speech Synthesizer: missing") + + if(istype(I,/obj/item/paiparts/cell)) + if(cell == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + cell = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + if(istype(I,/obj/item/paiparts/processor)) + if(processor == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + processor = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + if(istype(I,/obj/item/paiparts/board)) + if(board == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + board = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + if(istype(I,/obj/item/paiparts/capacitor)) + if(capacitor == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + capacitor = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + if(istype(I,/obj/item/paiparts/projector)) + if(projector == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + projector = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + if(istype(I,/obj/item/paiparts/emitter)) + if(emitter == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + emitter = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + if(istype(I,/obj/item/paiparts/speech_synthesizer)) + if(speech_synthesizer == PP_MISSING) + if(do_after(user, 3 SECONDS)) + user.visible_message("\The [user] installs \the [I] into \the [src].","You install \the [I] into \the [src].") + speech_synthesizer = PP_FUNCTIONAL + user.drop_from_inventory(I) + qdel(I) + else + to_chat(user, "You would need to remove the installed [I] first!") + +/obj/item/device/paicard/attack_self(mob/user) + if(!panel_open) + access_screen(user) + return + var/list/parts = list() + if(cell != PP_MISSING) + parts |= "cell" + if(processor != PP_MISSING) + parts |= "processor" + if(board != PP_MISSING) + parts |= "board" + if(capacitor != PP_MISSING) + parts |= "capacitor" + if(projector != PP_MISSING) + parts |= "projector" + if(emitter != PP_MISSING) + parts |= "emitter" + if(speech_synthesizer != PP_MISSING) + parts |= "speech synthesizer" + + var/choice = tgui_input_list(user, "Which part would you like to remove?", "Remove part", parts) + if(choice) + playsound(src, 'sound/items/pickup/component.ogg', vary = TRUE) + else + return + if(!do_after(user, 3 SECONDS)) + return + switch(choice) + if("cell") + if(cell == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + cell = PP_MISSING + if("processor") + if(processor == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + processor = PP_MISSING + if("board") + board = PP_MISSING + if(board == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + + if("capacitor") + if(capacitor == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + capacitor = PP_MISSING + if("projector") + if(projector == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + projector = PP_MISSING + if("emitter") + if(emitter == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + emitter = PP_MISSING + if("speech synthesizer") + if(speech_synthesizer == PP_FUNCTIONAL) + new /obj/item/paiparts/capacitor(get_turf(user)) + else + new /obj/item/paiparts(get_turf(user)) + user.visible_message("\The [user] removes \the [choice] from \the [src].","You remove \the [choice] from \the [src].") + speech_synthesizer = PP_MISSING + +/obj/item/device/paicard/proc/death_damage() + + var/number = rand(1,4) + while(number) + number -- + switch(rand(1,4)) + if(1) + cell = PP_BROKEN + if(2) + processor = PP_BROKEN + if(3) + board = PP_BROKEN + if(4) + capacitor = PP_BROKEN + + +/obj/item/device/paicard/proc/damage_random_component(nonfatal = FALSE) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(2, 1, src) + s.start() + if(prob(80) || nonfatal) //Way more likely to be non-fatal part damage + switch(rand(1,3)) + if(1) + projector = PP_BROKEN + if(2) + emitter = PP_BROKEN + if(3) + speech_synthesizer = PP_BROKEN + else + switch(rand(1,4)) + if(1) + cell = PP_BROKEN + if(2) + processor = PP_BROKEN + if(3) + board = PP_BROKEN + if(4) + capacitor = PP_BROKEN + +/obj/item/device/paicard/proc/is_damage_critical() + if(cell != PP_FUNCTIONAL || processor != PP_FUNCTIONAL || board != PP_FUNCTIONAL || capacitor != PP_FUNCTIONAL) + return TRUE + return FALSE + +/obj/item/paiparts + name = "broken pAI component" + desc = "It's broken scrap from a pAI card!" + icon = 'icons/obj/paicard.dmi' + icon_state = "broken" + pickup_sound = 'sound/items/pickup/card.ogg' + drop_sound = 'sound/items/drop/card.ogg' +/obj/item/paiparts/Initialize() + . = ..() + pixel_x = rand(-10,10) + pixel_y = rand(-10,10) + +/obj/item/paiparts/cell + name = "pAI power cell" + desc = "It's very small and efficient! It powers the pAI!" + icon_state = "cell" +/obj/item/paiparts/processor + name = "pAI processor" + desc = "It's the brain of your computer friend!" + icon_state = "processor" +/obj/item/paiparts/board + name = "pAI board" + desc = "It's the thing all the other parts get attatched to!" + icon_state = "board" +/obj/item/paiparts/capacitor + name = "pAI capacitor" + desc = "It helps regulate power flow!" + icon_state = "capacitor" +/obj/item/paiparts/projector + name = "pAI projector" + desc = "It projects the pAI's form!" + icon_state = "projector" +/obj/item/paiparts/emitter + name = "pAI emitter" + desc = "It emits the fields to help the pAI get around!" + icon_state = "emitter" +/obj/item/paiparts/speech_synthesizer + name = "pAI speech synthesizer" + desc = "It's a little voice box!" + icon_state = "speech_synthesizer" diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index b7304fa8a1..e8ba830cae 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -491,7 +491,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer) var/list/jamming = is_jammed(src) if(jamming) var/distance = jamming["distance"] - to_chat(M, "[bicon(src)] You hear the [distance <= 2 ? "loud hiss" : "soft hiss"] of static.") + to_chat(M, "\icon[src][bicon(src)] You hear the [distance <= 2 ? "loud hiss" : "soft hiss"] of static.") return FALSE // First, we want to generate a new radio signal diff --git a/code/game/objects/items/devices/radio/radio_ch.dm b/code/game/objects/items/devices/radio/radio_ch.dm index aa4759823f..08b3b624f9 100644 --- a/code/game/objects/items/devices/radio/radio_ch.dm +++ b/code/game/objects/items/devices/radio/radio_ch.dm @@ -49,4 +49,27 @@ if(!broadcast_tiles) update_broadcast_tiles() return broadcast_tiles -#undef CANBROADCAST_INNERBOX + +//*Subspace Radio*// +/obj/item/device/radio/subspace + adhoc_fallback = 1 + canhear_range = 8 + desc = "A heavy duty radio that can pick up all manor of shortwave and subspace frequencies. It's a bit bulkier than a normal radio thanks to the extra hardware." + description_info = "This radio can broadcast over any headset frequency that the user has access to. It has a shortwave fallback to directly broadcast to all radio equipment on the same Z-Level/Map in the event of a telecommunications failure. This device requires a functioning Telecommunications Network/Relay to send and receive signals meant for headsets. Additionally, the volume knob seems to be stuck on the max setting. You could hear this thing clear across a room... Not good for discretely listening in on secure channels or being stealthy!" + icon_state = "radio" + name = "subspace radio" + subspace_transmission = 1 + throwforce = 5 + throw_range = 7 + throw_speed = 1 + +//* Bluespace Radio *// +/obj/item/device/bluespaceradio/southerncross_prelinked + name = "bluespace radio (southerncross)" + handset = /obj/item/device/radio/bluespacehandset/linked/southerncross_prelinked + +/obj/item/device/radio/bluespacehandset/linked/southerncross_prelinked + bs_tx_preload_id = "Receiver A" //Transmit to a receiver + bs_rx_preload_id = "Broadcaster A" //Recveive from a transmitter + +#undef CANBROADCAST_INNERBOX \ No newline at end of file diff --git a/code/game/objects/items/devices/scanners/gas.dm b/code/game/objects/items/devices/scanners/gas.dm index ca35911448..9fbc319d6d 100644 --- a/code/game/objects/items/devices/scanners/gas.dm +++ b/code/game/objects/items/devices/scanners/gas.dm @@ -23,7 +23,7 @@ /obj/item/device/analyzer/attack_self(mob/user as mob) if (user.stat) return - if (!(ishuman(user) || ticker) && ticker.mode.name != "monkey") + if (!user.IsAdvancedToolUser()) to_chat(usr, "You don't have the dexterity to do this!") return diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm index ae2683ede0..ba1c960d9d 100644 --- a/code/game/objects/items/devices/scanners/health.dm +++ b/code/game/objects/items/devices/scanners/health.dm @@ -41,7 +41,7 @@ dat += "Body Temperature: ???" user.show_message("[dat]", 1) return - if (!(ishuman(user) || ticker) && ticker.mode.name != "monkey") + if (!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") return diff --git a/code/game/objects/items/devices/scanners/mass_spectrometer.dm b/code/game/objects/items/devices/scanners/mass_spectrometer.dm index fee41eb880..5c044fc535 100644 --- a/code/game/objects/items/devices/scanners/mass_spectrometer.dm +++ b/code/game/objects/items/devices/scanners/mass_spectrometer.dm @@ -30,7 +30,7 @@ /obj/item/device/mass_spectrometer/attack_self(mob/user as mob) if (user.stat) return - if (!(ishuman(user) || ticker) && ticker.mode.name != "monkey") + if (!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") return if(reagents.total_volume) diff --git a/code/game/objects/items/devices/text_to_speech.dm b/code/game/objects/items/devices/text_to_speech.dm index 330ca97d73..c97693ed5f 100644 --- a/code/game/objects/items/devices/text_to_speech.dm +++ b/code/game/objects/items/devices/text_to_speech.dm @@ -24,7 +24,7 @@ var/message = sanitize(tgui_input_text(user,"Choose a message to relay to those around you.")) if(message) - audible_message("[bicon(src)] \The [src.name] states, \"[message]\"", runemessage = "synthesized speech") + audible_message("\icon[src][bicon(src)] \The [src.name] states, \"[message]\"", runemessage = "synthesized speech") if(ismob(loc)) loc.audible_message("", runemessage = "\[TTS Voice\] [message]") diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm index 78f5a381c7..849a649894 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -48,7 +48,7 @@ add_fingerprint(user) user.set_machine(src) show_ui(user) - + /obj/item/device/tvcamera/proc/show_ui(mob/user) var/dat = list() dat += "Channel name is: [channel ? channel : "unidentified broadcast"]