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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload files

Browse Source
This commit is contained in:
SandPoot
2021-02-23 16:42:07 -03:00
parent 9f3b30acea
commit 6c5acc3b4d
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/doors/airlock.dm
View File

@@ -1062,7 +1062,7 @@
to_chat(user, "<span class='warning'>The airlock's motors resist your efforts to force it!</span>") to_chat(user, "<span class='warning'>The airlock's motors resist your efforts to force it!</span>")
else if(locked) else if(locked)
to_chat(user, "<span class='warning'>The airlock's bolts prevent it from being forced!</span>") to_chat(user, "<span class='warning'>The airlock's bolts prevent it from being forced!</span>")
else if( !welded && !operating) else if(!welded && !operating)
if(!beingcrowbarred) //being fireaxe'd if(!beingcrowbarred) //being fireaxe'd
var/obj/item/fireaxe/axe = I var/obj/item/fireaxe/axe = I
if(!axe.wielded) if(!axe.wielded)
@@ -1073,6 +1073,8 @@
INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2) INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2)
if(I.tool_behaviour == TOOL_CROWBAR) if(I.tool_behaviour == TOOL_CROWBAR)
if(!I.can_force_powered)
return
if(hasPower() && isElectrified()) if(hasPower() && isElectrified())
shock(user,100)//it's like sticking a forck in a power socket shock(user,100)//it's like sticking a forck in a power socket
return return

2
code/game/objects/items.dm
View File

@@ -116,6 +116,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
var/buffer = null var/buffer = null
var/show_wires = FALSE var/show_wires = FALSE
var/datum/integrated_io/selected_io = null //functional for integrated circuits. var/datum/integrated_io/selected_io = null //functional for integrated circuits.
//Special crowbar
var/can_force_powered = FALSE
var/reach = 1 //In tiles, how far this weapon can reach; 1 for adjacent, which is default var/reach = 1 //In tiles, how far this weapon can reach; 1 for adjacent, which is default

1
code/game/objects/items/tools/crowbar.dm
View File

@@ -88,6 +88,7 @@
usesound = 'sound/items/jaws_pry.ogg' usesound = 'sound/items/jaws_pry.ogg'
force = 15 force = 15
toolspeed = 0.25 toolspeed = 0.25
can_force_powered = TRUE
/obj/item/crowbar/power/suicide_act(mob/user) /obj/item/crowbar/power/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!</span>") user.visible_message("<span class='suicide'>[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!</span>")