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

Fixes the BSA asking for the target twice (#6200)

Browse Source
This commit is contained in:
Werner
2019-03-24 23:17:42 +02:00
committed by Erki
parent af301d6b9d
commit 8c0eeb3901
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/bluespaceartillery.dm
+6 -13
View File
@@ -43,21 +43,14 @@
/obj/machinery/computer/artillerycontrol/proc/announce_and_fire(var/turf/t, var/mob/user)
if(!istype(t))
return
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
var/A
A = input("Area to jump bombard", "Open Fire", A) in teleportlocs
var/area/thearea = teleportlocs[A]
if (usr.stat || usr.restrained()) return
if(src.reload < 180) return
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
if ((user.contents.Find(src) || (in_range(src, user) && istype(src.loc, /turf))) || (istype(user, /mob/living/silicon)))
if (user.stat || user.restrained()) return
if (src.reload < 180) return
if ((user.contents.Find(src) || (in_range(src, user) && istype(src.loc, /turf))) || (istype(user, /mob/living/silicon)))
command_announcement.Announce("Bluespace artillery fire detected. Brace for impact.")
to_world(sound('sound/effects/yamato_fire.ogg'))
message_admins("[key_name_admin(usr)] has launched an artillery strike.", 1)
var/list/L = list()
for(var/turf/T in get_area_turfs(thearea.type))
L+=T
var/loc = pick(L)
explosion(loc,2,5,11)
explosion(t,2,5,11)
reload = 0
/obj/structure/artilleryplaceholder
@@ -67,4 +60,4 @@
density = 1
/obj/structure/artilleryplaceholder/decorative
density = 0
density = 0