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

Fixes some sounds not being cached properly

Browse Source
This commit is contained in:
Krausus
2017-02-17 02:37:26 -05:00
parent 79a4f99afc
commit 4754d6b4b3
39 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/energy.dm
+3 -3
View File
@@ -122,7 +122,7 @@
projectile_type = /obj/item/projectile/beam/disabler
select_name = "disable"
e_cost = 500
fire_sound = "sound/weapons/taser2.ogg"
fire_sound = 'sound/weapons/taser2.ogg'
/obj/item/ammo_casing/energy/plasma
projectile_type = /obj/item/projectile/plasma
@@ -139,7 +139,7 @@
/obj/item/ammo_casing/energy/wormhole
projectile_type = /obj/item/projectile/beam/wormhole
e_cost = 0
fire_sound = "sound/weapons/pulse3.ogg"
fire_sound = 'sound/weapons/pulse3.ogg'
var/obj/item/weapon/gun/energy/wormhole_projector/gun = null
select_name = "blue"
@@ -193,7 +193,7 @@
/obj/item/ammo_casing/energy/toxplasma
projectile_type = /obj/item/projectile/energy/toxplasma
fire_sound = "sound/weapons/taser2.ogg"
fire_sound = 'sound/weapons/taser2.ogg'
select_name = "plasma dart"
/obj/item/ammo_casing/energy/clown
code/modules/projectiles/guns/magic/staff.dm
+7 -7
View File
@@ -8,7 +8,7 @@
ammo_type = /obj/item/ammo_casing/magic/change
icon_state = "staffofchange"
item_state = "staffofchange"
fire_sound = "sound/magic/Staff_Change.ogg"
fire_sound = 'sound/magic/Staff_Change.ogg'
/obj/item/weapon/gun/magic/staff/animate
name = "staff of animation"
@@ -16,7 +16,7 @@
ammo_type = /obj/item/ammo_casing/magic/animate
icon_state = "staffofanimation"
item_state = "staffofanimation"
fire_sound = "sound/magic/Staff_animation.ogg"
fire_sound = 'sound/magic/Staff_animation.ogg'
/obj/item/weapon/gun/magic/staff/healing
name = "staff of healing"
@@ -24,7 +24,7 @@
ammo_type = /obj/item/ammo_casing/magic/heal
icon_state = "staffofhealing"
item_state = "staffofhealing"
fire_sound = "sound/magic/Staff_Healing.ogg"
fire_sound = 'sound/magic/Staff_Healing.ogg'
/obj/item/weapon/gun/magic/staff/healing/handle_suicide() //Stops people trying to commit suicide to heal themselves
return
@@ -38,7 +38,7 @@
max_charges = 10
recharge_rate = 2
no_den_usage = 1
fire_sound = "sound/magic/Staff_Chaos.ogg"
fire_sound = 'sound/magic/Staff_Chaos.ogg'
/obj/item/weapon/gun/magic/staff/door
name = "staff of door creation"
@@ -49,7 +49,7 @@
max_charges = 10
recharge_rate = 2
no_den_usage = 1
fire_sound = "sound/magic/Staff_Door.ogg"
fire_sound = 'sound/magic/Staff_Door.ogg'
/obj/item/weapon/gun/magic/staff/honk
name = "staff of the honkmother"
@@ -59,7 +59,7 @@
item_state = "honker"
max_charges = 4
recharge_rate = 8
fire_sound = "sound/items/airhorn.ogg"
fire_sound = 'sound/items/airhorn.ogg'
/obj/item/weapon/gun/magic/staff/focus
name = "mental focus"
@@ -72,7 +72,7 @@
/obj/item/weapon/gun/magic/staff/spellblade
name = "spellblade"
desc = "A deadly combination of laziness and boodlust, this blade allows the user to dismember their enemies without all the hard work of actually swinging the sword."
fire_sound = "sound/magic/Fireball.ogg"
fire_sound = 'sound/magic/Fireball.ogg'
ammo_type = /obj/item/ammo_casing/magic/spellblade
icon_state = "spellblade"
item_state = "spellblade"
code/modules/projectiles/guns/magic/wand.dm
+6 -6
View File
@@ -59,7 +59,7 @@
/obj/item/weapon/gun/magic/wand/death
name = "wand of death"
desc = "This deadly wand overwhelms the victim's body with pure energy, slaying them without fail."
fire_sound = "sound/magic/WandoDeath.ogg"
fire_sound = 'sound/magic/WandoDeath.ogg'
ammo_type = /obj/item/ammo_casing/magic/death
icon_state = "deathwand"
max_charges = 3 //3, 2, 2, 1
@@ -80,7 +80,7 @@
name = "wand of resurrection"
desc = "This wand uses healing magics to heal and revive. They are rarely utilized within the Wizard Federation for some reason."
ammo_type = /obj/item/ammo_casing/magic/heal
fire_sound = "sound/magic/Staff_Healing.ogg"
fire_sound = 'sound/magic/Staff_Healing.ogg'
icon_state = "revivewand"
max_charges = 3 //3, 2, 2, 1
@@ -98,7 +98,7 @@
name = "wand of polymorph"
desc = "This wand is attuned to chaos and will radically alter the victim's form."
ammo_type = /obj/item/ammo_casing/magic/change
fire_sound = "sound/magic/Staff_Change.ogg"
fire_sound = 'sound/magic/Staff_Change.ogg'
icon_state = "polywand"
max_charges = 10 //10, 5, 5, 4
@@ -118,7 +118,7 @@
icon_state = "telewand"
max_charges = 10 //10, 5, 5, 4
no_den_usage = 1
fire_sound = "sound/magic/Wand_Teleport.ogg"
fire_sound = 'sound/magic/Wand_Teleport.ogg'
/obj/item/weapon/gun/magic/wand/teleport/zap_self(mob/living/user)
do_teleport(user, user, 10)
@@ -136,7 +136,7 @@
name = "wand of door creation"
desc = "This particular wand can create doors in any wall for the unscrupulous wizard who shuns teleportation magics."
ammo_type = /obj/item/ammo_casing/magic/door
fire_sound = "sound/magic/Staff_Door.ogg"
fire_sound = 'sound/magic/Staff_Door.ogg'
icon_state = "doorwand"
max_charges = 20 //20, 10, 10, 7
@@ -152,7 +152,7 @@
/obj/item/weapon/gun/magic/wand/fireball
name = "wand of fireball"
desc = "This wand shoots scorching balls of fire that explode into destructive flames."
fire_sound = "sound/magic/Fireball.ogg"
fire_sound = 'sound/magic/Fireball.ogg'
ammo_type = /obj/item/ammo_casing/magic/fireball
icon_state = "firewand"
max_charges = 8 //8, 4, 4, 3