mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
The game actually clicks when it claims to. (#4403)
* Update paiwire.dm * Update life.dm * Update traps.dm * Update safe.dm * Update alarm.dm * Update safe.dm * Update implant.dm * Update life.dm * Update traps.dm * Update life.dm * Update safe.dm * Audible message test
This commit is contained in:
@@ -180,15 +180,17 @@
|
|||||||
if(!get_danger_level(target_temperature, TLV["temperature"]) && abs(environment.temperature - target_temperature) > 2.0)
|
if(!get_danger_level(target_temperature, TLV["temperature"]) && abs(environment.temperature - target_temperature) > 2.0)
|
||||||
update_use_power(2)
|
update_use_power(2)
|
||||||
regulating_temperature = 1
|
regulating_temperature = 1
|
||||||
visible_message("\The [src] clicks as it starts [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
|
audible_message("\The [src] clicks as it starts [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
|
||||||
"You hear a click and a faint electronic hum.")
|
"You hear a click and a faint electronic hum.")
|
||||||
|
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
|
||||||
else
|
else
|
||||||
//check for when we should stop adjusting temperature
|
//check for when we should stop adjusting temperature
|
||||||
if(get_danger_level(target_temperature, TLV["temperature"]) || abs(environment.temperature - target_temperature) <= 0.5)
|
if(get_danger_level(target_temperature, TLV["temperature"]) || abs(environment.temperature - target_temperature) <= 0.5)
|
||||||
update_use_power(1)
|
update_use_power(1)
|
||||||
regulating_temperature = 0
|
regulating_temperature = 0
|
||||||
visible_message("\The [src] clicks quietly as it stops [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
|
audible_message("\The [src] clicks quietly as it stops [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
|
||||||
"You hear a click as a faint electronic humming stops.")
|
"You hear a click as a faint electronic humming stops.")
|
||||||
|
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
|
||||||
|
|
||||||
if(regulating_temperature)
|
if(regulating_temperature)
|
||||||
if(target_temperature > T0C + MAX_TEMPERATURE)
|
if(target_temperature > T0C + MAX_TEMPERATURE)
|
||||||
|
|||||||
@@ -351,6 +351,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
|
|||||||
R << "You hear a faint *beep*."
|
R << "You hear a faint *beep*."
|
||||||
if(!src.reagents.total_volume)
|
if(!src.reagents.total_volume)
|
||||||
R << "You hear a faint click from your chest."
|
R << "You hear a faint click from your chest."
|
||||||
|
playsound(R, 'sound/weapons/empty.ogg', 10, 1)
|
||||||
spawn(0)
|
spawn(0)
|
||||||
qdel(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
/obj/item/weapon/pai_cable/proc/plugin(obj/machinery/M as obj, mob/user as mob)
|
/obj/item/weapon/pai_cable/proc/plugin(obj/machinery/M as obj, mob/user as mob)
|
||||||
if(istype(M, /obj/machinery/door) || istype(M, /obj/machinery/camera))
|
if(istype(M, /obj/machinery/door) || istype(M, /obj/machinery/camera))
|
||||||
user.visible_message("[user] inserts [src] into a data port on [M].", "You insert [src] into a data port on [M].", "You hear the satisfying click of a wire jack fastening into place.")
|
user.visible_message("[user] inserts [src] into a data port on [M].", "You insert [src] into a data port on [M].", "You hear the satisfying click of a wire jack fastening into place.")
|
||||||
|
playsound(user, 'sound/machines/click.ogg', 50, 1)
|
||||||
user.drop_item()
|
user.drop_item()
|
||||||
src.loc = M
|
src.loc = M
|
||||||
src.machine = M
|
src.machine = M
|
||||||
else
|
else
|
||||||
user.visible_message("[user] dumbly fumbles to find a place on [M] to plug in [src].", "There aren't any ports on [M] that match the jack belonging to [src].")
|
user.visible_message("[user] fumbles to find a place on [M] to plug in [src].", "There aren't any ports on [M] that match the jack belonging to [src].")
|
||||||
|
|
||||||
/obj/item/weapon/pai_cable/attack(obj/machinery/M as obj, mob/user as mob)
|
/obj/item/weapon/pai_cable/attack(obj/machinery/M as obj, mob/user as mob)
|
||||||
src.plugin(M, user)
|
src.plugin(M, user)
|
||||||
|
|||||||
@@ -34,6 +34,7 @@
|
|||||||
"<span class='danger'>You have deployed \the [src]!</span>",
|
"<span class='danger'>You have deployed \the [src]!</span>",
|
||||||
"You hear a latch click loudly."
|
"You hear a latch click loudly."
|
||||||
)
|
)
|
||||||
|
playsound(src.loc, 'sound/machines/click.ogg',70, 1)
|
||||||
|
|
||||||
deployed = 1
|
deployed = 1
|
||||||
user.drop_from_inventory(src)
|
user.drop_from_inventory(src)
|
||||||
@@ -56,6 +57,8 @@
|
|||||||
"<span class='notice'>You begin disarming \the [src]!</span>",
|
"<span class='notice'>You begin disarming \the [src]!</span>",
|
||||||
"You hear a latch click followed by the slow creaking of a spring."
|
"You hear a latch click followed by the slow creaking of a spring."
|
||||||
)
|
)
|
||||||
|
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
|
||||||
|
|
||||||
if(do_after(user, 60))
|
if(do_after(user, 60))
|
||||||
user.visible_message(
|
user.visible_message(
|
||||||
"<span class='danger'>[user] has disarmed \the [src].</span>",
|
"<span class='danger'>[user] has disarmed \the [src].</span>",
|
||||||
|
|||||||
@@ -42,9 +42,9 @@ FLOOR SAFES
|
|||||||
/obj/structure/safe/proc/check_unlocked(mob/user as mob, canhear)
|
/obj/structure/safe/proc/check_unlocked(mob/user as mob, canhear)
|
||||||
if(user && canhear)
|
if(user && canhear)
|
||||||
if(tumbler_1_pos == tumbler_1_open)
|
if(tumbler_1_pos == tumbler_1_open)
|
||||||
user << "<span class='notice'>You hear a [pick("tonk", "krunk", "plunk")] from [src].</span>"
|
to_chat(user, "<span class='notice'>You hear a [pick("tonk", "krunk", "plunk")] from \the [src].</span>")
|
||||||
if(tumbler_2_pos == tumbler_2_open)
|
if(tumbler_2_pos == tumbler_2_open)
|
||||||
user << "<span class='notice'>You hear a [pick("tink", "krink", "plink")] from [src].</span>"
|
to_chat(user, "<span class='notice'>You hear a [pick("tink", "krink", "plink")] from \the [src].</span>")
|
||||||
if(tumbler_1_pos == tumbler_1_open && tumbler_2_pos == tumbler_2_open)
|
if(tumbler_1_pos == tumbler_1_open && tumbler_2_pos == tumbler_2_open)
|
||||||
if(user) visible_message("<b>[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!</b>")
|
if(user) visible_message("<b>[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!</b>")
|
||||||
return 1
|
return 1
|
||||||
@@ -95,13 +95,13 @@ FLOOR SAFES
|
|||||||
|
|
||||||
if(href_list["open"])
|
if(href_list["open"])
|
||||||
if(check_unlocked())
|
if(check_unlocked())
|
||||||
user << "<span class='notice'>You [open ? "close" : "open"] [src].</span>"
|
to_chat(user, "<span class='notice'>You [open ? "close" : "open"] [src].</span>")
|
||||||
open = !open
|
open = !open
|
||||||
update_icon()
|
update_icon()
|
||||||
updateUsrDialog()
|
updateUsrDialog()
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
user << "<span class='notice'>You can't [open ? "close" : "open"] [src], the lock is engaged!</span>"
|
to_chat(user, "<span class='notice'>You can't [open ? "close" : "open"] [src], the lock is engaged!</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
if(href_list["decrement"])
|
if(href_list["decrement"])
|
||||||
@@ -109,12 +109,14 @@ FLOOR SAFES
|
|||||||
if(dial == tumbler_1_pos + 1 || dial == tumbler_1_pos - 71)
|
if(dial == tumbler_1_pos + 1 || dial == tumbler_1_pos - 71)
|
||||||
tumbler_1_pos = decrement(tumbler_1_pos)
|
tumbler_1_pos = decrement(tumbler_1_pos)
|
||||||
if(canhear)
|
if(canhear)
|
||||||
user << "<span class='notice'>You hear a [pick("clack", "scrape", "clank")] from [src].</span>"
|
to_chat(user, "<span class='notice'>You hear a [pick("clack", "scrape", "clank")] from \the [src].</span>")
|
||||||
if(tumbler_1_pos == tumbler_2_pos + 37 || tumbler_1_pos == tumbler_2_pos - 35)
|
if(tumbler_1_pos == tumbler_2_pos + 37 || tumbler_1_pos == tumbler_2_pos - 35)
|
||||||
tumbler_2_pos = decrement(tumbler_2_pos)
|
tumbler_2_pos = decrement(tumbler_2_pos)
|
||||||
if(canhear)
|
if(canhear)
|
||||||
user << "<span class='notice'>You hear a [pick("click", "chink", "clink")] from [src].</span>"
|
to_chat(user, "<span class='notice'>You hear a [pick("click", "chink", "clink")] from \the [src].</span>")
|
||||||
|
playsound(user, 'sound/machines/click.ogg', 20, 1)
|
||||||
check_unlocked(user, canhear)
|
check_unlocked(user, canhear)
|
||||||
|
|
||||||
updateUsrDialog()
|
updateUsrDialog()
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -123,11 +125,12 @@ FLOOR SAFES
|
|||||||
if(dial == tumbler_1_pos - 1 || dial == tumbler_1_pos + 71)
|
if(dial == tumbler_1_pos - 1 || dial == tumbler_1_pos + 71)
|
||||||
tumbler_1_pos = increment(tumbler_1_pos)
|
tumbler_1_pos = increment(tumbler_1_pos)
|
||||||
if(canhear)
|
if(canhear)
|
||||||
user << "<span class='notice'>You hear a [pick("clack", "scrape", "clank")] from [src].</span>"
|
to_chat(user, "<span class='notice'>You hear a [pick("clack", "scrape", "clank")] from \the [src].</span>")
|
||||||
if(tumbler_1_pos == tumbler_2_pos - 37 || tumbler_1_pos == tumbler_2_pos + 35)
|
if(tumbler_1_pos == tumbler_2_pos - 37 || tumbler_1_pos == tumbler_2_pos + 35)
|
||||||
tumbler_2_pos = increment(tumbler_2_pos)
|
tumbler_2_pos = increment(tumbler_2_pos)
|
||||||
if(canhear)
|
if(canhear)
|
||||||
user << "<span class='notice'>You hear a [pick("click", "chink", "clink")] from [src].</span>"
|
to_chat(user, "<span class='notice'>You hear a [pick("click", "chink", "clink")] from \the [src].</span>")
|
||||||
|
playsound(user, 'sound/machines/click.ogg', 20, 1)
|
||||||
check_unlocked(user, canhear)
|
check_unlocked(user, canhear)
|
||||||
updateUsrDialog()
|
updateUsrDialog()
|
||||||
return
|
return
|
||||||
@@ -148,15 +151,15 @@ FLOOR SAFES
|
|||||||
space += I.w_class
|
space += I.w_class
|
||||||
user.drop_item()
|
user.drop_item()
|
||||||
I.loc = src
|
I.loc = src
|
||||||
user << "<span class='notice'>You put [I] in [src].</span>"
|
to_chat(user, "<span class='notice'>You put [I] in \the [src].</span>")
|
||||||
updateUsrDialog()
|
updateUsrDialog()
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
user << "<span class='notice'>[I] won't fit in [src].</span>"
|
to_chat(user, "<span class='notice'>[I] won't fit in \the [src].</span>")
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
if(istype(I, /obj/item/clothing/accessory/stethoscope))
|
if(istype(I, /obj/item/clothing/accessory/stethoscope))
|
||||||
user << "Hold [I] in one of your hands while you manipulate the dial."
|
to_chat(user, "Hold [I] in one of your hands while you manipulate the dial.")
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,8 @@
|
|||||||
var/turf/T = get_turf_or_move(src.loc)
|
var/turf/T = get_turf_or_move(src.loc)
|
||||||
for (var/mob/M in viewers(T))
|
for (var/mob/M in viewers(T))
|
||||||
M.show_message("<font color='red'>The data cable rapidly retracts back into its spool.</font>", 3, "<font color='red'>You hear a click and the sound of wire spooling rapidly.</font>", 2)
|
M.show_message("<font color='red'>The data cable rapidly retracts back into its spool.</font>", 3, "<font color='red'>You hear a click and the sound of wire spooling rapidly.</font>", 2)
|
||||||
|
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
|
||||||
|
|
||||||
qdel(src.cable)
|
qdel(src.cable)
|
||||||
src.cable = null
|
src.cable = null
|
||||||
|
|
||||||
@@ -29,6 +31,7 @@
|
|||||||
if(health <= 0)
|
if(health <= 0)
|
||||||
death(null,"gives one shrill beep before falling lifeless.")
|
death(null,"gives one shrill beep before falling lifeless.")
|
||||||
|
|
||||||
|
|
||||||
/mob/living/silicon/pai/updatehealth()
|
/mob/living/silicon/pai/updatehealth()
|
||||||
if(status_flags & GODMODE)
|
if(status_flags & GODMODE)
|
||||||
health = 100
|
health = 100
|
||||||
|
|||||||
Reference in New Issue
Block a user