cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 12:04:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Casing correction 1

Browse Source
This commit is contained in:
Aurorablade
2018-12-17 00:07:37 -05:00
parent 6247ba0cfe
commit 86d2a1634c
129 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/_common/antag_spawner.dm
+1 -1
View File
@@ -95,7 +95,7 @@
spawn_antag(C, get_turf(src.loc), initial(demon_type.name), user)
to_chat(user, "[shatter_msg]")
to_chat(user, "[veil_msg]")
playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1)
playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1)
qdel(src)
else
used = FALSE
code/modules/arcade/claw_game.dm
+1 -1
View File
@@ -57,7 +57,7 @@
else
atom_say("WINNER!")
new /obj/item/toy/prizeball(get_turf(src))
playsound(src.loc, 'sound/arcade/Win.ogg', 50, 1, extrarange = -3, falloff = 10)
playsound(src.loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 10)
addtimer(CALLBACK(src, .update_icon), 10)
/obj/machinery/arcade/claw/start_play(mob/user as mob)
code/modules/assembly/assembly.dm
+1 -1
View File
@@ -11,7 +11,7 @@
throw_range = 10
origin_tech = "magnets=1;engineering=1"
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
var/bomb_name = "bomb" // used for naming bombs / mines
code/modules/awaymissions/mission_code/spacehotel.dm
+1 -1
View File
@@ -94,7 +94,7 @@
autoclose = 1
var/doorOpen = 'sound/machines/airlock_open.ogg'
var/doorClose = 'sound/machines/airlock_close.ogg'
var/doorDeni = 'sound/machines/DeniedBeep.ogg'
var/doorDeni = 'sound/machines/deniedbeep.ogg'
var/id // the room number, eg 101
var/obj/item/card/hotel_card/card// room's key card
var/mob/living/occupant = null // the current room occupant
code/modules/clothing/head/helmet.dm
+2 -2
View File
@@ -103,7 +103,7 @@
actions_types = list(/datum/action/item_action/toggle_helmet_light)
can_toggle = 1
toggle_cooldown = 20
active_sound = 'sound/items/WEEOO1.ogg'
active_sound = 'sound/items/weeoo1.ogg'
/obj/item/clothing/head/helmet/justice/escape
name = "alarm helmet"
@@ -173,7 +173,7 @@
actions_types = list(/datum/action/item_action/toggle_helmet_mode)
can_toggle = 1
toggle_cooldown = 20
toggle_sound = 'sound/items/ZippoClose.ogg'
toggle_sound = 'sound/items/zippoclose.ogg'
obj/item/clothing/head/helmet/redtaghelm
name = "red laser tag helmet"
code/modules/customitems/item_defines.dm
+2 -2
View File
@@ -27,7 +27,7 @@
var/tattoo_g = 1
var/tattoo_b = 1
toolspeed = 1
usesound = 'sound/items/Welder2.ogg'
usesound = 'sound/items/welder2.ogg'
/obj/item/fluff/tattoo_gun/attack(mob/living/carbon/M as mob, mob/user as mob)
if(user.a_intent == INTENT_HARM)
@@ -552,7 +552,7 @@
sallet.add_fingerprint(H)
target.transfer_fingerprints_to(sallet)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
playsound(src.loc, 'sound/items/screwdriver.ogg', 50, 1)
to_chat(user, "<span class='notice'>You modify [target] with [src].</span>")
H.update_inv_head()
qdel(target)
code/modules/events/radiation_storm.dm
+1 -1
View File
@@ -4,7 +4,7 @@
announceWhen = 1
/datum/event/radiation_storm/announce()
priority_announcement.Announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg')
priority_announcement.Announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/AI/radiation.ogg')
//sound not longer matches the text, but an audible warning is probably good
/datum/event/radiation_storm/start()
code/modules/fish/fishtank.dm
+1 -1
View File
@@ -547,7 +547,7 @@
else
playsound(src, 'sound/weapons/tap.ogg', 50, 1)
if(BURN)
playsound(src, 'sound/items/Welder.ogg', 100, 1)
playsound(src, 'sound/items/welder.ogg', 100, 1)
/obj/machinery/fishtank/deconstruct(disassembled = TRUE)
if(QDELETED(src))
code/modules/flufftext/Hallucination.dm
+12 -12
View File
@@ -698,13 +698,13 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
doors += I
if(target.client)
target.client.images |= I
target.playsound_local(get_turf(A), 'sound/machines/BoltsDown.ogg',30,0,3)
target.playsound_local(get_turf(A), 'sound/machines/boltsdown.ogg',30,0,3)
sleep(rand(6,12))
sleep(100)
for(var/image/B in doors)
if(target.client)
target.client.images.Remove(B)
target.playsound_local(get_turf(B), 'sound/machines/BoltsUp.ogg',30,0,3)
target.playsound_local(get_turf(B), 'sound/machines/boltsup.ogg',30,0,3)
sleep(rand(6,12))
qdel(src)
@@ -797,13 +797,13 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
playsound_local(null,'sound/machines/airlock_open.ogg', 15, 1)
if(2)
if(prob(50))
playsound_local(null,'sound/effects/Explosion1.ogg', 50, 1)
playsound_local(null,'sound/effects/explosion1.ogg', 50, 1)
else
playsound_local(null, 'sound/effects/Explosion2.ogg', 50, 1)
playsound_local(null, 'sound/effects/explosion2.ogg', 50, 1)
if(3)
playsound_local(null, 'sound/effects/explosionfar.ogg', 50, 1)
if(4)
playsound_local(null, pick('sound/effects/Glassbr1.ogg','sound/effects/Glassbr2.ogg','sound/effects/Glassbr3.ogg'), 50, 1)
playsound_local(null, pick('sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg'), 50, 1)
if(5)
playsound_local(null, 'sound/weapons/ring.ogg', 35)
for(var/i in 0 to 2)
@@ -812,7 +812,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
if(6)
playsound_local(null, 'sound/magic/Summon_guns.ogg', 50, 1)
if(7)
playsound_local(null, 'sound/machines/Alarm.ogg', 100, 0)
playsound_local(null, 'sound/machines/alarm.ogg', 100, 0)
if(8)
playsound_local(null, 'sound/voice/bfreeze.ogg', 35, 0)
if(9)
@@ -832,7 +832,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
//Rare audio
if(12)
//These sounds are (mostly) taken from Hidden: Source
var/list/creepyasssounds = list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/Heart Beat.ogg', 'sound/effects/screech.ogg',\
var/list/creepyasssounds = list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/heartbeat.ogg', 'sound/effects/screech.ogg',\
'sound/hallucinations/behind_you1.ogg', 'sound/hallucinations/behind_you2.ogg', 'sound/hallucinations/far_noise.ogg', 'sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg',\
'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\
'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\
@@ -845,13 +845,13 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
to_chat(src, "<br><br><span class='alert'>The Emergency Shuttle has docked with the station. You have 3 minutes to board the Emergency Shuttle.</span><br><br>")
playsound_local(null, 'sound/AI/shuttledock.ogg', 100)
if(15)
playsound_local(null, 'sound/items/Welder.ogg', 15, 1)
playsound_local(null, 'sound/items/welder.ogg', 15, 1)
sleep(105)
playsound_local(null, 'sound/items/Welder2.ogg', 15, 1)
playsound_local(null, 'sound/items/welder2.ogg', 15, 1)
sleep(15)
playsound_local(null, 'sound/items/Ratchet.ogg', 15, 1)
playsound_local(null, 'sound/items/ratchet.ogg', 15, 1)
if(16)
playsound_local(null, 'sound/items/Screwdriver.ogg', 15, 1)
playsound_local(null, 'sound/items/screwdriver.ogg', 15, 1)
sleep(rand(10,30))
for(var/i in 0 to rand(1,3))
playsound_local(null, 'sound/weapons/empty.ogg', 15, 1)
@@ -993,7 +993,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_
halimage = image('icons/turf/floors/Chasms.dmi',target,"smooth",TURF_LAYER)
if(4)
halimage = image('icons/obj/assemblies.dmi',target,"plastic-explosive2",OBJ_LAYER+0.01)
if(client)
client.images += halimage
sleep(rand(40,60)) //Only seen for a brief moment.
code/modules/food_and_drinks/drinks/drinks/cans.dm
+1 -1
View File
@@ -21,7 +21,7 @@
crushed_can.is_glass = is_glass
crushed_can.is_plastic = is_plastic
if(is_glass)
playsound(user.loc, 'sound/effects/Glassbr3.ogg', rand(10, 50), 1)
playsound(user.loc, 'sound/effects/glassbr3.ogg', rand(10, 50), 1)
crushed_can.name = "broken bottle"
else
playsound(user.loc, 'sound/weapons/pierce.ogg', rand(10, 50), 1)
code/modules/mining/lavaland/loot/bubblegum_loot.dm
+5 -5
View File
@@ -11,9 +11,9 @@
new /obj/item/blood_contract(src)
if(3)
new /obj/item/gun/magic/staff/spellblade(src)
// Mayhem
/obj/item/mayhem
name = "mayhem in a bottle"
desc = "A magically infused bottle of blood, the scent of which will drive anyone nearby into a murderous frenzy."
@@ -26,9 +26,9 @@
var/obj/effect/mine/pickup/bloodbath/B = new(H)
B.mineEffect(H)
to_chat(user, "<span class='notice'>You shatter the bottle!</span>")
playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1)
playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1)
qdel(src)
// Blood Contract
/obj/item/blood_contract
@@ -42,7 +42,7 @@
/obj/item/blood_contract/attack_self(mob/user)
if(used)
return
used = TRUE
var/choice = input(user,"Who do you want dead?","Choose Your Victim") as null|anything in GLOB.player_list
code/modules/mining/lavaland/loot/tendril_loot.dm
+1 -1
View File
@@ -171,7 +171,7 @@
/obj/item/ship_in_a_bottle/attack_self(mob/user)
to_chat(user, "You're not sure how they get the ships in these things, but you're pretty sure you know how to get it out.")
playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1)
playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1)
new /obj/vehicle/lavaboat/dragon(get_turf(src))
qdel(src)
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -472,7 +472,7 @@ emp_act
playsound(src, 'sound/weapons/punch4.ogg', 50, 1)
if("fire")
update |= affecting.receive_damage(0, rand(M.force/2, M.force))
playsound(src, 'sound/items/Welder.ogg', 50, 1)
playsound(src, 'sound/items/welder.ogg', 50, 1)
if("tox")
M.mech_toxin_damage(src)
else
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -117,7 +117,7 @@
playsound(src, 'sound/weapons/punch4.ogg', 50, 1)
if("fire")
take_overall_damage(0, rand(M.force/2, M.force))
playsound(src, 'sound/items/Welder.ogg', 50, 1)
playsound(src, 'sound/items/welder.ogg', 50, 1)
if("tox")
M.mech_toxin_damage(src)
else
code/modules/mob/living/simple_animal/hostile/hivebot.dm
+1 -1
View File
@@ -80,7 +80,7 @@
smoke.set_up(5, 0, src.loc)
smoke.start()
visible_message("<span class='danger'>The [src] warps in!</span>")
playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1)
playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
/mob/living/simple_animal/hostile/hivebot/tele/warpbots()
icon_state = "def_radar"
code/modules/mob/living/simple_animal/tribbles.dm
+1 -1
View File
@@ -176,7 +176,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
playsound(src, "shatter", 70, 1)
Break()
else
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
return
/obj/structure/tribble_cage/update_icon()
code/modules/paperwork/frames.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "Its patented design allows it to be folded larger or smaller to accommodate standard paper, photo, and poster, and canvas sizes."
icon = 'icons/obj/bureaucracy.dmi'
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
var/icon_base
var/obj/displayed
code/modules/paperwork/photography.dm
+1 -1
View File
@@ -560,7 +560,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
///hauntings, like hallucinations but more spooky
/obj/item/camera/proc/handle_haunt(mob/user as mob)
var/list/creepyasssounds = list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/Heart Beat.ogg', 'sound/effects/screech.ogg',\
var/list/creepyasssounds = list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/heartbeat.ogg', 'sound/effects/screech.ogg',\
'sound/hallucinations/behind_you1.ogg', 'sound/hallucinations/behind_you2.ogg', 'sound/hallucinations/far_noise.ogg', 'sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg',\
'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\
'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\
code/modules/power/apc.dm
+1 -1
View File
@@ -130,7 +130,7 @@
origin_tech = "engineering=2;programming=1"
item_state = "electronic"
flags = CONDUCT
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
toolspeed = 1
/obj/machinery/power/apc/connect_to_network()
code/modules/power/cable.dm
+1 -1
View File
@@ -496,7 +496,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
slot_flags = SLOT_BELT
item_state = "coil"
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
toolspeed = 1
/obj/item/stack/cable_coil/suicide_act(mob/user)
code/modules/power/gravitygenerator.dm
+1 -1
View File
@@ -331,7 +331,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
charge_count -= 2
if(charge_count % 4 == 0 && prob(75)) // Let them know it is charging/discharging.
playsound(src.loc, 'sound/effects/EMPulse.ogg', 100, 1)
playsound(src.loc, 'sound/effects/empulse.ogg', 100, 1)
updateDialog()
if(prob(25)) // To help stop "Your clothes feel warm" spam.
code/modules/power/lighting.dm
+3 -3
View File
@@ -359,7 +359,7 @@
else
user.visible_message("<span class='danger'>[user.name] hits the light.</span>")
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
// attempt to stick weapon into light socket
else if(status == LIGHT_EMPTY)
@@ -536,7 +536,7 @@
if(!skip_sound_and_sparks)
if(status == LIGHT_OK || status == LIGHT_BURNED)
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
if(on || overloaded)
do_sparks(3, 1, src)
status = LIGHT_BROKEN
@@ -719,7 +719,7 @@
status = LIGHT_BROKEN
force = 5
sharp = 1
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
update()
/obj/item/light/suicide_act(mob/living/carbon/human/user)
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+1 -1
View File
@@ -231,7 +231,7 @@
origin_tech = "programming=2;materials=2;magnets=4"
require_module = 1
module_type = /obj/item/robot_module/miner
usesound = 'sound/items/Screwdriver.ogg'
usesound = 'sound/items/screwdriver.ogg'
var/denied_type = null
var/maximum_of_type = 1
var/cost = 30
code/modules/projectiles/guns/energy/special.dm
+1 -1
View File
@@ -141,7 +141,7 @@
origin_tech = "combat=1;materials=3;magnets=2;plasmatech=3;engineering=1"
ammo_type = list(/obj/item/ammo_casing/energy/plasma)
fire_sound = 'sound/weapons/Laser.ogg'
usesound = 'sound/items/Welder.ogg'
usesound = 'sound/items/welder.ogg'
toolspeed = 1
container_type = OPENCONTAINER
flags = CONDUCT
code/modules/projectiles/guns/magic/staff.dm
+1 -1
View File
@@ -60,7 +60,7 @@
item_state = "honker"
max_charges = 4
recharge_rate = 8
fire_sound = 'sound/items/Airhorn.ogg'
fire_sound = 'sound/items/airhorn.ogg'
/obj/item/gun/magic/staff/focus
name = "mental focus"
code/modules/projectiles/guns/projectile/launchers.dm
+1 -1
View File
@@ -34,7 +34,7 @@
name = "gyrojet pistol"
desc = "A prototype pistol designed to fire self propelled rockets."
icon_state = "gyropistol"
fire_sound = 'sound/effects/Explosion1.ogg'
fire_sound = 'sound/effects/explosion1.ogg'
origin_tech = "combat=5"
mag_type = /obj/item/ammo_box/magazine/m75
burst_size = 1
code/modules/projectiles/projectile/special.dm
+1 -1
View File
@@ -311,7 +311,7 @@
/obj/item/projectile/ornament
name = "ornament"
icon_state = "ornament-1"
hitsound = 'sound/effects/Glasshit.ogg'
hitsound = 'sound/effects/glasshit.ogg'
damage = 7
damage_type = BRUTE
code/modules/shuttle/assault_pod.dm
+1 -1
View File
@@ -13,7 +13,7 @@
/obj/docking_port/mobile/assault_pod/dock(obj/docking_port/stationary/S1)
..()
if(!istype(S1, /obj/docking_port/stationary/transit))
playsound(get_turf(src.loc), 'sound/effects/Explosion1.ogg',50,1)
playsound(get_turf(src.loc), 'sound/effects/explosion1.ogg',50,1)
code/modules/surgery/organs/organ_internal.dm
+1 -1
View File
@@ -254,7 +254,7 @@
owner.Stuttering(20)
owner.MinimumDeafTicks(30)
owner.Weaken(3)
owner << 'sound/items/AirHorn.ogg'
owner << 'sound/items/airhorn.ogg'
if(prob(30))
owner.Stun(10)
owner.Paralyse(4)
code/modules/telesci/bscrystal.dm
+2 -2
View File
@@ -11,7 +11,7 @@
var/blink_range = 8 // The teleport range when crushed/thrown at someone.
refined_type = /obj/item/stack/sheet/bluespace_crystal
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/item/stack/ore/bluespace_crystal/New()
..()
@@ -65,7 +65,7 @@ var/global/list/datum/stack_recipe/bluespace_crystal_recipes = list(new/datum/st
materials = list(MAT_BLUESPACE = MINERAL_MATERIAL_AMOUNT)
attack_verb = list("bluespace polybashed", "bluespace polybattered", "bluespace polybludgeoned", "bluespace polythrashed", "bluespace polysmashed")
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
/obj/item/stack/sheet/bluespace_crystal/New()
..()
code/modules/vehicle/ambulance.dm
+4 -4
View File
@@ -20,11 +20,11 @@
var/toggle_cooldown = 40
var/cooldown = 0
/datum/action/ambulance_alarm/Trigger()
if(!..())
return FALSE
var/obj/vehicle/ambulance/A = target
if(!istype(A) || !A.soundloop)
@@ -42,10 +42,10 @@
A.soundloop.stop()
A.set_light(0)
/datum/looping_sound/ambulance_alarm
start_length = 0
mid_sounds = list('sound/items/WEEOO1.ogg' = 1)
mid_sounds = list('sound/items/weeoo1.ogg' = 1)
mid_length = 14
volume = 100