cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds a message when trying to move while buckled

Browse Source
This commit is contained in:
kingofkosmos
2017-09-07 18:11:41 +03:00
committed by CitadelStationBot
parent 73aaf8a90b
commit dd27a1850a
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/hud/alert.dm
View File

@@ -633,6 +633,7 @@ so as to remain in compliance with the most up-to-date laws."
/obj/screen/alert/restrained/buckled /obj/screen/alert/restrained/buckled
name = "Buckled" name = "Buckled"
desc = "You've been buckled to something. Click the alert to unbuckle unless you're handcuffed." desc = "You've been buckled to something. Click the alert to unbuckle unless you're handcuffed."
icon_state = "buckled"
/obj/screen/alert/restrained/handcuffed /obj/screen/alert/restrained/handcuffed
name = "Handcuffed" name = "Handcuffed"
@@ -698,4 +699,3 @@ so as to remain in compliance with the most up-to-date laws."
severity = 0 severity = 0
master = null master = null
screen_loc = "" screen_loc = ""

6
code/game/atoms.dm
View File

@@ -29,6 +29,7 @@
var/list/priority_overlays //overlays that should remain on top and not normally removed when using cut_overlay functions, like c4. var/list/priority_overlays //overlays that should remain on top and not normally removed when using cut_overlay functions, like c4.
var/datum/proximity_monitor/proximity_monitor var/datum/proximity_monitor/proximity_monitor
var/buckle_message_cooldown = 0
/atom/New(loc, ...) /atom/New(loc, ...)
//atom creation method that preloads variables at creation //atom creation method that preloads variables at creation
@@ -291,7 +292,10 @@
else else
to_chat(user, "Nothing.") to_chat(user, "Nothing.")
/atom/proc/relaymove() /atom/proc/relaymove(mob/user)
if(buckle_message_cooldown <= world.time)
buckle_message_cooldown = world.time + 50
to_chat(user, "<span class='warning'>You can't move while buckled to [src]!</span>")
return return
/atom/proc/contents_explosion(severity, target) /atom/proc/contents_explosion(severity, target)

4
code/game/objects/buckling.dm
View File

@@ -62,7 +62,7 @@
M.setDir(dir) M.setDir(dir)
buckled_mobs |= M buckled_mobs |= M
M.update_canmove() M.update_canmove()
M.throw_alert("buckled", /obj/screen/alert/restrained/buckled, new_master = src) M.throw_alert("buckled", /obj/screen/alert/restrained/buckled)
post_buckle_mob(M) post_buckle_mob(M)
return TRUE return TRUE
@@ -131,5 +131,3 @@
"<span class='italics'>You hear metal clanking.</span>") "<span class='italics'>You hear metal clanking.</span>")
add_fingerprint(user) add_fingerprint(user)
return M return M