mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
[SEMI-MODULAR] Gunpointing! Similar to bay-aiming (#800)
* Gunpoint! * Spans * linter moment * wah * weh
This commit is contained in:
@@ -428,6 +428,13 @@
|
||||
"<a href='?src=[REF(src)];hud=s;add_comment=1'>\[Add comment\]</a>"), "")
|
||||
else if(isobserver(user))
|
||||
. += "<span class='info'><b>Traits:</b> [get_quirk_string(FALSE, CAT_QUIRK_ALL)]</span>"
|
||||
//SKYRAT EDIT ADDITION BEGIN - GUNPOINT
|
||||
if(gunpointing)
|
||||
. += "<span class='warning'><b>[t_He] [t_is] holding [gunpointing.target.name] at gunpoint with [gunpointing.aimed_gun.name]!</b></span>\n"
|
||||
if(length(gunpointed))
|
||||
for(var/datum/gunpoint/GP in gunpointed)
|
||||
. += "<span class='warning'><b>[GP.source.name] [GP.source.p_are()] holding [t_him] at gunpoint with [GP.aimed_gun.name]!</b></span>\n"
|
||||
//SKYRAT EDIT ADDITION END
|
||||
|
||||
//SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION
|
||||
for(var/genital in list("penis", "testicles", "vagina", "breasts"))
|
||||
|
||||
@@ -116,6 +116,22 @@
|
||||
if(!(world.time % 5))
|
||||
to_chat(src, "<span class='warning'>[L] is restraining [P], you cannot push past.</span>")
|
||||
return TRUE
|
||||
//SKYRAT EDIT ADDITION BEGIN - GUNPOINT
|
||||
if(L.gunpointed.len)
|
||||
var/is_pointing = FALSE
|
||||
for(var/datum/gunpoint/gp in L.gunpointed)
|
||||
if(gp.source == src)
|
||||
is_pointing = TRUE
|
||||
break
|
||||
if(!is_pointing)
|
||||
if(!(world.time % 5))
|
||||
to_chat(src, "<span class='warning'>[L] is being held at gunpoint, it's not wise to push him.</span>")
|
||||
return TRUE
|
||||
if(L.gunpointing)
|
||||
if(!(world.time % 5))
|
||||
to_chat(src, "<span class='warning'>[L] is holding someone at gunpoint, you cannot push past.</span>")
|
||||
return TRUE
|
||||
//SKYRAT EDIT ADDITION END
|
||||
|
||||
if(moving_diagonally)//no mob swap during diagonal moves.
|
||||
return TRUE
|
||||
@@ -1282,6 +1298,7 @@
|
||||
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/limbless, multiplicative_slowdown = limbless_slowdown)
|
||||
else
|
||||
remove_movespeed_modifier(/datum/movespeed_modifier/limbless)
|
||||
SEND_SIGNAL(src, COMSIG_LIVING_UPDATED_MOBILITY, mobility_flags) //SKYRAT EDIT ADDITION - GUNPOINT
|
||||
|
||||
|
||||
///Called when mob changes from a standing position into a prone while lacking the ability to stand up at the moment, through update_mobility()
|
||||
|
||||
@@ -449,6 +449,11 @@
|
||||
if(m_intent == MOVE_INTENT_RUN)
|
||||
m_intent = MOVE_INTENT_WALK
|
||||
else
|
||||
//SKYRAT EDIT ADDITION BEGIN - GUNPOINT
|
||||
if (HAS_TRAIT(src,TRAIT_NORUNNING))
|
||||
to_chat(src, "You find yourself unable to run.")
|
||||
return FALSE
|
||||
//SKYRAT EDIT ADDITION END
|
||||
m_intent = MOVE_INTENT_RUN
|
||||
if(hud_used && hud_used.static_inventory)
|
||||
for(var/obj/screen/mov_intent/selector in hud_used.static_inventory)
|
||||
|
||||
Reference in New Issue
Block a user