cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +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/game/objects/effects/spawners/random_spawners.dm
-1
View File
@@ -267,7 +267,6 @@
/obj/item/ammo_box/magazine/m10mm/hp = 1,
/obj/item/rad_laser = 1,
/obj/item/storage/box/syndie_kit/emp = 1,
/obj/item/batterer = 1,
/obj/item/toy/carpplushie/dehy_carp = 1,
/obj/item/clothing/glasses/hud/security/chameleon = 1)
code/game/objects/items/devices/traitordevices.dm
-62
View File
@@ -1,65 +1,3 @@
/*
Miscellaneous traitor devices
BATTERER
*/
/*
The Batterer, like a flashbang but 50% chance to knock people over. Can be either very
effective or pretty fucking useless.
*/
/obj/item/batterer
name = "mind batterer"
desc = "A strange device with twin antennas."
icon = 'icons/obj/device.dmi'
icon_state = "batterer"
throwforce = 5
w_class = WEIGHT_CLASS_TINY
throw_speed = 4
throw_range = 10
flags = CONDUCT
item_state = "electronic"
origin_tech = "magnets=3;combat=3;syndicate=3"
var/times_used = 0 //Number of times it's been used.
var/max_uses = 5
/obj/item/batterer/examine(mob/user)
. = ..()
if(times_used >= max_uses)
. += "<span class='notice'>[src] is out of charge.</span>"
if(times_used < max_uses)
. += "<span class='notice'>[src] has [max_uses-times_used] charges left.</span>"
/obj/item/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0)
if(!user)
return
if(times_used >= max_uses)
to_chat(user, "<span class='danger'>The mind batterer has been burnt out!</span>")
return
for(var/mob/living/carbon/human/M in oview(7, user))
if(prob(50))
M.Weaken(rand(4,7))
add_attack_logs(user, M, "Stunned with [src]")
to_chat(M, "<span class='danger'>You feel a tremendous, paralyzing wave flood your mind.</span>")
else
to_chat(M, "<span class='danger'>You feel a sudden, electric jolt travel through your head.</span>")
playsound(loc, 'sound/misc/interference.ogg', 50, 1)
times_used++
to_chat(user, "<span class='notice'>You trigger [src]. It has [max_uses-times_used] charges left.</span>")
if(times_used >= max_uses)
icon_state = "battererburnt"
/*
The radioactive microlaser, a device disguised as a health analyzer used to irradiate people.
code/game/objects/items/weapons/storage/belt.dm
+6 -2
View File
@@ -233,8 +233,12 @@
/obj/item/restraints/legcuffs/bola,
/obj/item/clothing/mask/gas/sechailer)
/obj/item/storage/belt/security/sec/populate_contents()
new /obj/item/flashlight/seclite(src)
/obj/item/storage/belt/security/full/populate_contents()
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/flash(src)
new /obj/item/melee/baton/loaded(src)
update_icon()
/obj/item/storage/belt/security/response_team/populate_contents()
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+5 -16
View File
@@ -103,8 +103,7 @@
new /obj/item/storage/box/flashbangs(src)
new /obj/item/holosign_creator/security(src)
new /obj/item/shield/riot/tele(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/storage/belt/security/sec(src)
new /obj/item/storage/belt/security/full(src)
new /obj/item/gun/energy/gun/hos(src)
new /obj/item/door_remote/head_of_security(src)
new /obj/item/reagent_containers/food/drinks/mug/hos(src)
@@ -137,10 +136,8 @@
new /obj/item/clothing/mask/gas/sechailer/warden(src)
new /obj/item/storage/box/zipties(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/gun/energy/gun/advtaser(src)
new /obj/item/storage/belt/security/sec(src)
new /obj/item/storage/belt/security/full(src)
new /obj/item/flashlight/seclite(src)
new /obj/item/storage/box/holobadge(src)
new /obj/item/clothing/gloves/color/black/krav_maga/sec(src)
@@ -159,15 +156,11 @@
new /obj/item/clothing/suit/armor/vest/security(src)
new /obj/item/radio/headset/headset_sec/alt(src)
new /obj/item/clothing/head/soft/sec(src)
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/flash(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/storage/belt/security/sec(src)
new /obj/item/storage/belt/security/full(src)
new /obj/item/holosign_creator/security(src)
new /obj/item/clothing/mask/gas/sechailer(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/clothing/suit/armor/secjacket(src)
@@ -207,11 +200,7 @@
new /obj/item/storage/briefcase(src)
new /obj/item/storage/firstaid/adv(src)
new /obj/item/pinpointer/crew(src)
new /obj/item/storage/belt/security/sec(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/flash(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/storage/belt/security/full(src)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/read_only(src)
new /obj/item/clothing/glasses/hud/health/sunglasses(src)