cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes guns playing scredriver sounds when they shouldn't be. as well as adds sounds to attaching stuff (#26945)

Browse Source 
* Fixes guns playing scredriver sounds when they shouldn't be

* Update code/modules/projectiles/gun.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

---------

Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
1080pCat
2024-10-22 09:22:34 +00:00
committed by GitHub
co-authored by Luc
parent ade220d0cb
commit cb0284a533
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+19 -15
View File
@@ -352,6 +352,7 @@
if(!user.unEquip(I))
return
to_chat(user, "<span class='notice'>You click [S] into place on [src].</span>")
playsound(src, 'sound/machines/click.ogg', 50, TRUE)
if(S.on)
set_light(0)
gun_light = S
@@ -375,6 +376,7 @@
return
K.forceMove(src)
to_chat(user, "<span class='notice'>You attach [K] to [src]'s bayonet lug.</span>")
playsound(src, 'sound/machines/click.ogg', 50, TRUE)
bayonet = K
var/state = "bayonet" //Generic state.
if(bayonet.icon_state in icon_states('icons/obj/guns/bayonets.dmi')) //Snowflake state?
@@ -389,21 +391,23 @@
/obj/item/gun/screwdriver_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
if(gun_light && can_flashlight)
for(var/obj/item/flashlight/seclite/S in src)
to_chat(user, "<span class='notice'>You unscrew the seclite from [src].</span>")
gun_light = null
S.loc = get_turf(user)
update_gun_light(user)
S.update_brightness(user)
update_icon()
for(var/datum/action/item_action/toggle_gunlight/TGL in actions)
qdel(TGL)
else if(bayonet && can_bayonet) //if it has a bayonet, and the bayonet can be removed
bayonet.forceMove(get_turf(user))
clear_bayonet()
if(gun_light || bayonet)
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
if(gun_light && can_flashlight)
for(var/obj/item/flashlight/seclite/S in src)
to_chat(user, "<span class='notice'>You unscrew the seclite from [src].</span>")
gun_light = null
S.loc = get_turf(user)
update_gun_light(user)
S.update_brightness(user)
update_icon()
for(var/datum/action/item_action/toggle_gunlight/TGL in actions)
qdel(TGL)
else if(bayonet && can_bayonet) // if it has a bayonet, and the bayonet can be removed
bayonet.forceMove(get_turf(user))
to_chat(user, "<span class='notice'>You remove [bayonet] from [src].</span>")
clear_bayonet()
/obj/item/gun/proc/toggle_gunlight()
if(!gun_light)