mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
[MIRROR] Properly paths sound files and folders (#10899)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
committed by
GitHub
parent
0fe755a711
commit
55215f896f
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
/area/awaymission/labyrinth/temple/entry
|
/area/awaymission/labyrinth/temple/entry
|
||||||
icon_state = "chapel"
|
icon_state = "chapel"
|
||||||
ambience = list('sound/music/TheClownChild.ogg')
|
ambience = list('sound/music/theclownchild.ogg')
|
||||||
|
|
||||||
// These extra areas must break up the large area, or the game crashes when machinery (like an airlock) makes sparks.
|
// These extra areas must break up the large area, or the game crashes when machinery (like an airlock) makes sparks.
|
||||||
// I have no idea why. It's a nasty bug.
|
// I have no idea why. It's a nasty bug.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
GLOBAL_LIST_INIT(scarySounds, list(
|
GLOBAL_LIST_INIT(scarySounds, list(
|
||||||
'sound/weapons/thudswoosh.ogg',
|
'sound/weapons/thudswoosh.ogg',
|
||||||
'sound/weapons/Taser.ogg',
|
'sound/weapons/taser.ogg',
|
||||||
'sound/weapons/armbomb.ogg',
|
'sound/weapons/armbomb.ogg',
|
||||||
'sound/voice/hiss1.ogg',
|
'sound/voice/hiss1.ogg',
|
||||||
'sound/voice/hiss2.ogg',
|
'sound/voice/hiss2.ogg',
|
||||||
@@ -22,16 +22,16 @@ GLOBAL_LIST_INIT(scarySounds, list(
|
|||||||
'sound/voice/succlet_shriek.ogg'
|
'sound/voice/succlet_shriek.ogg'
|
||||||
))
|
))
|
||||||
|
|
||||||
GLOBAL_LIST_INIT(scawwySownds, list(
|
GLOBAL_LIST_INIT(scawwysownds, list(
|
||||||
'sound/voice/ScawwySownds/a scawey sownd.ogg',
|
'sound/voice/scawwysownds/a_scawey_sownd.ogg',
|
||||||
'sound/voice/ScawwySownds/is that you.ogg',
|
'sound/voice/scawwysownds/is_that_you.ogg',
|
||||||
'sound/voice/ScawwySownds/lookit this darkness wow.ogg',
|
'sound/voice/scawwysownds/lookit_this_darkness_wow.ogg',
|
||||||
'sound/voice/ScawwySownds/maint preds.ogg',
|
'sound/voice/scawwysownds/maint_preds.ogg',
|
||||||
'sound/voice/ScawwySownds/spooky sounds.ogg',
|
'sound/voice/scawwysownds/spooky_sounds.ogg',
|
||||||
'sound/voice/ScawwySownds/sus.ogg',
|
'sound/voice/scawwysownds/sus.ogg',
|
||||||
'sound/voice/ScawwySownds/this is scaewy.ogg',
|
'sound/voice/scawwysownds/this_is_scaewy.ogg',
|
||||||
'sound/voice/ScawwySownds/what is that behind you.ogg',
|
'sound/voice/scawwysownds/what_is_that_behind_you.ogg',
|
||||||
'sound/voice/ScawwySownds/what you doin over dere.ogg',
|
'sound/voice/scawwysownds/what_you_doin_over_dere.ogg',
|
||||||
'sound/voice/ScawwySownds/whats up with all the trash.ogg',
|
'sound/voice/scawwysownds/whats_up_with_all_the_trash.ogg',
|
||||||
'sound/voice/ScawwySownds/youre afraid of the dark arent you.ogg'
|
'sound/voice/scawwysownds/youre_afraid_of_the_dark_arent_you.ogg'
|
||||||
))
|
))
|
||||||
|
|||||||
@@ -368,7 +368,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
|
|||||||
var/mob/living/silicon/ai/A = src
|
var/mob/living/silicon/ai/A = src
|
||||||
oldname = null//don't bother with the records update crap
|
oldname = null//don't bother with the records update crap
|
||||||
//to_world(span_world("[newname] is the AI!"))
|
//to_world(span_world("[newname] is the AI!"))
|
||||||
//world << sound('sound/AI/newAI.ogg')
|
//world << sound('sound/AI/newai.ogg')
|
||||||
// Set eyeobj name
|
// Set eyeobj name
|
||||||
A.SetName(newname)
|
A.SetName(newname)
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
msg = "Today is your birthday! Do you want to increase your character's listed age?"
|
msg = "Today is your birthday! Do you want to increase your character's listed age?"
|
||||||
/* //Chomp DISABLE - Absolutely not.
|
/* //Chomp DISABLE - Absolutely not.
|
||||||
if(read_preference(/datum/preference/toggle/human/bday_announce))
|
if(read_preference(/datum/preference/toggle/human/bday_announce))
|
||||||
var/list/sounds = list('sound/voice/BIRTH.ogg')
|
var/list/sounds = list('sound/voice/birth.ogg')
|
||||||
var/oursound = pickweight(sounds)
|
var/oursound = pickweight(sounds)
|
||||||
command_announcement.Announce("Confirmed presence of BIRTHDAY aboard the station! It is [src.real_name]'s birthday or similar sort of celebration, name day, hatchday, WHATEVER! We encourage you to go find [src.real_name] and show them how we celebrate around here! Have a secure day!", "BIRTHDAY!", oursound)
|
command_announcement.Announce("Confirmed presence of BIRTHDAY aboard the station! It is [src.real_name]'s birthday or similar sort of celebration, name day, hatchday, WHATEVER! We encourage you to go find [src.real_name] and show them how we celebrate around here! Have a secure day!", "BIRTHDAY!", oursound)
|
||||||
*/ //Chomp DISABLE END
|
*/ //Chomp DISABLE END
|
||||||
|
|||||||
@@ -31,16 +31,16 @@
|
|||||||
"Shotgun Pumping" = 'sound/weapons/shotgunpump.ogg',
|
"Shotgun Pumping" = 'sound/weapons/shotgunpump.ogg',
|
||||||
"Flash" = 'sound/weapons/flash.ogg',
|
"Flash" = 'sound/weapons/flash.ogg',
|
||||||
"Bite" = 'sound/weapons/bite.ogg',
|
"Bite" = 'sound/weapons/bite.ogg',
|
||||||
"Gun Firing" = 'sound/weapons/Gunshot1.ogg',
|
"Gun Firing" = 'sound/weapons/gunshot1.ogg',
|
||||||
"Desert Eagle Firing" = 'sound/weapons/Gunshot_deagle.ogg',
|
"Desert Eagle Firing" = 'sound/weapons/gunshot_deagle.ogg',
|
||||||
"Rifle Firing" = 'sound/weapons/Gunshot_generic_rifle.ogg',
|
"Rifle Firing" = 'sound/weapons/gunshot_generic_rifle.ogg',
|
||||||
"Sniper Rifle Firing" = 'sound/weapons/Gunshot_sniper.ogg',
|
"Sniper Rifle Firing" = 'sound/weapons/gunshot_sniper.ogg',
|
||||||
"AT Rifle Firing" = 'sound/weapons/Gunshot_cannon.ogg',
|
"AT Rifle Firing" = 'sound/weapons/gunshot_cannon.ogg',
|
||||||
"Shotgun Firing" = 'sound/weapons/Gunshot_shotgun.ogg',
|
"Shotgun Firing" = 'sound/weapons/gunshot_shotgun.ogg',
|
||||||
"Handgun Firing" = 'sound/weapons/Gunshot2.ogg',
|
"Handgun Firing" = 'sound/weapons/Gunshot2.ogg',
|
||||||
"Machinegun Firing" = 'sound/weapons/Gunshot_machinegun.ogg',
|
"Machinegun Firing" = 'sound/weapons/gunshot_machinegun.ogg',
|
||||||
"Rocket Launcher Firing"= 'sound/weapons/rpg.ogg',
|
"Rocket Launcher Firing"= 'sound/weapons/rpg.ogg',
|
||||||
"Taser Firing" = 'sound/weapons/Taser.ogg',
|
"Taser Firing" = 'sound/weapons/taser.ogg',
|
||||||
"Laser Gun Firing" = 'sound/weapons/laser.ogg',
|
"Laser Gun Firing" = 'sound/weapons/laser.ogg',
|
||||||
"E-Luger Firing" = 'sound/weapons/eLuger.ogg',
|
"E-Luger Firing" = 'sound/weapons/eLuger.ogg',
|
||||||
"Xray Gun Firing" = 'sound/weapons/laser3.ogg',
|
"Xray Gun Firing" = 'sound/weapons/laser3.ogg',
|
||||||
|
|||||||
@@ -399,7 +399,7 @@
|
|||||||
user.set_machine(src)
|
user.set_machine(src)
|
||||||
var/dat = ""
|
var/dat = ""
|
||||||
if(gameStatus == ORION_STATUS_GAMEOVER)
|
if(gameStatus == ORION_STATUS_GAMEOVER)
|
||||||
playsound(src, 'sound/arcade/Ori_fail.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
|
playsound(src, 'sound/arcade/ori_fail.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
|
||||||
dat = "<center><h1>Game Over</h1></center>"
|
dat = "<center><h1>Game Over</h1></center>"
|
||||||
dat += "Like many before you, your crew never made it to Orion, lost to space... <br><b>forever</b>."
|
dat += "Like many before you, your crew never made it to Orion, lost to space... <br><b>forever</b>."
|
||||||
if(settlers.len == 0)
|
if(settlers.len == 0)
|
||||||
@@ -534,7 +534,7 @@
|
|||||||
|
|
||||||
else if(href_list["newgame"]) //Reset everything
|
else if(href_list["newgame"]) //Reset everything
|
||||||
if(gameStatus == ORION_STATUS_START)
|
if(gameStatus == ORION_STATUS_START)
|
||||||
playsound(src, 'sound/arcade/Ori_begin.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
|
playsound(src, 'sound/arcade/ori_begin.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
|
||||||
newgame(usr)
|
newgame(usr)
|
||||||
else if(href_list["menu"]) //back to the main menu
|
else if(href_list["menu"]) //back to the main menu
|
||||||
if(gameStatus == ORION_STATUS_GAMEOVER)
|
if(gameStatus == ORION_STATUS_GAMEOVER)
|
||||||
@@ -1009,7 +1009,7 @@
|
|||||||
/obj/machinery/computer/arcade/orion_trail/proc/win(var/mob/user)
|
/obj/machinery/computer/arcade/orion_trail/proc/win(var/mob/user)
|
||||||
gameStatus = ORION_STATUS_START
|
gameStatus = ORION_STATUS_START
|
||||||
src.visible_message("\The [src] plays a triumpant tune, stating 'CONGRATULATIONS, YOU HAVE MADE IT TO ORION.'")
|
src.visible_message("\The [src] plays a triumpant tune, stating 'CONGRATULATIONS, YOU HAVE MADE IT TO ORION.'")
|
||||||
playsound(src, 'sound/arcade/Ori_win.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
|
playsound(src, 'sound/arcade/ori_win.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
|
||||||
if(emagged)
|
if(emagged)
|
||||||
new /obj/item/orion_ship(src.loc)
|
new /obj/item/orion_ship(src.loc)
|
||||||
message_admins("[key_name_admin(user)] made it to Orion on an emagged machine and got an explosive toy ship.")
|
message_admins("[key_name_admin(user)] made it to Orion on an emagged machine and got an explosive toy ship.")
|
||||||
@@ -1302,11 +1302,11 @@
|
|||||||
G.activate()
|
G.activate()
|
||||||
G.throw_at(get_turf(user),10,10) /// Play stupid games, win stupid prizes.
|
G.throw_at(get_turf(user),10,10) /// Play stupid games, win stupid prizes.
|
||||||
|
|
||||||
playsound(src, 'sound/arcade/Ori_win.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
|
playsound(src, 'sound/arcade/ori_win.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
|
||||||
winprob = 0
|
winprob = 0
|
||||||
|
|
||||||
else
|
else
|
||||||
playsound(src, 'sound/arcade/Ori_fail.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
|
playsound(src, 'sound/arcade/ori_fail.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
|
||||||
winscreen = "Aw, shucks. Try again!"
|
winscreen = "Aw, shucks. Try again!"
|
||||||
wintick = 0
|
wintick = 0
|
||||||
gamepaid = 0
|
gamepaid = 0
|
||||||
|
|||||||
@@ -373,7 +373,7 @@
|
|||||||
lethal_projectile = /obj/item/projectile/beam/xray
|
lethal_projectile = /obj/item/projectile/beam/xray
|
||||||
projectile = /obj/item/projectile/beam/stun // Otherwise we fire xrays on both modes.
|
projectile = /obj/item/projectile/beam/stun // Otherwise we fire xrays on both modes.
|
||||||
lethal_shot_sound = 'sound/weapons/eluger.ogg'
|
lethal_shot_sound = 'sound/weapons/eluger.ogg'
|
||||||
shot_sound = 'sound/weapons/Taser.ogg'
|
shot_sound = 'sound/weapons/taser.ogg'
|
||||||
|
|
||||||
/obj/machinery/porta_turret/proc/isLocked(mob/user)
|
/obj/machinery/porta_turret/proc/isLocked(mob/user)
|
||||||
if(locked && !issilicon(user))
|
if(locked && !issilicon(user))
|
||||||
|
|||||||
@@ -136,7 +136,7 @@
|
|||||||
icon_state = "mecha_uac2"
|
icon_state = "mecha_uac2"
|
||||||
equip_cooldown = 60 // 6 seconds
|
equip_cooldown = 60 // 6 seconds
|
||||||
projectile = /obj/item/projectile/bullet/cannon
|
projectile = /obj/item/projectile/bullet/cannon
|
||||||
fire_sound = 'sound/weapons/Gunshot_cannon.ogg'
|
fire_sound = 'sound/weapons/gunshot_cannon.ogg'
|
||||||
projectiles = 1
|
projectiles = 1
|
||||||
projectile_energy_cost = 1000
|
projectile_energy_cost = 1000
|
||||||
salvageable = 0 // We don't want players ripping this off a dead mech. Could potentially be a prize for beating it if Devs bless me and someone offers a nerf idea.
|
salvageable = 0 // We don't want players ripping this off a dead mech. Could potentially be a prize for beating it if Devs bless me and someone offers a nerf idea.
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
icon_state = "mecha_uac2"
|
icon_state = "mecha_uac2"
|
||||||
equip_cooldown = 10
|
equip_cooldown = 10
|
||||||
projectile = /obj/item/projectile/bullet/pistol/medium
|
projectile = /obj/item/projectile/bullet/pistol/medium
|
||||||
fire_sound = 'sound/weapons/UAC2.ogg'
|
fire_sound = 'sound/weapons/gunshot_machinegun.ogg'
|
||||||
projectiles = 300 //10 bursts, matching the Scattershot's 10. Also, conveniently, doesn't eat your powercell when reloading like 300 bullets does. //CHOMPEdit: Literally factually incorrect. You reloading 300 rounds is the same as reloading 30 rounds 10 times. Resetting this back to 300.
|
projectiles = 300 //10 bursts, matching the Scattershot's 10. Also, conveniently, doesn't eat your powercell when reloading like 300 bullets does. //CHOMPEdit: Literally
|
||||||
projectiles_per_shot = 3
|
projectiles_per_shot = 3
|
||||||
deviation = 0.3
|
deviation = 0.3
|
||||||
projectile_energy_cost = 20
|
projectile_energy_cost = 20
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
description_info = "This weapon cannot be fired indoors, underground, or on-station."
|
description_info = "This weapon cannot be fired indoors, underground, or on-station."
|
||||||
icon_state = "mecha_mortar"
|
icon_state = "mecha_mortar"
|
||||||
equip_cooldown = 30
|
equip_cooldown = 30
|
||||||
fire_sound = 'sound/weapons/Gunshot_cannon.ogg'
|
fire_sound = 'sound/weapons/gunshot_cannon.ogg'
|
||||||
fire_volume = 100
|
fire_volume = 100
|
||||||
projectiles = 3
|
projectiles = 3
|
||||||
deviation = 0.6
|
deviation = 0.6
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
icon_state = "mecha_scatter"
|
icon_state = "mecha_scatter"
|
||||||
equip_cooldown = 20
|
equip_cooldown = 20
|
||||||
projectile = /obj/item/projectile/bullet/pellet/shotgun/flak
|
projectile = /obj/item/projectile/bullet/pellet/shotgun/flak
|
||||||
fire_sound = 'sound/weapons/LBX10.ogg'
|
fire_sound = 'sound/weapons/gunshot_shotgun.ogg'
|
||||||
fire_volume = 80
|
fire_volume = 80
|
||||||
projectiles = 40
|
projectiles = 40
|
||||||
projectiles_per_shot = 4
|
projectiles_per_shot = 4
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
icon_state = "mecha_phase"
|
icon_state = "mecha_phase"
|
||||||
energy_drain = 25
|
energy_drain = 25
|
||||||
projectile = /obj/item/projectile/energy/phase/heavy
|
projectile = /obj/item/projectile/energy/phase/heavy
|
||||||
fire_sound = 'sound/weapons/Taser.ogg'
|
fire_sound = 'sound/weapons/taser.ogg'
|
||||||
|
|
||||||
equip_type = EQUIP_UTILITY
|
equip_type = EQUIP_UTILITY
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
energy_drain = 20
|
energy_drain = 20
|
||||||
equip_cooldown = 8
|
equip_cooldown = 8
|
||||||
projectile = /obj/item/projectile/beam/stun
|
projectile = /obj/item/projectile/beam/stun
|
||||||
fire_sound = 'sound/weapons/Taser.ogg'
|
fire_sound = 'sound/weapons/taser.ogg'
|
||||||
|
|
||||||
/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser/rigged
|
/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser/rigged
|
||||||
name = "jury-rigged static rifle"
|
name = "jury-rigged static rifle"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
icon_state = "mecha_drac3"
|
icon_state = "mecha_drac3"
|
||||||
equip_cooldown = 20
|
equip_cooldown = 20
|
||||||
projectile = /obj/item/projectile/bullet/incendiary
|
projectile = /obj/item/projectile/bullet/incendiary
|
||||||
fire_sound = 'sound/weapons/Gunshot_machinegun.ogg'
|
fire_sound = 'sound/weapons/gunshot_machinegun.ogg'
|
||||||
projectiles = 30
|
projectiles = 30
|
||||||
projectiles_per_shot = 2
|
projectiles_per_shot = 2
|
||||||
deviation = 0.4
|
deviation = 0.4
|
||||||
|
|||||||
@@ -2019,13 +2019,13 @@
|
|||||||
if(MECH_FACTION_NT)//The good guys category
|
if(MECH_FACTION_NT)//The good guys category
|
||||||
if(firstactivation)//First time = long activation sound
|
if(firstactivation)//First time = long activation sound
|
||||||
firstactivation = 1
|
firstactivation = 1
|
||||||
who << sound('sound/mecha/LongNanoActivation.ogg',volume=50)
|
who << sound('sound/mecha/longnanoactivation.ogg',volume=50)
|
||||||
else
|
else
|
||||||
who << sound('sound/mecha/nominalnano.ogg',volume=50)
|
who << sound('sound/mecha/nominalnano.ogg',volume=50)
|
||||||
if(MECH_FACTION_SYNDI)//Bad guys
|
if(MECH_FACTION_SYNDI)//Bad guys
|
||||||
if(firstactivation)
|
if(firstactivation)
|
||||||
firstactivation = 1
|
firstactivation = 1
|
||||||
who << sound('sound/mecha/LongSyndiActivation.ogg',volume=50)
|
who << sound('sound/mecha/longsyndiactivation.ogg',volume=50)
|
||||||
else
|
else
|
||||||
who << sound('sound/mecha/nominalsyndi.ogg',volume=50)
|
who << sound('sound/mecha/nominalsyndi.ogg',volume=50)
|
||||||
else//Everyone else gets the normal noise
|
else//Everyone else gets the normal noise
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
energy_drain = 40
|
energy_drain = 40
|
||||||
equip_cooldown = 10
|
equip_cooldown = 10
|
||||||
projectile = /obj/item/projectile/beam/stun
|
projectile = /obj/item/projectile/beam/stun
|
||||||
fire_sound = 'sound/weapons/Taser.ogg'
|
fire_sound = 'sound/weapons/taser.ogg'
|
||||||
equip_type = EQUIP_MICRO_WEAPON
|
equip_type = EQUIP_MICRO_WEAPON
|
||||||
required_type = list(/obj/mecha/micro/sec)
|
required_type = list(/obj/mecha/micro/sec)
|
||||||
|
|
||||||
@@ -52,7 +52,7 @@
|
|||||||
equip_cooldown = 15
|
equip_cooldown = 15
|
||||||
var/mode = 0 //0 - buckshot, 1 - beanbag, 2 - slug.
|
var/mode = 0 //0 - buckshot, 1 - beanbag, 2 - slug.
|
||||||
projectile = /obj/item/projectile/bullet/pellet/shotgun
|
projectile = /obj/item/projectile/bullet/pellet/shotgun
|
||||||
fire_sound = 'sound/weapons/Gunshot_shotgun.ogg'
|
fire_sound = 'sound/weapons/gunshot_shotgun.ogg'
|
||||||
fire_volume = 80
|
fire_volume = 80
|
||||||
projectiles = 6
|
projectiles = 6
|
||||||
projectiles_per_shot = 1
|
projectiles_per_shot = 1
|
||||||
|
|||||||
@@ -82,20 +82,20 @@
|
|||||||
|
|
||||||
/obj/effect/map_effect/interval/sound_emitter/ballistic_gunfight
|
/obj/effect/map_effect/interval/sound_emitter/ballistic_gunfight
|
||||||
sounds_to_play = list(
|
sounds_to_play = list(
|
||||||
'sound/weapons/Gunshot1.ogg',
|
'sound/weapons/gunshot1.ogg',
|
||||||
'sound/weapons/Gunshot_deagle.ogg',
|
'sound/weapons/gunshot_deagle.ogg',
|
||||||
'sound/weapons/Gunshot_generic_rifle.ogg',
|
'sound/weapons/gunshot_generic_rifle.ogg',
|
||||||
'sound/weapons/Gunshot_sniper.ogg',
|
'sound/weapons/gunshot_sniper.ogg',
|
||||||
'sound/weapons/Gunshot_shotgun.ogg',
|
'sound/weapons/gunshot_shotgun.ogg',
|
||||||
'sound/weapons/Gunshot3.ogg',
|
'sound/weapons/Gunshot3.ogg',
|
||||||
'sound/weapons/Gunshot_machinegun.ogg'
|
'sound/weapons/gunshot_machinegun.ogg'
|
||||||
)
|
)
|
||||||
interval_lower_bound = 5
|
interval_lower_bound = 5
|
||||||
interval_upper_bound = 2 SECONDS
|
interval_upper_bound = 2 SECONDS
|
||||||
|
|
||||||
/obj/effect/map_effect/interval/sound_emitter/energy_gunfight
|
/obj/effect/map_effect/interval/sound_emitter/energy_gunfight
|
||||||
sounds_to_play = list(
|
sounds_to_play = list(
|
||||||
'sound/weapons/Taser.ogg',
|
'sound/weapons/taser.ogg',
|
||||||
'sound/weapons/laser.ogg',
|
'sound/weapons/laser.ogg',
|
||||||
'sound/weapons/eLuger.ogg',
|
'sound/weapons/eLuger.ogg',
|
||||||
'sound/weapons/laser3.ogg',
|
'sound/weapons/laser3.ogg',
|
||||||
|
|||||||
@@ -477,7 +477,7 @@
|
|||||||
|
|
||||||
user.visible_message(span_danger(span_italics("\The [user] shocks [H] with \the [src]!")), span_warning("You shock [H] with \the [src]!"))
|
user.visible_message(span_danger(span_italics("\The [user] shocks [H] with \the [src]!")), span_warning("You shock [H] with \the [src]!"))
|
||||||
playsound(src, 'sound/machines/defib_zap.ogg', 100, 1, -1)
|
playsound(src, 'sound/machines/defib_zap.ogg', 100, 1, -1)
|
||||||
playsound(src, 'sound/weapons/Egloves.ogg', 100, 1, -1)
|
playsound(src, 'sound/weapons/egloves.ogg', 100, 1, -1)
|
||||||
set_cooldown(cooldowntime)
|
set_cooldown(cooldowntime)
|
||||||
|
|
||||||
H.stun_effect_act(2, 120, target_zone)
|
H.stun_effect_act(2, 120, target_zone)
|
||||||
|
|||||||
@@ -393,7 +393,7 @@
|
|||||||
modifystate = "egunstun"
|
modifystate = "egunstun"
|
||||||
|
|
||||||
firemodes = list(
|
firemodes = list(
|
||||||
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun/med, modifystate="egunstun", fire_sound='sound/weapons/Taser.ogg', charge_cost = 240),
|
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun/med, modifystate="egunstun", fire_sound='sound/weapons/taser.ogg', charge_cost = 240),
|
||||||
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="egunkill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 480),
|
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="egunkill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 480),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
/obj/item/latexballon/proc/burst()
|
/obj/item/latexballon/proc/burst()
|
||||||
if (!air_contents)
|
if (!air_contents)
|
||||||
return
|
return
|
||||||
playsound(src, 'sound/weapons/Gunshot_old.ogg', 100, 1)
|
playsound(src, 'sound/weapons/gunshot_old.ogg', 100, 1)
|
||||||
icon_state = "latexballon_bursted"
|
icon_state = "latexballon_bursted"
|
||||||
item_state = "lgloves"
|
item_state = "lgloves"
|
||||||
loc.assume_air(air_contents)
|
loc.assume_air(air_contents)
|
||||||
|
|||||||
@@ -94,7 +94,7 @@
|
|||||||
return 0
|
return 0
|
||||||
//Otherwise, if we're here, we're gonna stop the attack entirely.
|
//Otherwise, if we're here, we're gonna stop the attack entirely.
|
||||||
user.visible_message(span_danger("\The [user] blocks [attack_text] with \the [src]!"))
|
user.visible_message(span_danger("\The [user] blocks [attack_text] with \the [src]!"))
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
return 1
|
return 1
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
|||||||
@@ -201,7 +201,7 @@
|
|||||||
target.visible_message(span_danger("[target] has been prodded in the [affecting.name] with [src] by [user]!"))
|
target.visible_message(span_danger("[target] has been prodded in the [affecting.name] with [src] by [user]!"))
|
||||||
else
|
else
|
||||||
target.visible_message(span_danger("[target] has been prodded with [src] by [user]!"))
|
target.visible_message(span_danger("[target] has been prodded with [src] by [user]!"))
|
||||||
playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1)
|
playsound(src, 'sound/weapons/egloves.ogg', 50, 1, -1)
|
||||||
|
|
||||||
//stun effects
|
//stun effects
|
||||||
if(status)
|
if(status)
|
||||||
|
|||||||
@@ -454,7 +454,7 @@ var/list/global/tank_gauge_cache = list()
|
|||||||
if(!T)
|
if(!T)
|
||||||
return
|
return
|
||||||
T.assume_air(air_contents)
|
T.assume_air(air_contents)
|
||||||
playsound(src, 'sound/weapons/Gunshot_shotgun.ogg', 20, 1)
|
playsound(src, 'sound/weapons/gunshot_shotgun.ogg', 20, 1)
|
||||||
visible_message("[icon2html(src,viewers(src))] " + span_danger("\The [src] flies apart!"), span_warning("You hear a bang!"))
|
visible_message("[icon2html(src,viewers(src))] " + span_danger("\The [src] flies apart!"), span_warning("You hear a bang!"))
|
||||||
T.hotspot_expose(air_contents.temperature, 70, 1)
|
T.hotspot_expose(air_contents.temperature, 70, 1)
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
if(R.use(1)) // Cost of roofing tiles is 1:1 with cost to place lattice and plating
|
if(R.use(1)) // Cost of roofing tiles is 1:1 with cost to place lattice and plating
|
||||||
T.ReplaceWithLattice()
|
T.ReplaceWithLattice()
|
||||||
T.ChangeTurf(/turf/simulated/floor, preserve_outdoors = TRUE)
|
T.ChangeTurf(/turf/simulated/floor, preserve_outdoors = TRUE)
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
user.visible_message(span_notice("[user] patches a hole in the ceiling."), span_notice("You patch a hole in the ceiling."))
|
user.visible_message(span_notice("[user] patches a hole in the ceiling."), span_notice("You patch a hole in the ceiling."))
|
||||||
expended_tile = TRUE
|
expended_tile = TRUE
|
||||||
else
|
else
|
||||||
@@ -52,7 +52,7 @@
|
|||||||
if(A && !A.is_outdoors())
|
if(A && !A.is_outdoors())
|
||||||
if(expended_tile || R.use(1))
|
if(expended_tile || R.use(1))
|
||||||
make_indoors()
|
make_indoors()
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
user.visible_message(span_notice("[user] roofs a tile, shielding it from the elements."), span_notice("You roof this tile, shielding it from the elements."))
|
user.visible_message(span_notice("[user] roofs a tile, shielding it from the elements."), span_notice("You roof this tile, shielding it from the elements."))
|
||||||
break
|
break
|
||||||
return
|
return
|
||||||
@@ -78,7 +78,7 @@
|
|||||||
if (S.get_amount() < 1)
|
if (S.get_amount() < 1)
|
||||||
return
|
return
|
||||||
S.use(1)
|
S.use(1)
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
ChangeTurf(/turf/simulated/floor, preserve_outdoors = TRUE)
|
ChangeTurf(/turf/simulated/floor, preserve_outdoors = TRUE)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,7 @@
|
|||||||
var/obj/item/stack/rods/R = C
|
var/obj/item/stack/rods/R = C
|
||||||
if (R.use(1))
|
if (R.use(1))
|
||||||
to_chat(user, span_notice("Constructing support lattice ..."))
|
to_chat(user, span_notice("Constructing support lattice ..."))
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
new/obj/structure/lattice(src)
|
new/obj/structure/lattice(src)
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
if (S.get_amount() < 1)
|
if (S.get_amount() < 1)
|
||||||
return
|
return
|
||||||
qdel(L)
|
qdel(L)
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
S.use(1)
|
S.use(1)
|
||||||
ChangeTurf(/turf/simulated/floor/airless)
|
ChangeTurf(/turf/simulated/floor/airless)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -87,7 +87,7 @@
|
|||||||
if(!can_open)
|
if(!can_open)
|
||||||
if(!material.wall_touch_special(src, user))
|
if(!material.wall_touch_special(src, user))
|
||||||
to_chat(user, span_notice("You push the wall, but nothing happens."))
|
to_chat(user, span_notice("You push the wall, but nothing happens."))
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 25, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 25, 1)
|
||||||
else
|
else
|
||||||
toggle_open(user)
|
toggle_open(user)
|
||||||
return 0
|
return 0
|
||||||
@@ -174,7 +174,7 @@
|
|||||||
if(R.use(1)) // Cost of roofing tiles is 1:1 with cost to place lattice and plating
|
if(R.use(1)) // Cost of roofing tiles is 1:1 with cost to place lattice and plating
|
||||||
T.ReplaceWithLattice()
|
T.ReplaceWithLattice()
|
||||||
T.ChangeTurf(/turf/simulated/floor, preserve_outdoors = TRUE)
|
T.ChangeTurf(/turf/simulated/floor, preserve_outdoors = TRUE)
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
user.visible_message(span_notice("[user] patches a hole in the ceiling."), span_notice("You patch a hole in the ceiling."))
|
user.visible_message(span_notice("[user] patches a hole in the ceiling."), span_notice("You patch a hole in the ceiling."))
|
||||||
expended_tile = TRUE
|
expended_tile = TRUE
|
||||||
else
|
else
|
||||||
@@ -186,7 +186,7 @@
|
|||||||
if(expended_tile || R.use(1)) // Don't need to check adjacent turfs for a wall, we're building on one
|
if(expended_tile || R.use(1)) // Don't need to check adjacent turfs for a wall, we're building on one
|
||||||
make_indoors()
|
make_indoors()
|
||||||
if(!expended_tile) // Would've already played a sound
|
if(!expended_tile) // Would've already played a sound
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
user.visible_message(span_notice("[user] roofs \the [src], shielding it from the elements."), span_notice("You roof \the [src] tile, shielding it from the elements."))
|
user.visible_message(span_notice("[user] roofs \the [src], shielding it from the elements."), span_notice("You roof \the [src] tile, shielding it from the elements."))
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -89,7 +89,7 @@
|
|||||||
var/obj/item/stack/rods/R = C
|
var/obj/item/stack/rods/R = C
|
||||||
if (R.use(1))
|
if (R.use(1))
|
||||||
to_chat(user, span_notice("Constructing support lattice ..."))
|
to_chat(user, span_notice("Constructing support lattice ..."))
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
ReplaceWithLattice()
|
ReplaceWithLattice()
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -100,7 +100,7 @@
|
|||||||
if (S.get_amount() < 1)
|
if (S.get_amount() < 1)
|
||||||
return
|
return
|
||||||
qdel(L)
|
qdel(L)
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
S.use(1)
|
S.use(1)
|
||||||
ChangeTurf(/turf/simulated/floor/airless)
|
ChangeTurf(/turf/simulated/floor/airless)
|
||||||
return
|
return
|
||||||
@@ -125,7 +125,7 @@
|
|||||||
if(R.use(1)) // Cost of roofing tiles is 1:1 with cost to place lattice and plating
|
if(R.use(1)) // Cost of roofing tiles is 1:1 with cost to place lattice and plating
|
||||||
T.ReplaceWithLattice()
|
T.ReplaceWithLattice()
|
||||||
T.ChangeTurf(/turf/simulated/floor)
|
T.ChangeTurf(/turf/simulated/floor)
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
user.visible_message(span_notice("[user] expands the ceiling."), span_notice("You expand the ceiling."))
|
user.visible_message(span_notice("[user] expands the ceiling."), span_notice("You expand the ceiling."))
|
||||||
else
|
else
|
||||||
to_chat(user, span_warning("There aren't any holes in the ceiling to patch here."))
|
to_chat(user, span_warning("There aren't any holes in the ceiling to patch here."))
|
||||||
|
|||||||
@@ -498,7 +498,7 @@
|
|||||||
|
|
||||||
for (var/mob/T as mob in mob_list)
|
for (var/mob/T as mob in mob_list)
|
||||||
to_chat(T, "<br><center>" + span_filter_system(span_notice(span_bold(span_huge("Man up.<br> Deal with it.")) + "<br>Move along.")) + "</center><br>")
|
to_chat(T, "<br><center>" + span_filter_system(span_notice(span_bold(span_huge("Man up.<br> Deal with it.")) + "<br>Move along.")) + "</center><br>")
|
||||||
T << 'sound/voice/ManUp1.ogg'
|
T << 'sound/voice/manup1.ogg'
|
||||||
|
|
||||||
log_admin("[key_name(usr)] told everyone to man up and deal with it.")
|
log_admin("[key_name(usr)] told everyone to man up and deal with it.")
|
||||||
message_admins(span_blue("[key_name_admin(usr)] told everyone to man up and deal with it."), 1)
|
message_admins(span_blue("[key_name_admin(usr)] told everyone to man up and deal with it."), 1)
|
||||||
|
|||||||
@@ -74,8 +74,8 @@
|
|||||||
say_stand_down = list("Good.")
|
say_stand_down = list("Good.")
|
||||||
say_escalate = list("Your funeral!", "Bring it!")
|
say_escalate = list("Your funeral!", "Bring it!")
|
||||||
|
|
||||||
threaten_sound = 'sound/weapons/TargetOn.ogg'
|
threaten_sound = 'sound/weapons/targeton.ogg'
|
||||||
stand_down_sound = 'sound/weapons/TargetOff.ogg'
|
stand_down_sound = 'sound/weapons/targetoff.ogg'
|
||||||
|
|
||||||
/datum/say_list/malf_drone
|
/datum/say_list/malf_drone
|
||||||
speak = list("ALERT.","Hostile-ile-ile entities dee-twhoooo-wected.","Threat parameterszzzz- szzet.","Bring sub-sub-sub-systems uuuup to combat alert alpha-a-a.")
|
speak = list("ALERT.","Hostile-ile-ile entities dee-twhoooo-wected.","Threat parameterszzzz- szzet.","Bring sub-sub-sub-systems uuuup to combat alert alpha-a-a.")
|
||||||
@@ -93,8 +93,8 @@
|
|||||||
stand_down_sound = 'sound/effects/turret/move2.wav'
|
stand_down_sound = 'sound/effects/turret/move2.wav'
|
||||||
|
|
||||||
/datum/say_list/mercenary
|
/datum/say_list/mercenary
|
||||||
threaten_sound = 'sound/weapons/TargetOn.ogg'
|
threaten_sound = 'sound/weapons/targeton.ogg'
|
||||||
stand_down_sound = 'sound/weapons/TargetOff.ogg'
|
stand_down_sound = 'sound/weapons/targetoff.ogg'
|
||||||
|
|
||||||
|
|
||||||
/datum/say_list/crab
|
/datum/say_list/crab
|
||||||
|
|||||||
@@ -413,7 +413,7 @@
|
|||||||
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 4)
|
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 4)
|
||||||
matter = list()
|
matter = list()
|
||||||
|
|
||||||
fire_sound = 'sound/weapons/Gunshot1.ogg'
|
fire_sound = 'sound/weapons/gunshot1.ogg'
|
||||||
projectile_type = /obj/item/projectile/chameleon
|
projectile_type = /obj/item/projectile/chameleon
|
||||||
charge_meter = 0
|
charge_meter = 0
|
||||||
charge_cost = 48 //uses next to no power, since it's just holograms
|
charge_cost = 48 //uses next to no power, since it's just holograms
|
||||||
|
|||||||
@@ -157,7 +157,7 @@
|
|||||||
key = "bhiss"
|
key = "bhiss"
|
||||||
emote_message_3p_target = "hisses at TARGET."
|
emote_message_3p_target = "hisses at TARGET."
|
||||||
emote_message_3p = "hisses."
|
emote_message_3p = "hisses."
|
||||||
emote_sound = 'sound/voice/BugHiss.ogg'
|
emote_sound = 'sound/voice/bughiss.ogg'
|
||||||
|
|
||||||
/decl/emote/audible/bug_buzz
|
/decl/emote/audible/bug_buzz
|
||||||
key = "bbuzz"
|
key = "bbuzz"
|
||||||
@@ -167,7 +167,7 @@
|
|||||||
/decl/emote/audible/bug_chitter
|
/decl/emote/audible/bug_chitter
|
||||||
key = "chitter"
|
key = "chitter"
|
||||||
emote_message_3p = "chitters."
|
emote_message_3p = "chitters."
|
||||||
emote_sound = 'sound/voice/Bug.ogg'
|
emote_sound = 'sound/voice/bug.ogg'
|
||||||
|
|
||||||
/decl/emote/audible/roar
|
/decl/emote/audible/roar
|
||||||
key = "roar"
|
key = "roar"
|
||||||
|
|||||||
@@ -109,17 +109,17 @@
|
|||||||
/decl/emote/audible/snort
|
/decl/emote/audible/snort
|
||||||
key = "snort"
|
key = "snort"
|
||||||
emote_message_3p = "snorts!"
|
emote_message_3p = "snorts!"
|
||||||
emote_sound = 'sound/voice/Snort.ogg'
|
emote_sound = 'sound/voice/snort.ogg'
|
||||||
sound_vary = FALSE
|
sound_vary = FALSE
|
||||||
/decl/emote/audible/meow
|
/decl/emote/audible/meow
|
||||||
key = "meow"
|
key = "meow"
|
||||||
emote_message_3p = "gently meows!"
|
emote_message_3p = "gently meows!"
|
||||||
emote_sound = 'sound/voice/Meow.ogg'
|
emote_sound = 'sound/voice/meow.ogg'
|
||||||
sound_vary = FALSE
|
sound_vary = FALSE
|
||||||
/decl/emote/audible/moo
|
/decl/emote/audible/moo
|
||||||
key = "moo"
|
key = "moo"
|
||||||
emote_message_3p = "takes a breath and lets out a moo."
|
emote_message_3p = "takes a breath and lets out a moo."
|
||||||
emote_sound = 'sound/voice/Moo.ogg'
|
emote_sound = 'sound/voice/moo.ogg'
|
||||||
/decl/emote/audible/croak
|
/decl/emote/audible/croak
|
||||||
key = "croak"
|
key = "croak"
|
||||||
emote_message_3p = "rumbles their throat, puffs their cheeks and croaks."
|
emote_message_3p = "rumbles their throat, puffs their cheeks and croaks."
|
||||||
@@ -131,7 +131,7 @@
|
|||||||
/decl/emote/audible/cackle
|
/decl/emote/audible/cackle
|
||||||
key = "cackle"
|
key = "cackle"
|
||||||
emote_message_3p = "cackles hysterically!"
|
emote_message_3p = "cackles hysterically!"
|
||||||
emote_sound = 'sound/voice/YeenCackle.ogg'
|
emote_sound = 'sound/voice/yeencackle.ogg'
|
||||||
/decl/emote/audible/spiderchitter
|
/decl/emote/audible/spiderchitter
|
||||||
key = "spiderchitter"
|
key = "spiderchitter"
|
||||||
emote_message_3p = "chitters."
|
emote_message_3p = "chitters."
|
||||||
@@ -247,4 +247,4 @@
|
|||||||
/decl/emote/audible/dook
|
/decl/emote/audible/dook
|
||||||
key = "dook"
|
key = "dook"
|
||||||
emote_message_3p = "dooks."
|
emote_message_3p = "dooks."
|
||||||
emote_sound = 'sound/voice/FerretDook.ogg'
|
emote_sound = 'sound/voice/ferretdook.ogg'
|
||||||
|
|||||||
@@ -25,10 +25,10 @@
|
|||||||
var/default_program = "Empty Court"
|
var/default_program = "Empty Court"
|
||||||
|
|
||||||
var/list/supported_programs = list(
|
var/list/supported_programs = list(
|
||||||
"Empty Court" = new/datum/holodeck_program(/area/holodeck/source_emptycourt, list('sound/music/THUNDERDOME.ogg')),
|
"Empty Court" = new/datum/holodeck_program(/area/holodeck/source_emptycourt, list('sound/music/thunderdome.ogg')),
|
||||||
"Boxing Ring" = new/datum/holodeck_program(/area/holodeck/source_boxingcourt, list('sound/music/THUNDERDOME.ogg')),
|
"Boxing Ring" = new/datum/holodeck_program(/area/holodeck/source_boxingcourt, list('sound/music/thunderdome.ogg')),
|
||||||
"Basketball" = new/datum/holodeck_program(/area/holodeck/source_basketball, list('sound/music/THUNDERDOME.ogg')),
|
"Basketball" = new/datum/holodeck_program(/area/holodeck/source_basketball, list('sound/music/thunderdome.ogg')),
|
||||||
"Thunderdome" = new/datum/holodeck_program(/area/holodeck/source_thunderdomecourt, list('sound/music/THUNDERDOME.ogg')),
|
"Thunderdome" = new/datum/holodeck_program(/area/holodeck/source_thunderdomecourt, list('sound/music/thunderdome.ogg')),
|
||||||
"Beach" = new/datum/holodeck_program(/area/holodeck/source_beach),
|
"Beach" = new/datum/holodeck_program(/area/holodeck/source_beach),
|
||||||
"Desert" = new/datum/holodeck_program(/area/holodeck/source_desert,
|
"Desert" = new/datum/holodeck_program(/area/holodeck/source_desert,
|
||||||
list(
|
list(
|
||||||
|
|||||||
@@ -182,7 +182,7 @@
|
|||||||
var/thrown_bonus = thrown? (src.thrown_bonus * (!ishuman(L)? 1 : human_damage_nerf)) : 0
|
var/thrown_bonus = thrown? (src.thrown_bonus * (!ishuman(L)? 1 : human_damage_nerf)) : 0
|
||||||
if(thrown? (get_dir(src, L) & L.dir) : ((user.dir & backstab_dir) && (L.dir & backstab_dir)))
|
if(thrown? (get_dir(src, L) & L.dir) : ((user.dir & backstab_dir) && (L.dir & backstab_dir)))
|
||||||
L.apply_damage(detonation_damage + backstab_bonus + thrown_bonus, BRUTE, blocked = def_check)
|
L.apply_damage(detonation_damage + backstab_bonus + thrown_bonus, BRUTE, blocked = def_check)
|
||||||
playsound(src, 'sound/weapons/Kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong
|
playsound(src, 'sound/weapons/kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong
|
||||||
else
|
else
|
||||||
L.apply_damage(detonation_damage + thrown_bonus, BRUTE, blocked = def_check)
|
L.apply_damage(detonation_damage + thrown_bonus, BRUTE, blocked = def_check)
|
||||||
|
|
||||||
|
|||||||
@@ -417,7 +417,7 @@ var/list/mining_overlay_cache = list()
|
|||||||
var/obj/item/stack/tile/floor/S = W
|
var/obj/item/stack/tile/floor/S = W
|
||||||
if (S.get_amount() < 1)
|
if (S.get_amount() < 1)
|
||||||
return
|
return
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
ChangeTurf(/turf/simulated/floor)
|
ChangeTurf(/turf/simulated/floor)
|
||||||
S.use(1)
|
S.use(1)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
if(emagged)
|
if(emagged)
|
||||||
projectile = /obj/item/projectile/beam/shock
|
projectile = /obj/item/projectile/beam/shock
|
||||||
|
|
||||||
playsound(src, emagged ? 'sound/weapons/laser3.ogg' : 'sound/weapons/Taser.ogg', 50, 1)
|
playsound(src, emagged ? 'sound/weapons/laser3.ogg' : 'sound/weapons/taser.ogg', 50, 1)
|
||||||
var/obj/item/projectile/P = new projectile(loc)
|
var/obj/item/projectile/P = new projectile(loc)
|
||||||
|
|
||||||
P.firer = src
|
P.firer = src
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
if(emagged)
|
if(emagged)
|
||||||
projectile = /obj/item/projectile/beam
|
projectile = /obj/item/projectile/beam
|
||||||
|
|
||||||
playsound(src, emagged ? 'sound/weapons/Laser.ogg' : 'sound/weapons/Taser.ogg', 50, 1)
|
playsound(src, emagged ? 'sound/weapons/Laser.ogg' : 'sound/weapons/taser.ogg', 50, 1)
|
||||||
var/obj/item/projectile/P = new projectile(loc)
|
var/obj/item/projectile/P = new projectile(loc)
|
||||||
|
|
||||||
P.firer = src
|
P.firer = src
|
||||||
|
|||||||
@@ -324,7 +324,7 @@
|
|||||||
cuff = FALSE
|
cuff = FALSE
|
||||||
if(!cuff)
|
if(!cuff)
|
||||||
H.stun_effect_act(0, stun_strength, null)
|
H.stun_effect_act(0, stun_strength, null)
|
||||||
playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1)
|
playsound(src, 'sound/weapons/egloves.ogg', 50, 1, -1)
|
||||||
do_attack_animation(H)
|
do_attack_animation(H)
|
||||||
busy = TRUE
|
busy = TRUE
|
||||||
update_icons()
|
update_icons()
|
||||||
|
|||||||
@@ -1812,7 +1812,7 @@
|
|||||||
/* CHOMPEdit Start
|
/* CHOMPEdit Start
|
||||||
if(text2num(time2text(world.timeofday, "MM")) == 4)
|
if(text2num(time2text(world.timeofday, "MM")) == 4)
|
||||||
if(text2num(time2text(world.timeofday, "DD")) == 1)
|
if(text2num(time2text(world.timeofday, "DD")) == 1)
|
||||||
playsound_local(src,pick(GLOB.scawwySownds),50, 0)
|
playsound_local(src,pick(GLOB.scawwysownds),50, 0)
|
||||||
return
|
return
|
||||||
*/ // CHOMPedit End
|
*/ // CHOMPedit End
|
||||||
playsound_local(src,pick(GLOB.scarySounds),50, 1, -1)
|
playsound_local(src,pick(GLOB.scarySounds),50, 1, -1)
|
||||||
|
|||||||
@@ -248,7 +248,7 @@
|
|||||||
L.apply_effect(STUTTER, 1)
|
L.apply_effect(STUTTER, 1)
|
||||||
L.visible_message(span_danger("[user] has shocked [L] with its tongue!"), \
|
L.visible_message(span_danger("[user] has shocked [L] with its tongue!"), \
|
||||||
span_userdanger("[user] has shocked you with its tongue! You can feel the betrayal."))
|
span_userdanger("[user] has shocked you with its tongue! You can feel the betrayal."))
|
||||||
playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1)
|
playsound(src, 'sound/weapons/egloves.ogg', 50, 1, -1)
|
||||||
else
|
else
|
||||||
user.visible_message(span_notice("\The [user] affectionately licks all over \the [target]'s face!"), span_notice("You affectionately lick all over \the [target]'s face!"))
|
user.visible_message(span_notice("\The [user] affectionately licks all over \the [target]'s face!"), span_notice("You affectionately lick all over \the [target]'s face!"))
|
||||||
playsound(src, 'sound/effects/attackblob.ogg', 50, 1)
|
playsound(src, 'sound/effects/attackblob.ogg', 50, 1)
|
||||||
|
|||||||
@@ -72,10 +72,10 @@
|
|||||||
if(istype(A,/obj/item/gun/projectile) || istype(I,/obj/item/gun/projectile))
|
if(istype(A,/obj/item/gun/projectile) || istype(I,/obj/item/gun/projectile))
|
||||||
seen_gun = 1
|
seen_gun = 1
|
||||||
projectiletype = /obj/item/projectile/bullet/pistol/medium
|
projectiletype = /obj/item/projectile/bullet/pistol/medium
|
||||||
projectilesound = 'sound/weapons/Gunshot_light.ogg'
|
projectilesound = 'sound/weapons/gunshot_light.ogg'
|
||||||
if(istype(A,/obj/item/gun/projectile/shotgun) || istype(I,/obj/item/gun/projectile/shotgun))
|
if(istype(A,/obj/item/gun/projectile/shotgun) || istype(I,/obj/item/gun/projectile/shotgun))
|
||||||
projectiletype = /obj/item/projectile/bullet/pellet/shotgun
|
projectiletype = /obj/item/projectile/bullet/pellet/shotgun
|
||||||
projectilesound = 'sound/weapons/Gunshot_shotgun.ogg'
|
projectilesound = 'sound/weapons/gunshot_shotgun.ogg'
|
||||||
reload_time = 1.5 SECONDS
|
reload_time = 1.5 SECONDS
|
||||||
ranged_attack_delay = 1.5 SECONDS
|
ranged_attack_delay = 1.5 SECONDS
|
||||||
projectile_dispersion = 8
|
projectile_dispersion = 8
|
||||||
@@ -86,7 +86,7 @@
|
|||||||
projectile_accuracy = -20
|
projectile_accuracy = -20
|
||||||
if(istype(A,/obj/item/gun/projectile/heavysniper) || istype(I,/obj/item/gun/projectile/heavysniper))
|
if(istype(A,/obj/item/gun/projectile/heavysniper) || istype(I,/obj/item/gun/projectile/heavysniper))
|
||||||
projectiletype = /obj/item/projectile/bullet/rifle/a145/highvel // Do not get seen with a big ass sniper!
|
projectiletype = /obj/item/projectile/bullet/rifle/a145/highvel // Do not get seen with a big ass sniper!
|
||||||
projectilesound = 'sound/weapons/Gunshot_cannon.ogg'
|
projectilesound = 'sound/weapons/gunshot_cannon.ogg'
|
||||||
ranged_attack_delay = 2.5 SECONDS
|
ranged_attack_delay = 2.5 SECONDS
|
||||||
reload_time = 5 SECONDS
|
reload_time = 5 SECONDS
|
||||||
projectile_accuracy = 75
|
projectile_accuracy = 75
|
||||||
|
|||||||
@@ -165,7 +165,7 @@
|
|||||||
icon_living = "syndicateranged"
|
icon_living = "syndicateranged"
|
||||||
projectiletype = /obj/item/projectile/bullet/pistol/medium
|
projectiletype = /obj/item/projectile/bullet/pistol/medium
|
||||||
// casingtype = /obj/item/ammo_casing/spent //Makes infinite stacks of bullets when put in PoIs.
|
// casingtype = /obj/item/ammo_casing/spent //Makes infinite stacks of bullets when put in PoIs.
|
||||||
projectilesound = 'sound/weapons/Gunshot_light.ogg'
|
projectilesound = 'sound/weapons/gunshot_light.ogg'
|
||||||
loot_list = list(/obj/item/gun/projectile/colt = 100)
|
loot_list = list(/obj/item/gun/projectile/colt = 100)
|
||||||
|
|
||||||
needs_reload = TRUE
|
needs_reload = TRUE
|
||||||
@@ -202,7 +202,7 @@
|
|||||||
|
|
||||||
loot_list = list(/obj/item/gun/projectile/automatic/z8 = 100)
|
loot_list = list(/obj/item/gun/projectile/automatic/z8 = 100)
|
||||||
|
|
||||||
projectilesound = 'sound/weapons/Gunshot_heavy.ogg'
|
projectilesound = 'sound/weapons/gunshot_heavy.ogg'
|
||||||
projectiletype = /obj/item/projectile/bullet/rifle/a762
|
projectiletype = /obj/item/projectile/bullet/rifle/a762
|
||||||
projectile_dispersion = 8
|
projectile_dispersion = 8
|
||||||
projectile_accuracy = -15
|
projectile_accuracy = -15
|
||||||
@@ -248,7 +248,7 @@
|
|||||||
icon_state = "syndicateranged_shotgun"
|
icon_state = "syndicateranged_shotgun"
|
||||||
icon_living = "syndicateranged_shotgun"
|
icon_living = "syndicateranged_shotgun"
|
||||||
projectiletype = /obj/item/projectile/bullet/pellet/shotgun // Buckshot
|
projectiletype = /obj/item/projectile/bullet/pellet/shotgun // Buckshot
|
||||||
projectilesound = 'sound/weapons/Gunshot_shotgun.ogg'
|
projectilesound = 'sound/weapons/gunshot_shotgun.ogg'
|
||||||
|
|
||||||
loot_list = list(/obj/item/gun/projectile/shotgun/pump = 100)
|
loot_list = list(/obj/item/gun/projectile/shotgun/pump = 100)
|
||||||
|
|
||||||
@@ -264,7 +264,7 @@
|
|||||||
icon_state = "syndicateranged_technician"
|
icon_state = "syndicateranged_technician"
|
||||||
icon_living = "syndicateranged_technician"
|
icon_living = "syndicateranged_technician"
|
||||||
projectiletype = /obj/item/projectile/fake_syringe/poison // Toxin dart.
|
projectiletype = /obj/item/projectile/fake_syringe/poison // Toxin dart.
|
||||||
projectilesound = 'sound/weapons/Gunshot_old.ogg'
|
projectilesound = 'sound/weapons/gunshot_old.ogg'
|
||||||
|
|
||||||
loot_list = list(/obj/item/gun/projectile/dartgun = 100,
|
loot_list = list(/obj/item/gun/projectile/dartgun = 100,
|
||||||
/obj/item/gun/launcher/grenade = 100,
|
/obj/item/gun/launcher/grenade = 100,
|
||||||
@@ -288,7 +288,7 @@
|
|||||||
icon_state = "syndicateranged_sniper"
|
icon_state = "syndicateranged_sniper"
|
||||||
icon_living = "syndicateranged_sniper"
|
icon_living = "syndicateranged_sniper"
|
||||||
projectiletype = /obj/item/projectile/bullet/rifle/a145/highvel // Really scary bullet.
|
projectiletype = /obj/item/projectile/bullet/rifle/a145/highvel // Really scary bullet.
|
||||||
projectilesound = 'sound/weapons/Gunshot_cannon.ogg'
|
projectilesound = 'sound/weapons/gunshot_cannon.ogg'
|
||||||
|
|
||||||
projectile_accuracy = 75
|
projectile_accuracy = 75
|
||||||
|
|
||||||
|
|||||||
@@ -46,8 +46,8 @@
|
|||||||
say_stand_down = list("Thank you for listening! Please have a safe day!", "Carry along, and keep safe.", "You're cleared to depart, thank you for not causing problems.")
|
say_stand_down = list("Thank you for listening! Please have a safe day!", "Carry along, and keep safe.", "You're cleared to depart, thank you for not causing problems.")
|
||||||
say_escalate = list("Team, we have mice attempting to steal our salvage!", "We've warned you! Please know this is just us following orders!", "Apologies, but we have to attack due to failing to listen to our order!")
|
say_escalate = list("Team, we have mice attempting to steal our salvage!", "We've warned you! Please know this is just us following orders!", "Apologies, but we have to attack due to failing to listen to our order!")
|
||||||
|
|
||||||
threaten_sound = 'sound/weapons/TargetOn.ogg'
|
threaten_sound = 'sound/weapons/targeton.ogg'
|
||||||
stand_down_sound = 'sound/weapons/TargetOff.ogg'
|
stand_down_sound = 'sound/weapons/targetoff.ogg'
|
||||||
|
|
||||||
/mob/living/simple_mob/humanoid/merc/altevian/sapper
|
/mob/living/simple_mob/humanoid/merc/altevian/sapper
|
||||||
desc = "An Altevian Naval Sapper, adorned in the top of the line Heartbreaker suit. Armed with a giant fokken wrench."
|
desc = "An Altevian Naval Sapper, adorned in the top of the line Heartbreaker suit. Armed with a giant fokken wrench."
|
||||||
@@ -113,7 +113,7 @@
|
|||||||
reload_time = 5 SECONDS
|
reload_time = 5 SECONDS
|
||||||
reload_max = 5
|
reload_max = 5
|
||||||
projectiletype = /obj/item/projectile/bullet/sam48
|
projectiletype = /obj/item/projectile/bullet/sam48
|
||||||
projectilesound = 'sound/weapons/Gunshot_heavy.ogg'
|
projectilesound = 'sound/weapons/gunshot_heavy.ogg'
|
||||||
|
|
||||||
/mob/living/simple_mob/humanoid/merc/altevian/neutral
|
/mob/living/simple_mob/humanoid/merc/altevian/neutral
|
||||||
faction = FACTION_NEUTRAL
|
faction = FACTION_NEUTRAL
|
||||||
|
|||||||
@@ -40,8 +40,8 @@
|
|||||||
say_stand_down = list("Your compliance is welcome.")
|
say_stand_down = list("Your compliance is welcome.")
|
||||||
say_escalate = list("Combat initiated.", "Your termination is inevitable.")
|
say_escalate = list("Combat initiated.", "Your termination is inevitable.")
|
||||||
|
|
||||||
threaten_sound = 'sound/weapons/TargetOn.ogg'
|
threaten_sound = 'sound/weapons/targeton.ogg'
|
||||||
stand_down_sound = 'sound/weapons/TargetOff.ogg'
|
stand_down_sound = 'sound/weapons/targetoff.ogg'
|
||||||
|
|
||||||
/mob/living/simple_mob/humanoid/merc/drone
|
/mob/living/simple_mob/humanoid/merc/drone
|
||||||
name = "combat droid"
|
name = "combat droid"
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
movement_sound = 'sound/effects/servostep.ogg'
|
movement_sound = 'sound/effects/servostep.ogg'
|
||||||
|
|
||||||
attacktext = list("clawed")
|
attacktext = list("clawed")
|
||||||
projectilesound = 'sound/weapons/Gunshot_old.ogg'
|
projectilesound = 'sound/weapons/gunshot_old.ogg'
|
||||||
|
|
||||||
organ_names = /decl/mob_organ_names/hivebot
|
organ_names = /decl/mob_organ_names/hivebot
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
movement_cooldown = 3
|
movement_cooldown = 3
|
||||||
melee_damage_lower = 3
|
melee_damage_lower = 3
|
||||||
melee_damage_upper = 3
|
melee_damage_upper = 3
|
||||||
attack_sound = 'sound/weapons/Egloves.ogg'
|
attack_sound = 'sound/weapons/egloves.ogg'
|
||||||
organ_names = /decl/mob_organ_names/hivebottank
|
organ_names = /decl/mob_organ_names/hivebottank
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
span_danger("\The [src] has shocked \the [L]!"),
|
span_danger("\The [src] has shocked \the [L]!"),
|
||||||
span_danger("\The [src] has shocked you!")
|
span_danger("\The [src] has shocked you!")
|
||||||
)
|
)
|
||||||
playsound(src, 'sound/weapons/Egloves.ogg', 75, 1)
|
playsound(src, 'sound/weapons/egloves.ogg', 75, 1)
|
||||||
L.Weaken(4)
|
L.Weaken(4)
|
||||||
L.Stun(4)
|
L.Stun(4)
|
||||||
do_attack_animation(L)
|
do_attack_animation(L)
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ var/global/moth_amount = 0 // CHOMPEnable, Rykka waz here. *pawstamp*
|
|||||||
var/mob/living/L = A
|
var/mob/living/L = A
|
||||||
if(prob(shock_chance))
|
if(prob(shock_chance))
|
||||||
A.emp_act(4) //The weakest strength of EMP
|
A.emp_act(4) //The weakest strength of EMP
|
||||||
playsound(src, 'sound/weapons/Egloves.ogg', 75, 1)
|
playsound(src, 'sound/weapons/egloves.ogg', 75, 1)
|
||||||
L.Weaken(4)
|
L.Weaken(4)
|
||||||
L.Stun(4)
|
L.Stun(4)
|
||||||
L.stuttering = max(L.stuttering, 4)
|
L.stuttering = max(L.stuttering, 4)
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
|
|||||||
var/obj/item/stack/rods/R = C
|
var/obj/item/stack/rods/R = C
|
||||||
if (R.use(1))
|
if (R.use(1))
|
||||||
to_chat(user, span_notice("Constructing support lattice ..."))
|
to_chat(user, span_notice("Constructing support lattice ..."))
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
ReplaceWithLattice()
|
ReplaceWithLattice()
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -121,7 +121,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
|
|||||||
if (S.get_amount() < 1)
|
if (S.get_amount() < 1)
|
||||||
return
|
return
|
||||||
qdel(L)
|
qdel(L)
|
||||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||||
S.use(1)
|
S.use(1)
|
||||||
ChangeTurf(/turf/simulated/floor/airless)
|
ChangeTurf(/turf/simulated/floor/airless)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -60,7 +60,7 @@
|
|||||||
span_notice("You hear glass shattering"))
|
span_notice("You hear glass shattering"))
|
||||||
log_and_message_admins("Created a new shuttle [S.name]. [ADMIN_JMP(comp_turf)]", user)
|
log_and_message_admins("Created a new shuttle [S.name]. [ADMIN_JMP(comp_turf)]", user)
|
||||||
spawn(1 SECOND)
|
spawn(1 SECOND)
|
||||||
playsound(comp_turf, 'sound/voice/Serithi/Shuttlehere.ogg', 75, 0)
|
playsound(comp_turf, 'sound/voice/Serithi/shuttlehere.ogg', 75, 0)
|
||||||
qdel(src)
|
qdel(src)
|
||||||
|
|
||||||
return TRUE
|
return TRUE
|
||||||
|
|||||||
@@ -264,7 +264,7 @@
|
|||||||
else//Otherwise just make a new one
|
else//Otherwise just make a new one
|
||||||
auto_target = new/obj/screen/auto_target(get_turf(A), src)
|
auto_target = new/obj/screen/auto_target(get_turf(A), src)
|
||||||
visible_message(span_danger("\The [user] readies the [src]!"))
|
visible_message(span_danger("\The [user] readies the [src]!"))
|
||||||
playsound(src, 'sound/weapons/TargetOn.ogg', 50, 1)
|
playsound(src, 'sound/weapons/targeton.ogg', 50, 1)
|
||||||
to_chat(user, span_notice("You ready \the [src]! Click and drag the target around to shoot."))
|
to_chat(user, span_notice("You ready \the [src]! Click and drag the target around to shoot."))
|
||||||
return
|
return
|
||||||
Fire(A,user,params) //Otherwise, fire normally.
|
Fire(A,user,params) //Otherwise, fire normally.
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_MAGNET = 4)
|
origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_MAGNET = 4)
|
||||||
|
|
||||||
fire_sound = 'sound/weapons/Taser.ogg'
|
fire_sound = 'sound/weapons/taser.ogg'
|
||||||
|
|
||||||
load_method = MAGAZINE //Nyeh heh hehhh.
|
load_method = MAGAZINE //Nyeh heh hehhh.
|
||||||
magazine_type = null
|
magazine_type = null
|
||||||
|
|||||||
@@ -130,4 +130,4 @@
|
|||||||
|
|
||||||
/obj/item/projectile/beam/heavylaser/lessheavy //all bark. no (or little) bite.
|
/obj/item/projectile/beam/heavylaser/lessheavy //all bark. no (or little) bite.
|
||||||
damage = 15
|
damage = 15
|
||||||
fire_sound = 'sound/weapons/Gunshot_cannon.ogg'
|
fire_sound = 'sound/weapons/gunshot_cannon.ogg'
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
w_class = ITEMSIZE_NORMAL
|
w_class = ITEMSIZE_NORMAL
|
||||||
origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 4)
|
origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 4)
|
||||||
slot_flags = null
|
slot_flags = null
|
||||||
fire_sound = 'sound/weapons/Gunshot_light.ogg'
|
fire_sound = 'sound/weapons/gunshot_light.ogg'
|
||||||
load_method = MAGAZINE
|
load_method = MAGAZINE
|
||||||
force = 3
|
force = 3
|
||||||
recoil = 2
|
recoil = 2
|
||||||
|
|||||||
@@ -250,7 +250,7 @@
|
|||||||
else
|
else
|
||||||
target.visible_message(span_danger("[target] has been zapped with [src] by [user]!"))
|
target.visible_message(span_danger("[target] has been zapped with [src] by [user]!"))
|
||||||
|
|
||||||
playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1)
|
playsound(src, 'sound/weapons/egloves.ogg', 50, 1, -1)
|
||||||
target.stun_effect_act(0, agony, hit_zone, src)
|
target.stun_effect_act(0, agony, hit_zone, src)
|
||||||
msg_admin_attack("[key_name(user)] stunned [key_name(target)] with the [src].")
|
msg_admin_attack("[key_name(user)] stunned [key_name(target)] with the [src].")
|
||||||
if(ishuman(target))
|
if(ishuman(target))
|
||||||
@@ -416,7 +416,7 @@
|
|||||||
target.visible_message(span_danger("[target] has been prodded in the [affecting.name] with [src] by [user]!"))
|
target.visible_message(span_danger("[target] has been prodded in the [affecting.name] with [src] by [user]!"))
|
||||||
else
|
else
|
||||||
target.visible_message(span_danger("[target] has been prodded with [src] by [user]!"))
|
target.visible_message(span_danger("[target] has been prodded with [src] by [user]!"))
|
||||||
playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1)
|
playsound(src, 'sound/weapons/egloves.ogg', 50, 1, -1)
|
||||||
target.stun_effect_act(stun, agony, hit_zone, src)
|
target.stun_effect_act(stun, agony, hit_zone, src)
|
||||||
msg_admin_attack("[key_name(user)] stunned [key_name(target)] with the [src].")
|
msg_admin_attack("[key_name(user)] stunned [key_name(target)] with the [src].")
|
||||||
if(ishuman(target))
|
if(ishuman(target))
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
item_state = null
|
item_state = null
|
||||||
item_icons = null
|
item_icons = null
|
||||||
|
|
||||||
fire_sound = 'sound/weapons/Taser.ogg'
|
fire_sound = 'sound/weapons/taser.ogg'
|
||||||
projectile_type = /obj/item/projectile/beam/stun
|
projectile_type = /obj/item/projectile/beam/stun
|
||||||
|
|
||||||
modifystate = "dominatorstun"
|
modifystate = "dominatorstun"
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
dna_lock = 1
|
dna_lock = 1
|
||||||
|
|
||||||
firemodes = list(
|
firemodes = list(
|
||||||
list(mode_name="stun", charge_cost=240,projectile_type=/obj/item/projectile/beam/stun, modifystate="dominatorstun", fire_sound='sound/weapons/Taser.ogg'),
|
list(mode_name="stun", charge_cost=240,projectile_type=/obj/item/projectile/beam/stun, modifystate="dominatorstun", fire_sound='sound/weapons/taser.ogg'),
|
||||||
list(mode_name="lethal", charge_cost=480,projectile_type=/obj/item/projectile/beam/dominator, modifystate="dominatorkill", fire_sound='sound/weapons/gauss_shoot.ogg'),
|
list(mode_name="lethal", charge_cost=480,projectile_type=/obj/item/projectile/beam/dominator, modifystate="dominatorkill", fire_sound='sound/weapons/gauss_shoot.ogg'),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
w_class = ITEMSIZE_NORMAL
|
w_class = ITEMSIZE_NORMAL
|
||||||
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 4)
|
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 4)
|
||||||
projectile_type = /obj/item/projectile/beam/stun
|
projectile_type = /obj/item/projectile/beam/stun
|
||||||
fire_sound = 'sound/weapons/Taser.ogg'
|
fire_sound = 'sound/weapons/taser.ogg'
|
||||||
charge_meter = 1
|
charge_meter = 1
|
||||||
|
|
||||||
cell_type = /obj/item/cell/device/weapon/gunsword
|
cell_type = /obj/item/cell/device/weapon/gunsword
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
modifystate = "gbuster"
|
modifystate = "gbuster"
|
||||||
|
|
||||||
firemodes = list(
|
firemodes = list(
|
||||||
list(mode_name="stun", charge_cost=240,projectile_type=/obj/item/projectile/beam/stun, modifystate="gbuster", fire_sound='sound/weapons/Taser.ogg'),
|
list(mode_name="stun", charge_cost=240,projectile_type=/obj/item/projectile/beam/stun, modifystate="gbuster", fire_sound='sound/weapons/taser.ogg'),
|
||||||
list(mode_name="lethal", charge_cost=480,projectile_type=/obj/item/projectile/beam/imperial, modifystate="gbuster", fire_sound='sound/weapons/mandalorian.ogg'),
|
list(mode_name="lethal", charge_cost=480,projectile_type=/obj/item/projectile/beam/imperial, modifystate="gbuster", fire_sound='sound/weapons/mandalorian.ogg'),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
modifystate = "egunstun"
|
modifystate = "egunstun"
|
||||||
|
|
||||||
firemodes = list(
|
firemodes = list(
|
||||||
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun/med, modifystate="egunstun", fire_sound='sound/weapons/Taser.ogg', charge_cost = 240),
|
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun/med, modifystate="egunstun", fire_sound='sound/weapons/taser.ogg', charge_cost = 240),
|
||||||
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="egunkill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 480),
|
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="egunkill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 480),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
modifystate = "riflestun"
|
modifystate = "riflestun"
|
||||||
|
|
||||||
firemodes = list(
|
firemodes = list(
|
||||||
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="riflestun", fire_sound='sound/weapons/Taser.ogg', wielded_item_state="riflestun-wielded", charge_cost = 120),
|
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="riflestun", fire_sound='sound/weapons/taser.ogg', wielded_item_state="riflestun-wielded", charge_cost = 120),
|
||||||
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="riflekill", fire_sound='sound/weapons/Laser.ogg', wielded_item_state="riflekill-wielded", charge_cost = 240),
|
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="riflekill", fire_sound='sound/weapons/Laser.ogg', wielded_item_state="riflekill-wielded", charge_cost = 240),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -106,14 +106,14 @@
|
|||||||
description_fluff = "RayZar is Ward-Takahashi’s main consumer weapons brand, known for producing and licensing a wide variety of specialist \
|
description_fluff = "RayZar is Ward-Takahashi’s main consumer weapons brand, known for producing and licensing a wide variety of specialist \
|
||||||
energy weapons of various types and quality primarily for the civilian market."
|
energy weapons of various types and quality primarily for the civilian market."
|
||||||
icon_state = "PDWstun"
|
icon_state = "PDWstun"
|
||||||
fire_sound = 'sound/weapons/Taser.ogg'
|
fire_sound = 'sound/weapons/taser.ogg'
|
||||||
w_class = ITEMSIZE_SMALL
|
w_class = ITEMSIZE_SMALL
|
||||||
projectile_type = /obj/item/projectile/beam/stun/med
|
projectile_type = /obj/item/projectile/beam/stun/med
|
||||||
origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 3)
|
origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 3)
|
||||||
modifystate = "PDWstun"
|
modifystate = "PDWstun"
|
||||||
|
|
||||||
firemodes = list(
|
firemodes = list(
|
||||||
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun/med, modifystate="PDWstun", fire_sound='sound/weapons/Taser.ogg', charge_cost = 240),
|
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun/med, modifystate="PDWstun", fire_sound='sound/weapons/taser.ogg', charge_cost = 240),
|
||||||
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="PDWkill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 480),
|
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="PDWkill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 480),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -134,7 +134,7 @@
|
|||||||
modifystate = "ep08stun"
|
modifystate = "ep08stun"
|
||||||
|
|
||||||
firemodes = list(
|
firemodes = list(
|
||||||
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="ep08stun", fire_sound='sound/weapons/Taser.ogg', charge_cost = 120),
|
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="ep08stun", fire_sound='sound/weapons/taser.ogg', charge_cost = 120),
|
||||||
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/eluger, modifystate="ep08kill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 240),
|
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/eluger, modifystate="ep08kill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 240),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
icon_override = 'icons/vore/custom_guns_vr.dmi'
|
icon_override = 'icons/vore/custom_guns_vr.dmi'
|
||||||
item_state = "gun"
|
item_state = "gun"
|
||||||
|
|
||||||
fire_sound = 'sound/weapons/Taser.ogg'
|
fire_sound = 'sound/weapons/taser.ogg'
|
||||||
projectile_type = /obj/item/projectile/beam/stun/med //CHOMPedit, default proj uses weak stun but firemode switches to med, fixing
|
projectile_type = /obj/item/projectile/beam/stun/med //CHOMPedit, default proj uses weak stun but firemode switches to med, fixing
|
||||||
|
|
||||||
modifystate = "stun"
|
modifystate = "stun"
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
the rural communities that dot this infinite frontier."
|
the rural communities that dot this infinite frontier."
|
||||||
icon_state = "boltaction"
|
icon_state = "boltaction"
|
||||||
item_state = "boltaction"
|
item_state = "boltaction"
|
||||||
fire_sound = 'sound/weapons/Gunshot_generic_rifle.ogg'
|
fire_sound = 'sound/weapons/gunshot_generic_rifle.ogg'
|
||||||
max_shells = 5
|
max_shells = 5
|
||||||
caliber = "7.62mm"
|
caliber = "7.62mm"
|
||||||
origin_tech = list(TECH_COMBAT = 1)// Old as shit rifle doesn't have very good tech.
|
origin_tech = list(TECH_COMBAT = 1)// Old as shit rifle doesn't have very good tech.
|
||||||
@@ -105,7 +105,7 @@
|
|||||||
as any modern interpretation. Uses 7.62mm rounds."
|
as any modern interpretation. Uses 7.62mm rounds."
|
||||||
icon_state = "surplus"
|
icon_state = "surplus"
|
||||||
item_state = "rifle"
|
item_state = "rifle"
|
||||||
fire_sound = 'sound/weapons/Gunshot_generic_rifle.ogg'
|
fire_sound = 'sound/weapons/gunshot_generic_rifle.ogg'
|
||||||
max_shells = 4
|
max_shells = 4
|
||||||
slot_flags = null
|
slot_flags = null
|
||||||
caliber = "7.62mm"
|
caliber = "7.62mm"
|
||||||
@@ -132,7 +132,7 @@
|
|||||||
the rural communities that dot this infinite frontier."
|
the rural communities that dot this infinite frontier."
|
||||||
icon_state = "scoped-boltaction"
|
icon_state = "scoped-boltaction"
|
||||||
item_state = "boltaction_scoped"
|
item_state = "boltaction_scoped"
|
||||||
fire_sound = 'sound/weapons/Gunshot_generic_rifle.ogg'
|
fire_sound = 'sound/weapons/gunshot_generic_rifle.ogg'
|
||||||
max_shells = 5
|
max_shells = 5
|
||||||
caliber = "7.62mm"
|
caliber = "7.62mm"
|
||||||
origin_tech = list(TECH_COMBAT = 2)// Old as shit rifle doesn't have very good tech, but it does have a scope.
|
origin_tech = list(TECH_COMBAT = 2)// Old as shit rifle doesn't have very good tech, but it does have a scope.
|
||||||
|
|||||||
@@ -156,7 +156,7 @@
|
|||||||
item_state = "deagle"
|
item_state = "deagle"
|
||||||
force = 14.0
|
force = 14.0
|
||||||
caliber = ".44"
|
caliber = ".44"
|
||||||
fire_sound = 'sound/weapons/Gunshot_deagle.ogg'
|
fire_sound = 'sound/weapons/gunshot_deagle.ogg'
|
||||||
load_method = MAGAZINE
|
load_method = MAGAZINE
|
||||||
magazine_type = /obj/item/ammo_magazine/m44
|
magazine_type = /obj/item/ammo_magazine/m44
|
||||||
allowed_magazines = list(/obj/item/ammo_magazine/m44)
|
allowed_magazines = list(/obj/item/ammo_magazine/m44)
|
||||||
|
|||||||
@@ -129,7 +129,7 @@
|
|||||||
|
|
||||||
embed_chance = 0 //Base chance for a projectile to embed
|
embed_chance = 0 //Base chance for a projectile to embed
|
||||||
|
|
||||||
var/fire_sound = 'sound/weapons/Gunshot1.ogg' // Can be overriden in gun.dm's fire_sound var. It can also be null but I don't know why you'd ever want to do that. -Ace
|
var/fire_sound = 'sound/weapons/gunshot_old.ogg' // Can be overriden in gun.dm's fire_sound var. It can also be null but I don't know why you'd ever want to do that. -Ace
|
||||||
|
|
||||||
var/vacuum_traversal = TRUE //Determines if the projectile can exist in vacuum, if false, the projectile will be deleted if it enters vacuum.
|
var/vacuum_traversal = TRUE //Determines if the projectile can exist in vacuum, if false, the projectile will be deleted if it enters vacuum.
|
||||||
|
|
||||||
|
|||||||
@@ -330,7 +330,7 @@
|
|||||||
/obj/item/projectile/beam/stun
|
/obj/item/projectile/beam/stun
|
||||||
name = "stun beam"
|
name = "stun beam"
|
||||||
icon_state = "stun"
|
icon_state = "stun"
|
||||||
fire_sound = 'sound/weapons/Taser.ogg'
|
fire_sound = 'sound/weapons/taser.ogg'
|
||||||
nodamage = 1
|
nodamage = 1
|
||||||
taser_effect = 1
|
taser_effect = 1
|
||||||
agony = 35
|
agony = 35
|
||||||
|
|||||||
@@ -126,14 +126,14 @@
|
|||||||
sharp = FALSE
|
sharp = FALSE
|
||||||
check_armour = "melee"
|
check_armour = "melee"
|
||||||
hud_state = "pistol_special"
|
hud_state = "pistol_special"
|
||||||
fire_sound ='sound/weapons/Gunshot_pathetic.ogg' // Rubber shots have less powder in the casing.
|
fire_sound ='sound/weapons/gunshot_pathetic.ogg' // Rubber shots have less powder in the casing.
|
||||||
|
|
||||||
/* shotgun projectiles */
|
/* shotgun projectiles */
|
||||||
|
|
||||||
/obj/item/projectile/bullet/shotgun
|
/obj/item/projectile/bullet/shotgun
|
||||||
name = "slug"
|
name = "slug"
|
||||||
icon_state = "bullet_chonk" //Ywedit
|
icon_state = "bullet_chonk" //CHOMPEdit
|
||||||
fire_sound = 'sound/weapons/Gunshot_shotgun.ogg'
|
fire_sound = 'sound/weapons/gunshot_shotgun.ogg'
|
||||||
damage = 50
|
damage = 50
|
||||||
armor_penetration = 20
|
armor_penetration = 20
|
||||||
hud_state = "shotgun_slug"
|
hud_state = "shotgun_slug"
|
||||||
@@ -152,7 +152,7 @@
|
|||||||
//Overall less damage than slugs in exchange for more damage at very close range and more embedding
|
//Overall less damage than slugs in exchange for more damage at very close range and more embedding
|
||||||
/obj/item/projectile/bullet/pellet/shotgun
|
/obj/item/projectile/bullet/pellet/shotgun
|
||||||
name = "shrapnel"
|
name = "shrapnel"
|
||||||
fire_sound = 'sound/weapons/Gunshot_shotgun.ogg'
|
fire_sound = 'sound/weapons/gunshot_shotgun.ogg'
|
||||||
damage = 13
|
damage = 13
|
||||||
pellets = 6
|
pellets = 6
|
||||||
range_step = 1
|
range_step = 1
|
||||||
@@ -187,19 +187,19 @@
|
|||||||
/* "Rifle" rounds */
|
/* "Rifle" rounds */
|
||||||
|
|
||||||
/obj/item/projectile/bullet/rifle
|
/obj/item/projectile/bullet/rifle
|
||||||
fire_sound = 'sound/weapons/Gunshot_generic_rifle.ogg'
|
fire_sound = 'sound/weapons/gunshot_generic_rifle.ogg'
|
||||||
armor_penetration = 15
|
armor_penetration = 15
|
||||||
//penetrating = 1 CHOMPedit: This is the only thing I see that could cause stun and unsure what can be pierced with a penetrating of 1.
|
//penetrating = 1 CHOMPedit: This is the only thing I see that could cause stun and unsure what can be pierced with a penetrating of 1.
|
||||||
hud_state = "rifle"
|
hud_state = "rifle"
|
||||||
hud_state_empty = "rifle_empty"
|
hud_state_empty = "rifle_empty"
|
||||||
|
|
||||||
/obj/item/projectile/bullet/rifle/a762
|
/obj/item/projectile/bullet/rifle/a762
|
||||||
fire_sound = 'sound/weapons/Gunshot_heavy.ogg'
|
fire_sound = 'sound/weapons/gunshot_heavy.ogg'
|
||||||
damage = 35
|
damage = 35
|
||||||
hud_state = "rifle_heavy"
|
hud_state = "rifle_heavy"
|
||||||
|
|
||||||
/obj/item/projectile/bullet/rifle/a762/sniper // Hitscan specifically for sniper ammo; to be implimented at a later date, probably for the SVD. -Ace
|
/obj/item/projectile/bullet/rifle/a762/sniper // Hitscan specifically for sniper ammo; to be implimented at a later date, probably for the SVD. -Ace
|
||||||
fire_sound = 'sound/weapons/Gunshot_sniper.ogg'
|
fire_sound = 'sound/weapons/gunshot_sniper.ogg'
|
||||||
hitscan = 1 //so the ammo isn't useless as a sniper weapon
|
hitscan = 1 //so the ammo isn't useless as a sniper weapon
|
||||||
hud_state = "hivelo"
|
hud_state = "hivelo"
|
||||||
|
|
||||||
@@ -221,7 +221,7 @@
|
|||||||
hud_state = "rifle_heavy"
|
hud_state = "rifle_heavy"
|
||||||
|
|
||||||
/obj/item/projectile/bullet/rifle/a545
|
/obj/item/projectile/bullet/rifle/a545
|
||||||
fire_sound = 'sound/weapons/Gunshot_light.ogg'
|
fire_sound = 'sound/weapons/gunshot_light.ogg'
|
||||||
damage = 25
|
damage = 25
|
||||||
hud_state = "rifle"
|
hud_state = "rifle"
|
||||||
|
|
||||||
@@ -243,7 +243,7 @@
|
|||||||
hud_state = "rifle_heavy"
|
hud_state = "rifle_heavy"
|
||||||
|
|
||||||
/obj/item/projectile/bullet/rifle/a145 // 14.5×114mm is bigger than a .50 BMG round.
|
/obj/item/projectile/bullet/rifle/a145 // 14.5×114mm is bigger than a .50 BMG round.
|
||||||
fire_sound = 'sound/weapons/Gunshot_cannon.ogg' // This is literally an anti-tank rifle caliber. It better sound like a fucking cannon.
|
fire_sound = 'sound/weapons/gunshot_cannon.ogg' // This is literally an anti-tank rifle caliber. It better sound like a fucking cannon.
|
||||||
damage = 80
|
damage = 80
|
||||||
stun = 3
|
stun = 3
|
||||||
weaken = 3
|
weaken = 3
|
||||||
@@ -371,7 +371,7 @@
|
|||||||
/obj/item/projectile/bullet/blank
|
/obj/item/projectile/bullet/blank
|
||||||
name = "blank"
|
name = "blank"
|
||||||
damage_type = HALLOSS
|
damage_type = HALLOSS
|
||||||
fire_sound = 'sound/weapons/Gunshot_generic_rifle.ogg' // Blanks still make loud noises.
|
fire_sound = 'sound/weapons/gunshot_generic_rifle.ogg' // Blanks still make loud noises.
|
||||||
damage = 0
|
damage = 0
|
||||||
nodamage = 1
|
nodamage = 1
|
||||||
embed_chance = 0
|
embed_chance = 0
|
||||||
|
|||||||
@@ -98,7 +98,7 @@
|
|||||||
|
|
||||||
/obj/item/projectile/bullet/shotgun/scatterprojectile
|
/obj/item/projectile/bullet/shotgun/scatterprojectile
|
||||||
name = "pellet"
|
name = "pellet"
|
||||||
fire_sound = 'sound/weapons/Gunshot_shotgun.ogg'
|
fire_sound = 'sound/weapons/gunshot_shotgun.ogg'
|
||||||
damage = 12
|
damage = 12
|
||||||
armor_penetration = 0
|
armor_penetration = 0
|
||||||
|
|
||||||
|
|||||||
@@ -177,7 +177,7 @@
|
|||||||
aiming_with = thing
|
aiming_with = thing
|
||||||
aiming_at = target
|
aiming_at = target
|
||||||
if(istype(aiming_with, /obj/item/gun))
|
if(istype(aiming_with, /obj/item/gun))
|
||||||
playsound(owner, 'sound/weapons/TargetOn.ogg', 50,1)
|
playsound(owner, 'sound/weapons/targeton.ogg', 50,1)
|
||||||
forceMove(get_turf(target))
|
forceMove(get_turf(target))
|
||||||
START_PROCESSING(SSobj, src)
|
START_PROCESSING(SSobj, src)
|
||||||
|
|
||||||
@@ -217,7 +217,7 @@
|
|||||||
if(!aiming_with || !aiming_at)
|
if(!aiming_with || !aiming_at)
|
||||||
return
|
return
|
||||||
if(istype(aiming_with, /obj/item/gun))
|
if(istype(aiming_with, /obj/item/gun))
|
||||||
playsound(owner, 'sound/weapons/TargetOff.ogg', 50,1)
|
playsound(owner, 'sound/weapons/targetoff.ogg', 50,1)
|
||||||
if(!no_message)
|
if(!no_message)
|
||||||
owner.visible_message(span_infoplain(span_bold("\The [owner]") + " lowers \the [aiming_with]."))
|
owner.visible_message(span_infoplain(span_bold("\The [owner]") + " lowers \the [aiming_with]."))
|
||||||
|
|
||||||
|
|||||||
@@ -156,7 +156,7 @@
|
|||||||
/area/tether/surfacebase/outside/wilderness
|
/area/tether/surfacebase/outside/wilderness
|
||||||
name = "Outside - Wilderness"
|
name = "Outside - Wilderness"
|
||||||
icon_state = "invi"
|
icon_state = "invi"
|
||||||
forced_ambience = list('sound/music/Sacred_Grove.ogg')
|
forced_ambience = list('sound/music/sacred_grove.ogg')
|
||||||
|
|
||||||
/area/tether/surfacebase/temple
|
/area/tether/surfacebase/temple
|
||||||
name = "Outside - Wilderness" // ToDo: Make a way to hide spoiler areas off the list of areas ghosts can jump to.
|
name = "Outside - Wilderness" // ToDo: Make a way to hide spoiler areas off the list of areas ghosts can jump to.
|
||||||
@@ -1416,7 +1416,7 @@
|
|||||||
|
|
||||||
/area/syndicate_station/southwest/outside
|
/area/syndicate_station/southwest/outside
|
||||||
base_turf = /turf/simulated/floor/outdoors/dirt/virgo3b
|
base_turf = /turf/simulated/floor/outdoors/dirt/virgo3b
|
||||||
forced_ambience = list('sound/music/Sacred_Grove.ogg')
|
forced_ambience = list('sound/music/sacred_grove.ogg')
|
||||||
|
|
||||||
//Merc shuttle
|
//Merc shuttle
|
||||||
/area/shuttle/mercenary
|
/area/shuttle/mercenary
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ sound/music/main.ogg
|
|||||||
sound/music/space.ogg
|
sound/music/space.ogg
|
||||||
sound/music/space_asshole.ogg
|
sound/music/space_asshole.ogg
|
||||||
sound/music/space_oddity.ogg
|
sound/music/space_oddity.ogg
|
||||||
sound/music/THUNDERDOME.ogg
|
sound/music/thunderdome.ogg
|
||||||
sound/music/title1.ogg
|
sound/music/title1.ogg
|
||||||
sound/music/title2.ogg
|
sound/music/title2.ogg
|
||||||
sound/music/traitor.ogg
|
sound/music/traitor.ogg
|
||||||
sound/items/bikehorn.ogg
|
sound/items/bikehorn.ogg
|
||||||
sound/effects/siren.ogg
|
sound/effects/siren.ogg
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user