cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Beginnings of Combat Changes: Ranged Weaponry (#17075)

Browse Source
This commit is contained in:
Fox McCloud
2021-11-11 21:24:02 +01:00
committed by GitHub
parent 6ece7187a0
commit 06df88706f
35 changed files with 128 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/bot/construction.dm
+2 -2
View File
@@ -155,9 +155,9 @@
return
newname = "redtag ED-209 assembly"
if("")
if(!istype(W, /obj/item/gun/energy/gun/advtaser))
if(!istype(W, /obj/item/gun/energy/disabler))
return
newname = "taser ED-209 assembly"
newname = "disabler ED-209 assembly"
else
return
if(!user.unEquip(W))
code/modules/mob/living/simple_animal/bot/ed209bot.dm
+3 -4
View File
@@ -40,7 +40,7 @@
var/weaponscheck = 1 //If true, arrest people for weapons if they don't have access
var/check_records = 1 //Does it check security records?
var/arrest_type = 0 //If true, don't handcuff
var/projectile = /obj/item/projectile/energy/electrode //Holder for projectile type
var/projectile = /obj/item/projectile/beam/disabler //Holder for projectile type
var/shoot_sound = 'sound/weapons/taser.ogg'
@@ -396,7 +396,7 @@
new /obj/item/assembly/prox_sensor(Tsec)
if(!lasercolor)
var/obj/item/gun/energy/gun/advtaser/G = new /obj/item/gun/energy/gun/advtaser(Tsec)
var/obj/item/gun/energy/disabler/G = new /obj/item/gun/energy/disabler(Tsec)
G.cell.charge = 0
G.update_icon()
else if(lasercolor == "b")
@@ -437,8 +437,7 @@
projectile = /obj/item/projectile/beam
else
if(!lasercolor)
shoot_sound = 'sound/weapons/taser.ogg'
projectile = /obj/item/projectile/energy/electrode
projectile = /obj/item/projectile/beam/disabler
else if(lasercolor == "b")
projectile = /obj/item/projectile/beam/lasertag/bluetag
else if(lasercolor == "r")