cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 20:11:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjusts welder bomb timers (#6630)

Browse Source 
Makes it much harder to welder bomb maliciously, gives people a prompt confirming they understand what they are doing, ensuring that it keeps those who are doing so maliciously from those on accident
This commit is contained in:
Lady Fowl
2019-07-31 00:09:15 +03:00
committed by Erki
parent 1cb9733213
commit dbfefaa70f
3 changed files with 63 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/Cleanable/fuel.dm
+1 -2
View File
@@ -9,8 +9,7 @@
/obj/effect/decal/cleanable/liquid_fuel/Initialize(mapload, amt = 1, nologs = 0)
. = ..()
if(!nologs && !mapload)
message_admins("Liquid fuel has spilled in [loc.loc.name] ([loc.x],[loc.y],[loc.z]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[loc.x];Y=[loc.y];Z=[loc.z]'>JMP</a>)")
log_game("Liquid fuel has spilled in [loc.loc.name] ([loc.x],[loc.y],[loc.z])")
log_and_message_admins("spilled liquid fuel", user = usr, location = get_turf(src))
src.amount = amt
var/has_spread = 0
code/game/objects/items/weapons/tools.dm
+21 -15
View File
@@ -346,24 +346,30 @@
if(tank.armed)
to_chat(user, "You are already heating the [O]")
return
tank.armed = 1
user.visible_message("[user] begins heating the [O].", "You start to heat the [O].")
message_admins("[key_name_admin(user)] is attempting a welder bomb at ([loc.x],[loc.y],[loc.z]) - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[O.x];Y=[O.y];Z=[O.z]'>JMP</a>")
if(do_after(user,100))
if(tank.defuse)
user.visible_message("[user] melts some of the framework on the [O].", "You melt some of the framework.")
tank.defuse = 0
switch(alert("Are you sure you want to do this? It is quite dangerous and could get you in trouble.", "Heat up fuel tank", "No", "Yes"))
if("Yes")
log_and_message_admins("is attempting to welderbomb", user)
to_chat(user, span("alert", "Heating the fueltank..."))
tank.armed = 1
if(do_after(user, 100))
if(tank.defuse)
user.visible_message("[user] melts some of the framework on the [O].", "You melt some of the framework.")
tank.defuse = 0
tank.armed = 0
return
log_and_message_admins("triggered a fuel tank explosion", user)
to_chat(user, span("alert", "That was stupid of you."))
tank.ex_act(3.0)
return
else
tank.armed = 0
to_chat(user, "You thought better of yourself.")
return
if("No")
tank.armed = 0
to_chat(user, "You thought better of yourself.")
return
message_admins("[key_name_admin(user)] triggered a fueltank explosion.")
log_game("[key_name(user)] triggered a fueltank explosion with a welding tool.",ckey=key_name(user))
to_chat(user, span("alert", "That was stupid of you."))
tank.ex_act(3.0)
return
else
tank.armed = 0
to_chat(user, "You thought better of yourself.")
return
return
if (src.welding)
remove_fuel(1)