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

Smart Laser Gun (#13019)

Browse Source 
* Adds framework for any gun to be usable by pAI if the can_take_pAI var is changed to TRUE, opening up adminbus options.
Adds smart laser gun, which can take pAIs by default.
Adds smart laser gun crate to Cargo, for twice the price of a standard weapons crate. It contains four smart laser guns.

* Fixes supplypack containername, makes pAIs incapable of firing a gun if they're inside a pipe.

* Fixes compile failure.
This commit is contained in:
Shadowmech88
2016-12-26 08:01:25 -06:00
committed by Probe1
parent 232f793cd0
commit b3f795b714
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/datums/supplypacks.dm
View File

@@ -678,6 +678,18 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
access = access_security
group = "Security"
/datum/supply_packs/smartlaser
name = "Smart laser gun crate"
contains = list(/obj/item/weapon/gun/energy/laser/smart,
/obj/item/weapon/gun/energy/laser/smart,
/obj/item/weapon/gun/energy/laser/smart,
/obj/item/weapon/gun/energy/laser/smart)
cost = 60
containertype = /obj/structure/closet/crate/secure/weapon
containername = "smart laser gun crate"
access = access_armory
group = "Security"
/datum/supply_packs/eweapons
name = "Incendiary weapons crate"
contains = list(/obj/item/weapon/gun/projectile/flamethrower/full,

16
code/modules/projectiles/gun.dm
View File

@@ -125,7 +125,7 @@
return 0
return 1
/obj/item/weapon/gun/proc/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0, struggle = 0)//TODO: go over this
/obj/item/weapon/gun/proc/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0, struggle = 0, var/use_shooter_turf = FALSE)//TODO: go over this
//Exclude lasertag guns from the M_CLUMSY check.
if(clumsy_check)
if(istype(user, /mob/living))
@@ -144,6 +144,8 @@
var/atom/originaltarget = target
var/turf/curloc = user.loc
if(use_shooter_turf)
curloc = get_turf(user)
var/turf/targloc = get_turf(target)
if (!istype(targloc) || !istype(curloc))
return
@@ -339,3 +341,15 @@
return ..() //Allows a player to choose to melee instead of shoot, by being on help intent.
else
return ..() //Pistolwhippin'
/obj/item/weapon/gun/on_integrated_pai_click(mob/living/silicon/pai/user, var/atom/A) //to allow any gun to be pAI-compatible, on a basic level, just by varediting
if(check_pai_can_fire(user))
Fire(A,user,use_shooter_turf = TRUE)
else
to_chat(user, "<span class='warning'>You can't aim the gun properly from this location!</span>")
/obj/item/weapon/gun/proc/check_pai_can_fire(mob/living/silicon/pai/user) //for various restrictions on when pAIs can fire a gun into which they're integrated
if(get_holder_of_type(user, /obj/structure/disposalpipe) || get_holder_of_type(user, /obj/machinery/atmospherics/pipe)) //can't fire the gun from inside pipes or disposal pipes
return TRUE
else
return FALSE

6
code/modules/projectiles/guns/energy/laser.dm
View File

@@ -456,3 +456,9 @@
charge_cost = 25
fire_sound = 'sound/weapons/mmlbuster.ogg'
inhand_states = list("left_hand" = 'icons/mob/in-hand/left/megabusters.dmi', "right_hand" = 'icons/mob/in-hand/right/megabusters.dmi')
/obj/item/weapon/gun/energy/laser/smart
name = "smart laser gun"
desc = "An upgraded model of the basic laser gun. There seems to be some sort of slot in the handle."
can_take_pai = TRUE
origin_tech = Tc_COMBAT + "=3;" + Tc_MAGNETS + "=2;" + Tc_ENGINEERING + "=2;" + Tc_PROGRAMMING + "=4"