diff --git a/code/datums/outfits/jobs/science.dm b/code/datums/outfits/jobs/science.dm index 07782df22d..f98de6ff25 100644 --- a/code/datums/outfits/jobs/science.dm +++ b/code/datums/outfits/jobs/science.dm @@ -35,7 +35,7 @@ uniform = /obj/item/clothing/under/xenofauna id_type = /obj/item/card/id/science suit = /obj/item/clothing/suit/storage/toggle/labcoat/science - l_ear = /obj/item/radio/headset/explorer + shoes = /obj/item/clothing/shoes/boots/winter /decl/hierarchy/outfit/job/science/roboticist name = OUTFIT_JOB_NAME("Roboticist") diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index c710298e68..a91f67d17f 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -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 @@ -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... >.> diff --git a/code/modules/projectiles/guns/energy/phase.dm b/code/modules/projectiles/guns/energy/phase.dm index db6eeed74a..eae9b8ac3e 100644 --- a/code/modules/projectiles/guns/energy/phase.dm +++ b/code/modules/projectiles/guns/energy/phase.dm @@ -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 diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 2bec4ddf69..017901db19 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -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 diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 0634437e76..909f64d3d8 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/items/lefthand_guns.dmi b/icons/mob/items/lefthand_guns.dmi index 7690273a89..eba7916a17 100644 Binary files a/icons/mob/items/lefthand_guns.dmi and b/icons/mob/items/lefthand_guns.dmi differ diff --git a/icons/mob/items/righthand_guns.dmi b/icons/mob/items/righthand_guns.dmi index 42aaeeb73a..994b2a9595 100644 Binary files a/icons/mob/items/righthand_guns.dmi and b/icons/mob/items/righthand_guns.dmi differ diff --git a/icons/obj/gun_energy.dmi b/icons/obj/gun_energy.dmi index e250dc57ba..6c260ad1bf 100644 Binary files a/icons/obj/gun_energy.dmi and b/icons/obj/gun_energy.dmi differ diff --git a/sound/weapons/dartgun.ogg b/sound/weapons/dartgun.ogg new file mode 100644 index 0000000000..99a5465d16 Binary files /dev/null and b/sound/weapons/dartgun.ogg differ