cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

customizable turrets for admins + button to spawn in Fun Secrets (#35462)

Browse Source 
* customizable turrets for admins + button to spawn in Fun Secrets

* fix special description

* clarity on admin menu

---------

Co-authored-by: nervere <sage@lulz>
This commit is contained in:
nervere
2023-12-03 01:18:45 +00:00
committed by GitHub
parent 700f44fbdb
commit 78e89b7a0a
3 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
code/game/machinery/turrets.dm
View File

@@ -577,7 +577,8 @@
icon_state = "turretid_safe" icon_state = "turretid_safe"
/obj/structure/turret/gun_turret /obj/structure/turret/gun_turret
name = "Gun Turret" name = "gun turret"
desc = "A break-away from traditional design, this turret always has its hulking gun exposed. It looks menacing."
density = 1 density = 1
anchored = 1 anchored = 1
var/cooldown = 20 var/cooldown = 20
@@ -587,12 +588,19 @@
var/list/exclude = list() var/list/exclude = list()
var/atom/cur_target var/atom/cur_target
var/scan_range = 7 var/scan_range = 7
var/projectile_type = /obj/item/projectile
var/firing_delay = 2
var/admin_only = 0 //Can non-admins interface with this turret's controls?
health = 40 health = 40
var/list/scan_for = list("human"=0,"cyborg"=0,"mecha"=0,"alien"=1) var/list/scan_for = list("human"=0,"cyborg"=0,"mecha"=0,"alien"=1)
var/on = 0 var/on = 0
icon = 'icons/obj/turrets.dmi' icon = 'icons/obj/turrets.dmi'
icon_state = "gun_turret" icon_state = "gun_turret"
/obj/structure/turret/gun_turret/examine(mob/user)
..()
if(admin_only)
to_chat(user, "<span class='warning'>This turret's control panel is glowing red and appears to be remotely locked down.</span>")
/obj/structure/turret/gun_turret/ex_act() /obj/structure/turret/gun_turret/ex_act()
qdel (src) qdel (src)
@@ -612,9 +620,12 @@
return ..() return ..()
/obj/structure/turret/gun_turret/attack_hand(mob/user as mob) /obj/structure/turret/gun_turret/attack_hand(mob/user as mob)
if(admin_only && !check_rights(R_ADMIN))
to_chat(user, "<span class='warning'> The turret's control panel is glowing red and appears to be remotely locked down.</span>")
return
user.set_machine(src) user.set_machine(src)
var/dat = {"<html> var/dat = {"<html>
<head><title>[src] Control</title></head> <head><title>[src] control</title></head>
<body> <body>
<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"on":"off"]</a><br> <b>Power: </b><a href='?src=\ref[src];power=1'>[on?"on":"off"]</a><br>
<b>Scan Range: </b><a href='?src=\ref[src];scan_range=-1'>-</a> [scan_range] <a href='?src=\ref[src];scan_range=1'>+</a><br> <b>Scan Range: </b><a href='?src=\ref[src];scan_range=-1'>-</a> [scan_range] <a href='?src=\ref[src];scan_range=1'>+</a><br>
@@ -622,7 +633,16 @@
for(var/scan in scan_for) for(var/scan in scan_for)
dat += "<div style=\"margin-left: 15px;\">[scan] (<a href='?src=\ref[src];scan_for=[scan]'>[scan_for[scan]?"Yes":"No"]</a>)</div>" dat += "<div style=\"margin-left: 15px;\">[scan] (<a href='?src=\ref[src];scan_for=[scan]'>[scan_for[scan]?"Yes":"No"]</a>)</div>"
dat += {"<b>Ammo: </b>[max(0, projectiles)]<br> dat += "<b>Ammo: </b>[max(0, projectiles)]<br>"
if(check_rights(R_ADMIN))
dat += {"<br><b><font color="red">Admin Options:</font></b><br>
<b>Admin-only mode:</b> <a href='?src=\ref[src];admin_only=1'>[admin_only?"ON":"OFF"]</a><br>
<b>Projectile type:</b> <a href='?src=\ref[src];projectile_type=1'>[projectile_type]</a><br>
<b>Projectiles per burst:</b> <a href='?src=\ref[src];projectile_burst=1'>[projectiles_per_shot]</a><br>
<b>Firing delay:</b> <a href='?src=\ref[src];firing_delay=1'>[cooldown] deci-seconds</a><br>
<b>Set ammo #:</b> <a href='?src=\ref[src];force_ammo_amt=1'>[projectiles]</a><br>
</body> </body>
</html>"} </html>"}
user << browse(dat, "window=turret") user << browse(dat, "window=turret")
@@ -652,6 +672,47 @@
if(href_list["scan_for"]) if(href_list["scan_for"])
if(href_list["scan_for"] in scan_for) if(href_list["scan_for"] in scan_for)
scan_for[href_list["scan_for"]] = !scan_for[href_list["scan_for"]] scan_for[href_list["scan_for"]] = !scan_for[href_list["scan_for"]]
if(href_list["admin_only"])
if(!check_rights(R_ADMIN))
return
src.admin_only = !src.admin_only
if(href_list["projectile_type"])
if(!check_rights(R_ADMIN))
return
var/list/valid_turret_projectiles = existing_typesof(/obj/item/projectile/bullet) + existing_typesof(/obj/item/projectile/energy)
var/userinput = filter_list_input("New projectile typepath", "You can only pick one!", valid_turret_projectiles)
if(!userinput)
to_chat(usr, "<span class='warning'><b>No projetile typepath entered. The turret's projectile remains unchanged.</b></span>")
return
projectile_type = userinput
if(href_list["projectile_burst"])
if(!check_rights(R_ADMIN))
return
var/userinput = input("Enter new # of projectiles in a burst-fire", "RATATATTATATA", 2) as num
if(userinput > 5)
projectiles_per_shot = 5
to_chat(usr, "<span class='warning'><b>Error: Max burst-fire exceeded. Burst-fire set to 5.</b></span>")
return
projectiles_per_shot = max(1, userinput)
if(href_list["firing_delay"])
if(!check_rights(R_ADMIN))
return
var/userinput = input("Enter new firing delay (as tenths of a second)", "RATATATTATATA", 20) as num
if(userinput <= 0)
cooldown = 1
to_chat(usr, "<span class='warning'><b>Error: Firing cooldown floor reached. Cooldown set to 1/10th of a second.</b></span>")
return
cooldown = userinput
if(href_list["force_ammo_amt"])
if(!check_rights(R_ADMIN))
return
var/userinput = input("Enter new # of projectiles left in the turret", "RATATATTATATA", 100) as num
if(userinput < 0)
projectiles = 0
to_chat(usr, "<span class='warning'><b>Error: Setting negative projectiles is a bad idea, okay? <u>Don't do that<u/>. Projectiles reset to 0.</b></span>")
return
projectiles = userinput
src.updateUsrDialog() src.updateUsrDialog()
return return
@@ -730,7 +791,7 @@
if (targloc == curloc) if (targloc == curloc)
continue continue
playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1) playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1)
var/obj/item/projectile/A = new /obj/item/projectile(curloc) var/obj/item/projectile/A = new projectile_type(curloc)
src.projectiles-- src.projectiles--
A.original = target A.original = target
A.current = curloc A.current = curloc
@@ -743,6 +804,9 @@
sleep(2) sleep(2)
return return
/obj/structure/turret/gun_turret/admin
admin_only = 1
/obj/machinery/turret/Destroy() /obj/machinery/turret/Destroy()
// deletes its own cover with it // deletes its own cover with it
if(cover) if(cover)

1
code/modules/admin/admin.dm
View File

@@ -868,6 +868,7 @@ var/global/floorIsLava = 0
<A href='?src=\ref[src];secretsfun=eagles'>Egalitarian Station Mode (removes access on doors except for Command and Security)</A><BR> <A href='?src=\ref[src];secretsfun=eagles'>Egalitarian Station Mode (removes access on doors except for Command and Security)</A><BR>
<A href='?src=\ref[src];secretsfun=RandomizedLawset'>Give the AIs a randomly generated Lawset.</A><BR> <A href='?src=\ref[src];secretsfun=RandomizedLawset'>Give the AIs a randomly generated Lawset.</A><BR>
<A href='?src=\ref[src];secretsfun=buddha_mode_everyone'>Toggle Buddha Mode on/off for everyone</A><BR> <A href='?src=\ref[src];secretsfun=buddha_mode_everyone'>Toggle Buddha Mode on/off for everyone</A><BR>
<A href='?src=\ref[src];secretsfun=spawn_custom_turret'>Spawn a customizable turret</A><BR>
<BR> <BR>
<A href='?src=\ref[src];secretsfun=power'>Make all areas powered</A><BR> <A href='?src=\ref[src];secretsfun=power'>Make all areas powered</A><BR>
<A href='?src=\ref[src];secretsfun=unpower'>Make all areas unpowered</A><BR> <A href='?src=\ref[src];secretsfun=unpower'>Make all areas unpowered</A><BR>

7
code/modules/admin/topic.dm
View File

@@ -4323,6 +4323,13 @@
if(H.client) if(H.client)
to_chat(H, "<span class='warning'>The tranquility that once filled your soul has vanished. You are once again a slave to your worldly desires.</span>") to_chat(H, "<span class='warning'>The tranquility that once filled your soul has vanished. You are once again a slave to your worldly desires.</span>")
if("spawn_custom_turret")
if(alert("Are you sure you'd like to spawn a custom turret at your location?", "Confirmation", "Yes", "Cancel") == "Cancel")
return
new /obj/structure/turret/gun_turret/admin(get_turf(usr))
log_admin("[key_name(usr)] has spawned a customizable turret at [get_coordinates_string(usr)].")
message_admins("[key_name(usr)] has spawned a customizable turret at [get_coordinates_string(usr)].")
if("vermin_infestation") if("vermin_infestation")
var/list/locations = list( var/list/locations = list(
"RANDOM" = null, "RANDOM" = null,