Skip to content

Commit

Permalink
Resprited tranq weapons.
Browse files Browse the repository at this point in the history
  • Loading branch information
MistakeNot4892 committed Dec 27, 2023
1 parent 47c7c5b commit 1eafdb0
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 3 deletions.
1 change: 1 addition & 0 deletions code/datums/outfits/jobs/science.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
id_type = /obj/item/card/id/science
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science
l_ear = /obj/item/radio/headset/explorer

Check failure on line 38 in code/datums/outfits/jobs/science.dm

View workflow job for this annotation

GitHub Actions / Integration Tests

/obj/item/radio/headset/explorer: undefined type path
shoes = /obj/item/clothing/shoes/boots/winter

/decl/hierarchy/outfit/job/science/roboticist
name = OUTFIT_JOB_NAME("Roboticist")
Expand Down
6 changes: 4 additions & 2 deletions code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
var/move_delay = 1
var/fire_sound = null // This is handled by projectile.dm's fire_sound var now, but you can override the projectile's fire_sound with this one if you want to.
var/fire_sound_text = "gunshot"
var/fire_volume_silenced = 10
var/fire_volume = 50
var/fire_anim = null
var/recoil = 0 //screen shake
var/silenced = 0
Expand Down Expand Up @@ -648,9 +650,9 @@
return

if(silenced)
playsound(src, shot_sound, 10, 1)
playsound(src, shot_sound, fire_volume_silenced, 1)
else
playsound(src, shot_sound, 50, 1)
playsound(src, shot_sound, fire_volume, 1)

//Suicide handling.
/obj/item/gun/var/mouthshoot = 0 //To stop people from suiciding twice... >.>
Expand Down
6 changes: 5 additions & 1 deletion code/modules/projectiles/guns/energy/phase.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,21 @@
projectile_type = /obj/item/projectile/energy/phase/tranq
accuracy = 15
one_handed_penalty = 30
fire_volume_silenced = 5
fire_volume = 15

/obj/item/gun/energy/phasegun/tranq_pistol
name = "tranquilizer pistol"
desc = "A niche RayZar product designed for nonlethal animal control. A specialized emitter disrupts the nervous system of the target, eventually inducing sleep. Only rated for use on wildlife."
icon_state = "tranq"
item_state = "taser"
item_state = "tranq"
w_class = ITEMSIZE_NORMAL
slot_flags = SLOT_BELT|SLOT_HOLSTER
charge_cost = 200
projectile_type = /obj/item/projectile/energy/phase/tranq/weak
one_handed_penalty = 0
fire_volume_silenced = 5
fire_volume = 15

/obj/item/gun/energy/phasegun/mounted
self_recharge = TRUE
Expand Down
2 changes: 2 additions & 0 deletions code/modules/projectiles/projectile/energy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,9 @@
damage = 0
nodamage = TRUE
SA_bonus_damage = 0
icon_state = "flight"
hud_state = "laser_heat"
fire_sound = 'sound/weapons/dartgun.ogg'
var/tranq_duration = 30 SECONDS
var/tranq_delay = 10 SECONDS
var/tranq_delay_modifier = 0.7
Expand Down
Binary file modified icons/mob/back.dmi
Binary file not shown.
Binary file modified icons/mob/items/lefthand_guns.dmi
Binary file not shown.
Binary file modified icons/mob/items/righthand_guns.dmi
Binary file not shown.
Binary file modified icons/obj/gun_energy.dmi
Binary file not shown.
Binary file added sound/weapons/dartgun.ogg
Binary file not shown.

0 comments on commit 1eafdb0

Please sign in to comment.