mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 07:08:00 +01:00
Adds a surrender button for when you are being held at gunpoint (#56393)
add: Adds a surrender button that pops up when you are at gunpoint that can be pressed to do the *surrender emote
This commit is contained in:
@@ -110,6 +110,8 @@
|
||||
#define STATUS_EFFECT_HOLDUP /datum/status_effect/holdup // you are currently pointing a gun at someone
|
||||
|
||||
#define STATUS_EFFECT_HIGHFIVE /datum/status_effect/high_fiving // you are angling for a high five
|
||||
|
||||
#define STATUS_EFFECT_SURRENDER /datum/status_effect/surrender // gives an alert to quickly surrender
|
||||
/////////////
|
||||
// SLIME //
|
||||
/////////////
|
||||
|
||||
@@ -123,6 +123,14 @@
|
||||
desc = "Making any sudden moves would probably be a bad idea!"
|
||||
icon_state = "aimed"
|
||||
|
||||
/datum/status_effect/heldup/on_apply()
|
||||
owner.apply_status_effect(STATUS_EFFECT_SURRENDER)
|
||||
return ..()
|
||||
|
||||
/datum/status_effect/heldup/on_remove()
|
||||
owner.remove_status_effect(STATUS_EFFECT_SURRENDER)
|
||||
return ..()
|
||||
|
||||
// holdup is for the person aiming
|
||||
/datum/status_effect/holdup
|
||||
id = "holdup"
|
||||
@@ -293,6 +301,23 @@
|
||||
/datum/status_effect/high_fiving/proc/dropped_slap(obj/item/source)
|
||||
slap_item = null
|
||||
|
||||
//this effect gives the user an alert they can use to surrender quickly
|
||||
/datum/status_effect/surrender
|
||||
id = "surrender"
|
||||
duration = -1
|
||||
tick_interval = -1
|
||||
status_type = STATUS_EFFECT_UNIQUE
|
||||
alert_type = /atom/movable/screen/alert/status_effect/surrender
|
||||
|
||||
/atom/movable/screen/alert/status_effect/surrender
|
||||
name = "Surrender"
|
||||
desc = "Looks like you're in trouble now, bud. Click here to surrender. (Warning: You will be incapacitated.)"
|
||||
icon_state = "surrender"
|
||||
|
||||
/atom/movable/screen/alert/status_effect/surrender/Click(location, control, params)
|
||||
. = ..()
|
||||
owner.emote("surrender")
|
||||
|
||||
/*
|
||||
* A status effect used for preventing caltrop message spam
|
||||
*
|
||||
|
||||
@@ -360,6 +360,7 @@
|
||||
if(. && isliving(user))
|
||||
var/mob/living/L = user
|
||||
L.Paralyze(200)
|
||||
L.remove_status_effect(STATUS_EFFECT_SURRENDER)
|
||||
|
||||
/datum/emote/living/sway
|
||||
key = "sway"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 107 KiB After Width: | Height: | Size: 107 KiB |
Reference in New Issue
Block a user