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

Roulette turret (#35807)

Browse Source 
* roulette turret lol

* simplify

* global list method

* update

* indent

* <--- clueless

* a

* a
This commit is contained in:
west3436
2024-01-23 08:59:08 -05:00
committed by GitHub
parent cde22ec4d7
commit ece17542df
2 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -591,12 +591,19 @@
var/projectile_type = /obj/item/projectile
var/firing_delay = 2
var/admin_only = 0 //Can non-admins interface with this turret's controls?
var/roulette_mode = FALSE
var/list/available_projectiles = list()
health = 40
var/list/scan_for = list("human"=0,"cyborg"=0,"mecha"=0,"alien"=1)
var/on = 0
icon = 'icons/obj/turrets.dmi'
icon_state = "gun_turret"
/obj/structure/turret/gun_turret/New()
..()
available_projectiles = existing_typesof(/obj/item/projectile)
/obj/structure/turret/gun_turret/examine(mob/user)
..()
if(admin_only)
@@ -637,12 +644,15 @@
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>Roulette mode:</b> <a href='?src=\ref[src];roulette_mode=0'>[roulette_mode?"ON":"OFF"]</a><br>
"}
if(!roulette_mode)
dat += {"<b>Projectile type:</b> <a href='?src=\ref[src];projectile_type=1'>[projectile_type]</a><br>"}
dat += {"<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>
</html>"}
user << browse(dat, "window=turret")
@@ -676,6 +686,10 @@
if(!check_rights(R_ADMIN))
return
src.admin_only = !src.admin_only
if(href_list["roulette_mode"])
if(!check_rights(R_ADMIN))
return
roulette_mode = !roulette_mode
if(href_list["projectile_type"])
if(!check_rights(R_ADMIN))
return
@@ -791,6 +805,8 @@
if (targloc == curloc)
continue
playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1)
if(roulette_mode)
projectile_type = pick(available_projectiles - restricted_roulette_projectiles)
var/obj/item/projectile/A = new projectile_type(curloc)
src.projectiles--
A.original = target

49
code/modules/projectiles/guns/projectile/roulette.dm
View File

@@ -1,3 +1,24 @@
var/list/restricted_roulette_projectiles = list(
/obj/item/projectile,
/obj/item/projectile/energy,
/obj/item/projectile/hookshot,
/obj/item/projectile/bullet/blastwave,
/obj/item/projectile/beam/lightning,
/obj/item/projectile/beam/procjectile,
/obj/item/projectile/beam/lightning/spell,
/obj/item/projectile/rocket,
/obj/item/projectile/rocket/nikita,
/obj/item/projectile/rocket/lowyield/extreme,
/obj/item/projectile/test,
/obj/item/projectile/friendlyCheck,
/obj/item/projectile/beam/emitter,
/obj/item/projectile/spell_projectile,
/obj/item/projectile/stickybomb,
/obj/item/projectile/beam/lightlaser,
/obj/item/projectile/portalgun,
/obj/item/projectile/soulbullet,
)
/obj/item/weapon/gun/projectile/roulette_revolver
name = "\improper Roulette Revolver"
desc = "A strange-looking revolver. Its construction appears somewhat slapdash."
@@ -19,26 +40,6 @@
var/infinite = 0
var/time_since_last_recharge = 0
var/list/available_projectiles = list()
var/list/restricted_projectiles = list(
/obj/item/projectile,
/obj/item/projectile/energy,
/obj/item/projectile/hookshot,
/obj/item/projectile/bullet/blastwave,
/obj/item/projectile/beam/lightning,
/obj/item/projectile/beam/procjectile,
/obj/item/projectile/beam/lightning/spell,
/obj/item/projectile/rocket,
/obj/item/projectile/rocket/nikita,
/obj/item/projectile/rocket/lowyield/extreme,
/obj/item/projectile/test,
/obj/item/projectile/friendlyCheck,
/obj/item/projectile/beam/emitter,
/obj/item/projectile/spell_projectile,
/obj/item/projectile/stickybomb,
/obj/item/projectile/beam/lightlaser,
/obj/item/projectile/portalgun,
/obj/item/projectile/soulbullet,
)
var/list/restrict_with_subtypes = list(
/obj/item/projectile/meteor,
@@ -78,16 +79,16 @@
desc += "The barrel and chamber assembly seems to have been modified."
to_chat(user, "<span class='danger'>You finish modifying \the [src]!</span>")
restrict_with_subtypes.Cut()
restricted_projectiles -= /obj/item/projectile/rocket
restricted_projectiles -= /obj/item/projectile/rocket/nikita
restricted_projectiles -= /obj/item/projectile/rocket/lowyield/extreme
restricted_roulette_projectiles -= /obj/item/projectile/rocket
restricted_roulette_projectiles -= /obj/item/projectile/rocket/nikita
restricted_roulette_projectiles -= /obj/item/projectile/rocket/lowyield/extreme
return 1
else
..()
/obj/item/weapon/gun/projectile/roulette_revolver/proc/choose_projectile()
var/chosen_projectile = pick(available_projectiles)
for(var/I in restricted_projectiles)
for(var/I in restricted_roulette_projectiles)
if(chosen_projectile == I)
choose_projectile()
return