diff --git a/code/game/gamemodes/clock_cult/clock_items.dm b/code/game/gamemodes/clock_cult/clock_items.dm
index a4d2bd5c0f3..d90421efac0 100644
--- a/code/game/gamemodes/clock_cult/clock_items.dm
+++ b/code/game/gamemodes/clock_cult/clock_items.dm
@@ -363,7 +363,7 @@
if(!message || !user || !user.canUseTopic(src))
return 0
user.whisper("Freinagf, urne zl jbeqf. [message]")
- send_hierophant_message(user, message)
+ titled_hierophant_message(user, message)
return 1
/obj/item/clothing/glasses/wraith_spectacles //Wraith spectacles: Grants night and x-ray vision at the slow cost of the wearer's sight. Nar-Sian cultists are instantly blinded.
diff --git a/code/game/gamemodes/clock_cult/clock_machines.dm b/code/game/gamemodes/clock_cult/clock_machines.dm
index 8db2ed225b2..7dd3801683f 100644
--- a/code/game/gamemodes/clock_cult/clock_machines.dm
+++ b/code/game/gamemodes/clock_cult/clock_machines.dm
@@ -579,7 +579,7 @@
user << "The obelisk lacks the power to broadcast!"
return
clockwork_say(user, "Uvrebcunag Oebnqpnfg, npgvingr!")
- send_hierophant_message(user, input, "big_brass", "large_brass")
+ titled_hierophant_message(user, input, "big_brass", "large_brass")
if("Spatial Gateway")
if(gateway_active)
user << "The obelisk is already sustaining a gateway!"
diff --git a/code/game/gamemodes/clock_cult/clock_unsorted.dm b/code/game/gamemodes/clock_cult/clock_unsorted.dm
index 9a95daec151..2eb25ec3765 100644
--- a/code/game/gamemodes/clock_cult/clock_unsorted.dm
+++ b/code/game/gamemodes/clock_cult/clock_unsorted.dm
@@ -1,17 +1,13 @@
//sends messages via hierophant
-/proc/send_hierophant_message(mob/user, message, name_span = "heavy_brass", message_span = "brass", user_title = "Servant")
+/proc/titled_hierophant_message(mob/user, message, name_span = "heavy_brass", message_span = "brass", user_title = "Servant")
if(!user || !message || !ticker || !ticker.mode)
return 0
- var/parsed_message = "[user_title ? "[user_title] ":""][findtextEx(user.name, user.real_name) ? user.name : "[user.real_name] (as [user.name])"]: \"[message]\""
- for(var/M in mob_list)
- if(isobserver(M))
- var/link = FOLLOW_LINK(M, user)
- M << "[link] [parsed_message]"
- else if(is_servant_of_ratvar(M))
- M << parsed_message
+ var/parsed_message = "[user_title ? "[user_title] ":""][findtextEx(user.name, user.real_name) ? user.name : "[user.real_name] (as [user.name])"]: \
+ \"[message]\""
+ hierophant_message(parsed_message, FALSE, user)
return 1
-/proc/generic_hierophant_message(message, servantsonly, atom/target) //sends a generic message to all servants and optionally observers
+/proc/hierophant_message(message, servantsonly, atom/target) //sends a generic message to all servants and optionally observers
if(!message || !ticker || !ticker.mode)
return 0
for(var/M in mob_list)
@@ -21,7 +17,7 @@
M << "[link] [message]"
else
M << message
- if(is_servant_of_ratvar(M))
+ else if(is_servant_of_ratvar(M))
M << message
//Function Call action: Calls forth a Ratvarian spear.
@@ -128,7 +124,7 @@
var/list/states = get_scripture_states()
for(var/i in states)
if(states[i] != previous_states[i])
- generic_hierophant_message("[i] Scripture has been [states[i] ? "un":""]locked.")
+ hierophant_message("Hierophant Network: [i] Scripture has been [states[i] ? "un":""]locked.")
/proc/get_scripture_states() //returns the current unlock states of each unlockable scripture tier
. = list("Script" = scripture_unlock_check(SCRIPTURE_SCRIPT), \
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index e064c9fb223..5658b335c88 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -130,6 +130,11 @@
change_construction_value(-1)
return ..()
+/turf/open/floor/clockwork/ChangeTurf(path, defer_change = FALSE)
+ if(path != type)
+ change_construction_value(-1)
+ return ..()
+
/turf/open/floor/clockwork/Entered(atom/movable/AM)
..()
START_PROCESSING(SSobj, src)
@@ -160,9 +165,11 @@
/turf/open/floor/clockwork/attackby(obj/item/I, mob/living/user, params)
if(istype(I, /obj/item/weapon/crowbar))
user.visible_message("[user] begins slowly prying up [src]...", "You begin painstakingly prying up [src]...")
+ playsound(src, 'sound/items/Crowbar.ogg', 20, 1)
if(!do_after(user, 70 / I.toolspeed, target = src))
return 0
user.visible_message("[user] pries up [src]!", "You pry up [src], destroying it!")
+ playsound(src, 'sound/items/Crowbar.ogg', 80, 1)
make_plating()
return 1
return ..()
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index bd50729b08a..ded0bf46834 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -59,11 +59,17 @@
change_construction_value(-5)
return ..()
+/turf/closed/wall/clockwork/ChangeTurf(path, defer_change = FALSE)
+ if(path != type)
+ change_construction_value(-5)
+ return ..()
+
/turf/closed/wall/clockwork/attackby(obj/item/I, mob/living/user, params)
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = I
- if(!WT.isOn())
+ if(!WT.remove_fuel(0,user))
return 0
+ playsound(src, 'sound/items/Welder.ogg', 100, 1)
user.visible_message("[user] begins slowly breaking down [src]...", "You begin painstakingly destroying [src]...")
if(!do_after(user, 120 / WT.toolspeed, target = src))
return 0
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
index 8a5478dedcb..dee327d9de4 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
@@ -138,4 +138,4 @@
return //we don't get hacked or give a shit about it
/mob/living/simple_animal/drone/cogscarab/drone_chat(msg)
- send_hierophant_message(src, msg, "heavy_alloy") //HIEROPHANT DRONES
+ titled_hierophant_message(src, msg, "heavy_alloy") //HIEROPHANT DRONES