cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lets mantis blades pry open doors if you have two (#18639)

Browse Source 
* pry

* scale with toolspeed

* Update mantis.dm

* Update mantis.dm
This commit is contained in:
Molti
2023-05-02 00:59:19 -05:00
committed by GitHub
parent 7b16b42652
commit e12c79d033
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1267,11 +1267,17 @@
return return
INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2) INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2)
if(istype(I, /obj/item/jawsoflife)) if(istype(I, /obj/item/jawsoflife) || istype(I, /obj/item/mantis/blade))
if(isElectrified()) if(isElectrified())
shock(user,100)//it's like sticking a fork in a power socket shock(user,100)//it's like sticking a fork in a power socket
return return
if(istype(I, /obj/item/mantis/blade))
var/obj/item/mantis/blade/secondsword = user.get_inactive_held_item()
if(!istype(secondsword, /obj/item/mantis/blade))
to_chat(user, span_warning("You need a second [I] to pry open doors!"))
return
if(!density)//already open if(!density)//already open
return return
@@ -1287,12 +1293,11 @@
to_chat(user, span_warning("The airlock won't budge!")) to_chat(user, span_warning("The airlock won't budge!"))
return return
var/time_to_open = 5 var/time_to_open = 7 SECONDS * I.toolspeed
if(hasPower() && !prying_so_hard) if(hasPower() && !prying_so_hard)
if (I.tool_behaviour == TOOL_CROWBAR) //we need another check, futureproofing for if/when bettertools actually completely replaces the old jaws if (I.tool_behaviour == TOOL_CROWBAR) //we need another check, futureproofing for if/when bettertools actually completely replaces the old jaws
time_to_open = 50
if(istype(I,/obj/item/jawsoflife/jimmy)) if(istype(I,/obj/item/jawsoflife/jimmy))
time_to_open = 30
var/obj/item/jawsoflife/jimmy/J = I var/obj/item/jawsoflife/jimmy/J = I
if(J.pump_charge >= J.pump_cost) if(J.pump_charge >= J.pump_cost)
J.pump_charge = J.pump_charge - J.pump_cost J.pump_charge = J.pump_charge - J.pump_cost
@@ -1300,7 +1305,7 @@
J.pump_charge = 0 J.pump_charge = 0
playsound(src, 'sound/items/jimmy_pump.ogg', 100, TRUE) playsound(src, 'sound/items/jimmy_pump.ogg', 100, TRUE)
if(J.obj_flags & EMAGGED) if(J.obj_flags & EMAGGED)
time_to_open = 15 time_to_open /= 2
else else
if(user) if(user)
to_chat(user, span_warning("You do not have enough charge in the [J] for this. You need at least [J.pump_cost]% ")) to_chat(user, span_warning("You do not have enough charge in the [J] for this. You need at least [J.pump_cost]% "))

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

@@ -13,6 +13,8 @@
bare_wound_bonus = 20 bare_wound_bonus = 20
w_class = WEIGHT_CLASS_NORMAL w_class = WEIGHT_CLASS_NORMAL
sharpness = SHARP_EDGED sharpness = SHARP_EDGED
tool_behaviour = TOOL_CROWBAR // just a very "sharp" crowbar
toolspeed = 0.45 //for door prying speed, ends up at about 3 seconds
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "lacerated", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "lacerated", "ripped", "diced", "cut")
/obj/item/mantis/blade/equipped(mob/user, slot, initial) /obj/item/mantis/blade/equipped(mob/user, slot, initial)

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

@@ -14,7 +14,6 @@
force = 15 force = 15
toolspeed = 0.7 toolspeed = 0.7
tool_behaviour = TOOL_CROWBAR tool_behaviour = TOOL_CROWBAR
var/pryforce = 1 // the speed at which airlocks are pried open. Default is 1 .
//jaws of life changing jaw code //jaws of life changing jaw code
/obj/item/jawsoflife/attack_self(mob/user) /obj/item/jawsoflife/attack_self(mob/user)
@@ -163,7 +162,6 @@
materials = list(MAT_METAL=400,MAT_SILVER=10,MAT_TITANIUM=80) materials = list(MAT_METAL=400,MAT_SILVER=10,MAT_TITANIUM=80)
toolspeed = 0.3 // Starting minimum value. Pump it up by using it up to the max toolspeed = 0.3 // Starting minimum value. Pump it up by using it up to the max
tool_behaviour = TOOL_CROWBAR tool_behaviour = TOOL_CROWBAR
pryforce = 0.4
var/pump_charge = 0 var/pump_charge = 0
var/pump_max = 100 var/pump_max = 100
var/pump_min = 0 var/pump_min = 0