mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-20 19:49:39 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
///status effect applied to us when we're wildly swinging
|
||||
/datum/status_effect/dagger_swinging
|
||||
id = "dagger swinging"
|
||||
tick_interval = 0.25 SECONDS
|
||||
duration = 1.75 SECONDS
|
||||
tick_interval = 0.2 SECONDS
|
||||
duration = 1.6 SECONDS
|
||||
alert_type = null
|
||||
///base damage we apply to mobs near us
|
||||
var/base_damage = 5
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
if(AI.controlled_equipment)
|
||||
to_chat(AI, span_warning("You are already loaded into an onboard computer!"))
|
||||
return
|
||||
if(!GLOB.cameranet.checkCameraVis(owner))
|
||||
if(!SScameras.is_visible_by_cameras(owner))
|
||||
to_chat(AI, span_warning("Target is no longer near active cameras."))
|
||||
return
|
||||
if(!isturf(AI.loc))
|
||||
|
||||
Reference in New Issue
Block a user