From 6a99eb88641fa50639a83510c674c980b202c805 Mon Sep 17 00:00:00 2001 From: Crossedfall Date: Fri, 30 Aug 2019 00:46:06 -0500 Subject: [PATCH] First pass --- .github/CONTRIBUTING.md | 4 - .travis.yml | 6 +- README.md | 4 +- _maps/templates/NSV13_Boarder.dmm | 4 +- _maps/templates/NSV13_Yacht.dmm | 6 +- _maps/templates/NSV13_prison_ship.dmm | 2 +- code/__DEFINES/preferences.dm | 2 +- code/__DEFINES/sound.dm | 4 +- code/__HELPERS/icon_smoothing.dm | 4 +- code/_onclick/drag_drop.dm | 4 +- code/game/atoms_movable.dm | 4 +- code/game/machinery/doors/airlock.dm | 4 +- .../game/objects/items/devices/radio/radio.dm | 4 +- .../items/stacks/sheets/sheet_types.dm | 2 +- .../objects/items/stacks/sheets/sheets.dm | 2 +- code/game/turfs/openspace/openspace.dm | 2 +- code/game/turfs/simulated/floor/plating.dm | 2 +- code/modules/client/preferences_savefile.dm | 2 +- code/modules/jobs/job_types/_job.dm | 4 +- code/modules/jobs/job_types/ai.dm | 2 +- .../jobs/job_types/atmospheric_technician.dm | 2 +- code/modules/jobs/job_types/bartender.dm | 2 +- code/modules/jobs/job_types/botanist.dm | 2 +- code/modules/jobs/job_types/captain.dm | 2 +- .../jobs/job_types/cargo_technician.dm | 2 +- code/modules/jobs/job_types/chaplain.dm | 2 +- code/modules/jobs/job_types/chemist.dm | 2 +- code/modules/jobs/job_types/chief_engineer.dm | 2 +- .../jobs/job_types/chief_medical_officer.dm | 2 +- code/modules/jobs/job_types/clown.dm | 2 +- code/modules/jobs/job_types/cook.dm | 2 +- code/modules/jobs/job_types/curator.dm | 2 +- code/modules/jobs/job_types/cyborg.dm | 2 +- code/modules/jobs/job_types/detective.dm | 2 +- code/modules/jobs/job_types/geneticist.dm | 2 +- .../jobs/job_types/head_of_personnel.dm | 2 +- .../jobs/job_types/head_of_security.dm | 2 +- code/modules/jobs/job_types/janitor.dm | 2 +- code/modules/jobs/job_types/lawyer.dm | 2 +- code/modules/jobs/job_types/medical_doctor.dm | 2 +- code/modules/jobs/job_types/mime.dm | 2 +- code/modules/jobs/job_types/quartermaster.dm | 2 +- .../jobs/job_types/research_director.dm | 2 +- code/modules/jobs/job_types/roboticist.dm | 2 +- code/modules/jobs/job_types/scientist.dm | 2 +- .../jobs/job_types/security_officer.dm | 2 +- code/modules/jobs/job_types/shaft_miner.dm | 2 +- .../jobs/job_types/station_engineer.dm | 2 +- code/modules/jobs/job_types/virologist.dm | 2 +- code/modules/jobs/job_types/warden.dm | 2 +- code/modules/keybindings/bindings_mob.dm | 4 +- code/modules/mob/mob_defines.dm | 2 +- code/modules/power/gravitygenerator.dm | 4 +- code/modules/projectiles/projectile.dm | 10 +- .../research/machinery/circuit_imprinter.dm | 2 +- code/modules/research/machinery/protolathe.dm | 2 +- code/modules/research/machinery/techfab.dm | 2 +- sephora.dme => nsv13.dme | 70 ++++----- nsv13/_DEFINES/overmap.dm | 17 ++ {sephora => nsv13}/code/_HELPERS/overmap.dm | 0 {sephora => nsv13}/code/_onclick/adjacent.dm | 0 .../configuration/entries/game_options.dm | 0 .../code/game/objects/structures/barricade.dm | 14 +- .../code/game/objects/structures/curtains.dm | 0 .../code/game/objects/structures/stairs.dm | 0 .../code/modules/cargo/packs.dm | 0 .../modules/client/preferences_toggles.dm | 0 .../code/modules/client/zoom.dm | 0 .../code/modules/clothing/custom_clothes.dm | 28 ++-- .../code/modules/clothing/custom_outfits.dm | 46 +++--- .../code/modules/clothing/masks/_masks.dm | 2 +- .../code/modules/munitions/munitions.dm | 56 +++---- {sephora => nsv13}/code/modules/overmap/ai.dm | 2 +- .../code/modules/overmap/camera.dm | 4 +- .../code/modules/overmap/components.dm | 14 +- .../code/modules/overmap/overmap.dm | 6 +- .../code/modules/overmap/physics.dm | 0 .../code/modules/overmap/types.dm | 12 +- .../code/modules/overmap/weapons.dm | 14 +- .../code/modules/power/stormdrive.dm | 26 ++-- .../code/modules/recycling/disposal/multiz.dm | 0 {sephora => nsv13}/game/areas.dm | 16 +- {sephora => nsv13}/game/custom_airlocks.dm | 18 +-- {sephora => nsv13}/game/custom_guns.dm | 4 +- {sephora => nsv13}/game/custom_items.dm | 10 +- {sephora => nsv13}/game/custom_materials.dm | 146 +++++++++--------- {sephora => nsv13}/game/custom_turfs.dm | 20 +-- {sephora => nsv13}/game/lore_terminal.dm | 24 +-- .../objects/custom_ghost_role_spawners.dm | 112 +++++++------- {sephora => nsv13}/game/objects/railing.dm | 32 ++-- .../modules/icon_smoothing/turf_autoalign.dm | 2 +- .../goonstation/icons/airlocks.dmi | Bin .../goonstation/icons/blastdoor.dmi | Bin .../goonstation/icons/command.dmi | Bin .../goonstation/icons/engineering.dmi | Bin .../goonstation/icons/external.dmi | Bin .../goonstation/icons/maintenance.dmi | Bin .../goonstation/icons/medical.dmi | Bin .../goonstation/icons/public.dmi | Bin .../goonstation/icons/reactor.dmi | Bin .../goonstation/icons/reactor_parts.dmi | Bin .../goonstation/icons/security.dmi | Bin {sephora => nsv13}/icons/mob/head.dmi | Bin .../mob/inhands/weapons/bombs_lefthand.dmi | Bin .../mob/inhands/weapons/bombs_righthand.dmi | Bin {sephora => nsv13}/icons/mob/suit.dmi | Bin {sephora => nsv13}/icons/mob/uniform.dmi | Bin {sephora => nsv13}/icons/obj/atmos.dmi | Bin {sephora => nsv13}/icons/obj/barricades.dmi | Bin .../icons/obj/clothing/hats.dmi | Bin .../icons/obj/clothing/suits.dmi | Bin .../icons/obj/clothing/uniforms.dmi | Bin {sephora => nsv13}/icons/obj/computers.dmi | Bin .../icons/obj/custom_stack_objects.dmi | Bin .../icons/obj/guns/projectile.dmi | Bin .../icons/obj/items_and_weapons.dmi | Bin .../icons/obj/machinery/doors/standard.dmi | Bin .../icons/obj/machinery/reactor_parts.dmi | Bin .../icons/obj/munition_types.dmi | Bin {sephora => nsv13}/icons/obj/munitions.dmi | Bin {sephora => nsv13}/icons/obj/ork.dmi | Bin {sephora => nsv13}/icons/obj/power.dmi | Bin {sephora => nsv13}/icons/obj/railgun.dmi | Bin {sephora => nsv13}/icons/obj/stairs_large.dmi | Bin .../icons/obj/structures/railing.dmi | Bin .../icons/obj/structures/ship_structures.dmi | Bin .../icons/obj/structures/windows.dmi | Bin {sephora => nsv13}/icons/overmap/default.dmi | Bin .../overmap/nanotrasen/light_cruiser.dmi | Bin .../overmap/nanotrasen/patrol_cruiser.dmi | Bin {sephora => nsv13}/icons/turf/dark_carpet.dmi | Bin {sephora => nsv13}/icons/turf/floors.dmi | Bin .../icons/turf/interior_wall.dmi | Bin .../icons/turf/reinforced_wall.dmi | Bin .../lore_entries/firing_proceedure.txt | 0 .../lore_entries/lore_terminal - Copy.html | 0 .../lore_entries/lore_terminal.txt | 0 {sephora => nsv13}/lore_entries/meltdowns.txt | 0 {sephora => nsv13}/lore_entries/ragnarok.txt | 0 .../lore_entries/stormdrive.txt | 0 {sephora => nsv13}/lore_entries/welcome.txt | 0 .../modules/atmospherics/multiz.dm | 6 +- .../modules/power/multiz_power.dm | 2 +- {sephora => nsv13}/sound/ambience/bridge.ogg | Bin .../sound/ambience/computer_core.ogg | Bin .../sound/ambience/creaking_ambience.ogg | Bin .../sound/ambience/engineering.ogg | Bin .../sound/ambience/leit_motif.ogg | Bin .../sound/ambience/maintenance.ogg | Bin {sephora => nsv13}/sound/ambience/medbay.ogg | Bin .../sound/ambience/self destruct.ogg | Bin .../sound/ambience/ship_damage/creak1.ogg | Bin .../sound/ambience/ship_damage/creak2.ogg | Bin .../sound/ambience/ship_damage/creak3.ogg | Bin .../sound/ambience/ship_damage/creak4.ogg | Bin .../sound/ambience/ship_damage/creak5.ogg | Bin .../sound/ambience/ship_damage/creak6.ogg | Bin .../sound/ambience/ship_damage/creak7.ogg | Bin .../sound/ambience/shipambience.ogg | Bin {sephora => nsv13}/sound/ambience/wind.ogg | Bin {sephora => nsv13}/sound/ambience/wind2.ogg | Bin {sephora => nsv13}/sound/ambience/wind3.ogg | Bin {sephora => nsv13}/sound/ambience/wind4.ogg | Bin {sephora => nsv13}/sound/ambience/wind5.ogg | Bin {sephora => nsv13}/sound/ambience/wind6.ogg | Bin .../sound/effects/barbed_wire_movement.ogg | Bin .../sound/effects/computer/alarm.ogg | Bin .../sound/effects/computer/alarm_2.ogg | Bin .../sound/effects/computer/alarm_3.ogg | Bin .../sound/effects/computer/alarm_4.ogg | Bin .../sound/effects/computer/beep.ogg | Bin .../sound/effects/computer/beep10.ogg | Bin .../sound/effects/computer/beep11.ogg | Bin .../sound/effects/computer/beep12.ogg | Bin .../sound/effects/computer/beep2.ogg | Bin .../sound/effects/computer/beep3.ogg | Bin .../sound/effects/computer/beep4.ogg | Bin .../sound/effects/computer/beep5.ogg | Bin .../sound/effects/computer/beep6.ogg | Bin .../sound/effects/computer/beep7.ogg | Bin .../sound/effects/computer/beep8.ogg | Bin .../sound/effects/computer/beep9.ogg | Bin .../sound/effects/computer/buzz.ogg | Bin .../sound/effects/computer/buzz2.ogg | Bin .../sound/effects/computer/error.ogg | Bin .../sound/effects/computer/error2.ogg | Bin .../sound/effects/computer/error3.ogg | Bin .../sound/effects/computer/hum.ogg | Bin .../sound/effects/computer/hum2.ogg | Bin .../sound/effects/computer/hum3.ogg | Bin .../sound/effects/computer/scroll1.ogg | Bin .../sound/effects/computer/scroll2.ogg | Bin .../sound/effects/computer/scroll3.ogg | Bin .../sound/effects/computer/scroll4.ogg | Bin .../sound/effects/computer/scroll5.ogg | Bin .../sound/effects/computer/scroll_short.ogg | Bin .../sound/effects/computer/scroll_short_2.ogg | Bin .../sound/effects/computer/scroll_start.ogg | Bin .../sound/effects/computer/startup.ogg | Bin {sephora => nsv13}/sound/effects/radio1.ogg | Bin {sephora => nsv13}/sound/effects/radio2.ogg | Bin {sephora => nsv13}/sound/effects/saberhit.ogg | Bin {sephora => nsv13}/sound/effects/saberoff.ogg | Bin {sephora => nsv13}/sound/effects/saberon.ogg | Bin .../sound/effects/ship/boarding_pod.ogg | Bin .../sound/effects/ship/damage/consolehit.ogg | Bin .../sound/effects/ship/damage/consolehit2.ogg | Bin .../sound/effects/ship/damage/consolehit3.ogg | Bin .../sound/effects/ship/damage/consolehit4.ogg | Bin .../sound/effects/ship/damage/disable.ogg | Bin .../effects/ship/damage/explosionfar_2.ogg | Bin .../effects/ship/damage/explosionfar_3.ogg | Bin .../effects/ship/damage/explosionfar_4.ogg | Bin .../effects/ship/damage/explosionfar_5.ogg | Bin .../effects/ship/damage/explosionfar_6.ogg | Bin .../effects/ship/damage/ship_explode.ogg | Bin .../sound/effects/ship/damage/shiphit.ogg | Bin .../sound/effects/ship/damage/shiphit2.ogg | Bin .../sound/effects/ship/damage/shiphit3.ogg | Bin .../sound/effects/ship/damage/shiphit4.ogg | Bin .../sound/effects/ship/damage/torpedo_hit.ogg | Bin .../sound/effects/ship/freespace2/Credits.txt | 0 .../effects/ship/freespace2/beam_shot2.wav | Bin .../ship/freespace2/computer/arc_01.wav | Bin .../ship/freespace2/computer/arc_02.wav | Bin .../ship/freespace2/computer/arc_03.wav | Bin .../ship/freespace2/computer/arc_04.wav | Bin .../ship/freespace2/computer/arc_05.wav | Bin .../ship/freespace2/computer/escape.wav | Bin .../effects/ship/freespace2/computer/fail.wav | Bin .../effects/ship/freespace2/computer/scan.wav | Bin .../ship/freespace2/computer/textdraw.wav | Bin .../sound/effects/ship/freespace2/crane_1.wav | Bin .../sound/effects/ship/freespace2/crane_2.wav | Bin .../effects/ship/freespace2/crane_short.ogg | Bin .../sound/effects/ship/freespace2/debris.wav | Bin .../sound/effects/ship/freespace2/ding1.wav | Bin .../sound/effects/ship/freespace2/ding2.wav | Bin .../sound/effects/ship/freespace2/ding3.wav | Bin .../sound/effects/ship/freespace2/ding4.wav | Bin .../sound/effects/ship/freespace2/ding5.wav | Bin .../effects/ship/freespace2/flaklaunch.wav | Bin .../ship/freespace2/impacts/boom_1.wav | Bin .../ship/freespace2/impacts/boom_2.wav | Bin .../ship/freespace2/impacts/boom_3.wav | Bin .../ship/freespace2/impacts/boom_4.wav | Bin .../effects/ship/freespace2/impacts/hit_1.wav | Bin .../effects/ship/freespace2/impacts/m_hit.wav | Bin .../ship/freespace2/impacts/subhit.wav | Bin .../ship/freespace2/impacts/subhit2.wav | Bin .../sound/effects/ship/freespace2/m_load.wav | Bin .../sound/effects/ship/freespace2/m_lock.wav | Bin .../effects/ship/freespace2/m_shrike.wav | Bin .../effects/ship/freespace2/m_stiletto.wav | Bin .../effects/ship/freespace2/m_tsunami.wav | Bin .../sound/effects/ship/freespace2/m_wasp.wav | Bin .../effects/ship/freespace2/shockwave.wav | Bin .../effects/ship/freespace2/supnova1.wav | Bin .../effects/ship/freespace2/supnova2.wav | Bin .../effects/ship/freespace2/warp_close.wav | Bin .../effects/ship/freespace2/warp_open.wav | Bin .../sound/effects/ship/general_quarters.ogg | Bin .../sound/effects/ship/mac_charge.ogg | Bin .../sound/effects/ship/mac_fire.ogg | Bin .../sound/effects/ship/mac_hold.ogg | Bin .../sound/effects/ship/mac_load.ogg | Bin {sephora => nsv13}/sound/effects/ship/pdc.ogg | Bin .../sound/effects/ship/pdc2.ogg | Bin .../sound/effects/ship/pdc3.ogg | Bin .../sound/effects/ship/pdc_start.ogg | Bin .../sound/effects/ship/plasma.ogg | Bin .../sound/effects/ship/railgun.ogg | Bin .../sound/effects/ship/railgun2.ogg | Bin .../sound/effects/ship/railgun_ready.ogg | Bin {sephora => nsv13}/sound/effects/ship/rcs.ogg | Bin .../effects/ship/reactor/core_overheating.ogg | Bin .../sound/effects/ship/reactor/explode.ogg | Bin .../effects/ship/reactor/falloutwind.ogg | Bin .../sound/effects/ship/reactor/gasmask.ogg | Bin .../sound/effects/ship/reactor/meltdown.ogg | Bin .../sound/effects/ship/reactor/startup.ogg | Bin .../sound/effects/ship/reactor/startup2.ogg | Bin .../sound/effects/ship/reload.ogg | Bin .../sound/effects/ship/torpedo.ogg | Bin .../sound/effects/ship/torpedo_detonate.ogg | Bin {sephora => nsv13}/sound/weapons/m4_fire.wav | Bin .../sound/weapons/railgun/fire.ogg | Bin .../sound/weapons/railgun/load.ogg | Bin .../sound/weapons/railgun/ready.ogg | Bin sephora/_DEFINES/overmap.dm | 17 -- tools/deploy.sh | 2 +- tools/travis/run_server.sh | 2 +- 292 files changed, 437 insertions(+), 441 deletions(-) rename sephora.dme => nsv13.dme (98%) create mode 100644 nsv13/_DEFINES/overmap.dm rename {sephora => nsv13}/code/_HELPERS/overmap.dm (100%) rename {sephora => nsv13}/code/_onclick/adjacent.dm (100%) rename {sephora => nsv13}/code/controllers/configuration/entries/game_options.dm (100%) rename {sephora => nsv13}/code/game/objects/structures/barricade.dm (96%) rename {sephora => nsv13}/code/game/objects/structures/curtains.dm (100%) rename {sephora => nsv13}/code/game/objects/structures/stairs.dm (100%) rename {sephora => nsv13}/code/modules/cargo/packs.dm (100%) rename {sephora => nsv13}/code/modules/client/preferences_toggles.dm (100%) rename {sephora => nsv13}/code/modules/client/zoom.dm (100%) rename {sephora => nsv13}/code/modules/clothing/custom_clothes.dm (85%) rename {sephora => nsv13}/code/modules/clothing/custom_outfits.dm (97%) rename {sephora => nsv13}/code/modules/clothing/masks/_masks.dm (94%) rename {sephora => nsv13}/code/modules/munitions/munitions.dm (95%) rename {sephora => nsv13}/code/modules/overmap/ai.dm (94%) rename {sephora => nsv13}/code/modules/overmap/camera.dm (95%) rename {sephora => nsv13}/code/modules/overmap/components.dm (71%) rename {sephora => nsv13}/code/modules/overmap/overmap.dm (98%) rename {sephora => nsv13}/code/modules/overmap/physics.dm (100%) rename {sephora => nsv13}/code/modules/overmap/types.dm (86%) rename {sephora => nsv13}/code/modules/overmap/weapons.dm (89%) rename {sephora => nsv13}/code/modules/power/stormdrive.dm (97%) rename {sephora => nsv13}/code/modules/recycling/disposal/multiz.dm (100%) rename {sephora => nsv13}/game/areas.dm (67%) rename {sephora => nsv13}/game/custom_airlocks.dm (75%) rename {sephora => nsv13}/game/custom_guns.dm (96%) rename {sephora => nsv13}/game/custom_items.dm (89%) rename {sephora => nsv13}/game/custom_materials.dm (91%) rename {sephora => nsv13}/game/custom_turfs.dm (90%) rename {sephora => nsv13}/game/lore_terminal.dm (91%) rename {sephora => nsv13}/game/objects/custom_ghost_role_spawners.dm (82%) rename {sephora => nsv13}/game/objects/railing.dm (69%) rename {sephora => nsv13}/goonstation/code/modules/icon_smoothing/turf_autoalign.dm (97%) rename {sephora => nsv13}/goonstation/icons/airlocks.dmi (100%) rename {sephora => nsv13}/goonstation/icons/blastdoor.dmi (100%) rename {sephora => nsv13}/goonstation/icons/command.dmi (100%) rename {sephora => nsv13}/goonstation/icons/engineering.dmi (100%) rename {sephora => nsv13}/goonstation/icons/external.dmi (100%) rename {sephora => nsv13}/goonstation/icons/maintenance.dmi (100%) rename {sephora => nsv13}/goonstation/icons/medical.dmi (100%) rename {sephora => nsv13}/goonstation/icons/public.dmi (100%) rename {sephora => nsv13}/goonstation/icons/reactor.dmi (100%) rename {sephora => nsv13}/goonstation/icons/reactor_parts.dmi (100%) rename {sephora => nsv13}/goonstation/icons/security.dmi (100%) rename {sephora => nsv13}/icons/mob/head.dmi (100%) rename {sephora => nsv13}/icons/mob/inhands/weapons/bombs_lefthand.dmi (100%) rename {sephora => nsv13}/icons/mob/inhands/weapons/bombs_righthand.dmi (100%) rename {sephora => nsv13}/icons/mob/suit.dmi (100%) rename {sephora => nsv13}/icons/mob/uniform.dmi (100%) rename {sephora => nsv13}/icons/obj/atmos.dmi (100%) rename {sephora => nsv13}/icons/obj/barricades.dmi (100%) rename {sephora => nsv13}/icons/obj/clothing/hats.dmi (100%) rename {sephora => nsv13}/icons/obj/clothing/suits.dmi (100%) rename {sephora => nsv13}/icons/obj/clothing/uniforms.dmi (100%) rename {sephora => nsv13}/icons/obj/computers.dmi (100%) rename {sephora => nsv13}/icons/obj/custom_stack_objects.dmi (100%) rename {sephora => nsv13}/icons/obj/guns/projectile.dmi (100%) rename {sephora => nsv13}/icons/obj/items_and_weapons.dmi (100%) rename {sephora => nsv13}/icons/obj/machinery/doors/standard.dmi (100%) rename {sephora => nsv13}/icons/obj/machinery/reactor_parts.dmi (100%) rename {sephora => nsv13}/icons/obj/munition_types.dmi (100%) rename {sephora => nsv13}/icons/obj/munitions.dmi (100%) rename {sephora => nsv13}/icons/obj/ork.dmi (100%) rename {sephora => nsv13}/icons/obj/power.dmi (100%) rename {sephora => nsv13}/icons/obj/railgun.dmi (100%) rename {sephora => nsv13}/icons/obj/stairs_large.dmi (100%) rename {sephora => nsv13}/icons/obj/structures/railing.dmi (100%) rename {sephora => nsv13}/icons/obj/structures/ship_structures.dmi (100%) rename {sephora => nsv13}/icons/obj/structures/windows.dmi (100%) rename {sephora => nsv13}/icons/overmap/default.dmi (100%) rename {sephora => nsv13}/icons/overmap/nanotrasen/light_cruiser.dmi (100%) rename {sephora => nsv13}/icons/overmap/nanotrasen/patrol_cruiser.dmi (100%) rename {sephora => nsv13}/icons/turf/dark_carpet.dmi (100%) rename {sephora => nsv13}/icons/turf/floors.dmi (100%) rename {sephora => nsv13}/icons/turf/interior_wall.dmi (100%) rename {sephora => nsv13}/icons/turf/reinforced_wall.dmi (100%) rename {sephora => nsv13}/lore_entries/firing_proceedure.txt (100%) rename {sephora => nsv13}/lore_entries/lore_terminal - Copy.html (100%) rename {sephora => nsv13}/lore_entries/lore_terminal.txt (100%) rename {sephora => nsv13}/lore_entries/meltdowns.txt (100%) rename {sephora => nsv13}/lore_entries/ragnarok.txt (100%) rename {sephora => nsv13}/lore_entries/stormdrive.txt (100%) rename {sephora => nsv13}/lore_entries/welcome.txt (100%) rename {sephora => nsv13}/modules/atmospherics/multiz.dm (85%) rename {sephora => nsv13}/modules/power/multiz_power.dm (98%) rename {sephora => nsv13}/sound/ambience/bridge.ogg (100%) rename {sephora => nsv13}/sound/ambience/computer_core.ogg (100%) rename {sephora => nsv13}/sound/ambience/creaking_ambience.ogg (100%) rename {sephora => nsv13}/sound/ambience/engineering.ogg (100%) rename {sephora => nsv13}/sound/ambience/leit_motif.ogg (100%) rename {sephora => nsv13}/sound/ambience/maintenance.ogg (100%) rename {sephora => nsv13}/sound/ambience/medbay.ogg (100%) rename {sephora => nsv13}/sound/ambience/self destruct.ogg (100%) rename {sephora => nsv13}/sound/ambience/ship_damage/creak1.ogg (100%) rename {sephora => nsv13}/sound/ambience/ship_damage/creak2.ogg (100%) rename {sephora => nsv13}/sound/ambience/ship_damage/creak3.ogg (100%) rename {sephora => nsv13}/sound/ambience/ship_damage/creak4.ogg (100%) rename {sephora => nsv13}/sound/ambience/ship_damage/creak5.ogg (100%) rename {sephora => nsv13}/sound/ambience/ship_damage/creak6.ogg (100%) rename {sephora => nsv13}/sound/ambience/ship_damage/creak7.ogg (100%) rename {sephora => nsv13}/sound/ambience/shipambience.ogg (100%) rename {sephora => nsv13}/sound/ambience/wind.ogg (100%) rename {sephora => nsv13}/sound/ambience/wind2.ogg (100%) rename {sephora => nsv13}/sound/ambience/wind3.ogg (100%) rename {sephora => nsv13}/sound/ambience/wind4.ogg (100%) rename {sephora => nsv13}/sound/ambience/wind5.ogg (100%) rename {sephora => nsv13}/sound/ambience/wind6.ogg (100%) rename {sephora => nsv13}/sound/effects/barbed_wire_movement.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/alarm.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/alarm_2.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/alarm_3.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/alarm_4.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/beep.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/beep10.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/beep11.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/beep12.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/beep2.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/beep3.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/beep4.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/beep5.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/beep6.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/beep7.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/beep8.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/beep9.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/buzz.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/buzz2.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/error.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/error2.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/error3.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/hum.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/hum2.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/hum3.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/scroll1.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/scroll2.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/scroll3.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/scroll4.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/scroll5.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/scroll_short.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/scroll_short_2.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/scroll_start.ogg (100%) rename {sephora => nsv13}/sound/effects/computer/startup.ogg (100%) rename {sephora => nsv13}/sound/effects/radio1.ogg (100%) rename {sephora => nsv13}/sound/effects/radio2.ogg (100%) rename {sephora => nsv13}/sound/effects/saberhit.ogg (100%) rename {sephora => nsv13}/sound/effects/saberoff.ogg (100%) rename {sephora => nsv13}/sound/effects/saberon.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/boarding_pod.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/consolehit.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/consolehit2.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/consolehit3.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/consolehit4.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/disable.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/explosionfar_2.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/explosionfar_3.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/explosionfar_4.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/explosionfar_5.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/explosionfar_6.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/ship_explode.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/shiphit.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/shiphit2.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/shiphit3.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/shiphit4.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/damage/torpedo_hit.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/Credits.txt (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/beam_shot2.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/computer/arc_01.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/computer/arc_02.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/computer/arc_03.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/computer/arc_04.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/computer/arc_05.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/computer/escape.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/computer/fail.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/computer/scan.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/computer/textdraw.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/crane_1.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/crane_2.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/crane_short.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/debris.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/ding1.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/ding2.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/ding3.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/ding4.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/ding5.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/flaklaunch.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/impacts/boom_1.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/impacts/boom_2.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/impacts/boom_3.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/impacts/boom_4.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/impacts/hit_1.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/impacts/m_hit.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/impacts/subhit.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/impacts/subhit2.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/m_load.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/m_lock.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/m_shrike.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/m_stiletto.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/m_tsunami.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/m_wasp.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/shockwave.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/supnova1.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/supnova2.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/warp_close.wav (100%) rename {sephora => nsv13}/sound/effects/ship/freespace2/warp_open.wav (100%) rename {sephora => nsv13}/sound/effects/ship/general_quarters.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/mac_charge.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/mac_fire.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/mac_hold.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/mac_load.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/pdc.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/pdc2.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/pdc3.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/pdc_start.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/plasma.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/railgun.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/railgun2.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/railgun_ready.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/rcs.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/reactor/core_overheating.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/reactor/explode.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/reactor/falloutwind.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/reactor/gasmask.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/reactor/meltdown.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/reactor/startup.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/reactor/startup2.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/reload.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/torpedo.ogg (100%) rename {sephora => nsv13}/sound/effects/ship/torpedo_detonate.ogg (100%) rename {sephora => nsv13}/sound/weapons/m4_fire.wav (100%) rename {sephora => nsv13}/sound/weapons/railgun/fire.ogg (100%) rename {sephora => nsv13}/sound/weapons/railgun/load.ogg (100%) rename {sephora => nsv13}/sound/weapons/railgun/ready.ogg (100%) delete mode 100644 sephora/_DEFINES/overmap.dm diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0b9fc17b683..5443410d5e3 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -213,10 +213,6 @@ This is good: ```` This prevents nesting levels from getting deeper then they need to be. -### Project Naming - -Public-facing references to the server should be `NSV13`, However, CODE references, such as inline downstream edits, MUST refer to the internal name `sephora`. This is to prevent undue work changing this name. - ### Develop Secure Code * Player input must always be escaped safely, we recommend you use stripped_input in all cases where you would use input. Essentially, just always treat input from players as inherently malicious and design with that use case in mind diff --git a/.travis.yml b/.travis.yml index 70c7d50f975..4c6487e940e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ matrix: - tools/travis/install_build_tools.sh - tools/travis/install_spaceman_dmm.sh dreamchecker script: - - tools/travis/check_filedirs.sh sephora.dme + - tools/travis/check_filedirs.sh nsv13.dme - tools/travis/check_changelogs.sh - find . -name "*.php" -print0 | xargs -0 -n1 php -l - find . -name "*.json" -not -path "./tgui/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py @@ -42,7 +42,7 @@ matrix: before_script: - tools/travis/template_dm_generator.py script: - - tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -DALL_MAPS sephora.dme + - tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -DALL_MAPS nsv13.dme - name: "Compile and Run Tests" addons: @@ -73,7 +73,7 @@ matrix: - mysql -u root tg_travis_prefixed < SQL/tgstation_schema_prefixed.sql - tools/travis/build_bsql.sh script: - - tools/travis/dm.sh -DTRAVISBUILDING sephora.dme || travis_terminate 1 + - tools/travis/dm.sh -DTRAVISBUILDING nsv13.dme || travis_terminate 1 - tools/travis/run_server.sh - name: "Generate Documentation" diff --git a/README.md b/README.md index 49340f0bb24..a7346ce2e20 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## NVS 13 codebase -[![Build Status](https://api.travis-ci.org/DDMers/sephora.png)](https://travis-ci.org/DDMers/sephora) [![Krihelimeter](https://www.krihelinator.xyz/badge/DDMers/sephora)](https://www.krihelinator.xyz) -[![Percentage of issues still open](https://isitmaintained.com/badge/open/DDMers/sephora.svg)](https://isitmaintained.com/project/DDMers/sephora "Percentage of issues still open") [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/DDMers/sephora.svg)](https://isitmaintained.com/project/DDMers/sephora "Average time to resolve an issue") ![Coverage](https://img.shields.io/badge/coverage---2%25-red.svg) +[![Build Status](https://api.travis-ci.org/DDMers/nsv13.png)](https://travis-ci.org/DDMers/nsv13) [![Krihelimeter](https://www.krihelinator.xyz/badge/DDMers/nsv13)](https://www.krihelinator.xyz) +[![Percentage of issues still open](https://isitmaintained.com/badge/open/DDMers/nsv13.svg)](https://isitmaintained.com/project/DDMers/nsv13 "Percentage of issues still open") [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/DDMers/nsv13.svg)](https://isitmaintained.com/project/DDMers/nsv13 "Average time to resolve an issue") ![Coverage](https://img.shields.io/badge/coverage---2%25-red.svg) [![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a) ### NSV Information diff --git a/_maps/templates/NSV13_Boarder.dmm b/_maps/templates/NSV13_Boarder.dmm index a311da3cfa1..52edff54a75 100644 --- a/_maps/templates/NSV13_Boarder.dmm +++ b/_maps/templates/NSV13_Boarder.dmm @@ -1581,7 +1581,7 @@ "ob" = ( /obj/structure/bed/pod, /obj/item/bedsheet/syndie, -/obj/effect/mob_spawn/human/sephora/syndicate_crew/pilot, +/obj/effect/mob_spawn/human/nsv13/syndicate_crew/pilot, /turf/open/floor/plasteel/dark, /area/ruin/powered/nsv13/trooptransport) "pv" = ( @@ -1839,7 +1839,7 @@ /turf/open/floor/plasteel/dark, /area/space) "YV" = ( -/obj/effect/mob_spawn/human/sephora/syndicate_crew, +/obj/effect/mob_spawn/human/nsv13/syndicate_crew, /turf/open/floor/plasteel/dark, /area/ruin/powered/nsv13/trooptransport) "Zo" = ( diff --git a/_maps/templates/NSV13_Yacht.dmm b/_maps/templates/NSV13_Yacht.dmm index 75fd4dc3ff1..ab93c788783 100644 --- a/_maps/templates/NSV13_Yacht.dmm +++ b/_maps/templates/NSV13_Yacht.dmm @@ -1569,7 +1569,7 @@ id = "Cell 2"; name = "Cell 2" }, -/obj/effect/mob_spawn/human/sephora/nt_prisoner, +/obj/effect/mob_spawn/human/nsv13/nt_prisoner, /turf/open/floor/plasteel/dark, /area/ruin/powered/nsv13/yacht) "nq" = ( @@ -2143,7 +2143,7 @@ id = "Cell 1"; name = "Cell 1" }, -/obj/effect/mob_spawn/human/sephora/nt_prisoner, +/obj/effect/mob_spawn/human/nsv13/nt_prisoner, /turf/open/floor/plasteel/dark, /area/ruin/powered/nsv13/yacht) "Lu" = ( @@ -2421,7 +2421,7 @@ id = "Cell 3"; name = "Cell 3" }, -/obj/effect/mob_spawn/human/sephora/nt_prisoner, +/obj/effect/mob_spawn/human/nsv13/nt_prisoner, /turf/open/floor/plasteel/dark, /area/ruin/powered/nsv13/yacht) "Wr" = ( diff --git a/_maps/templates/NSV13_prison_ship.dmm b/_maps/templates/NSV13_prison_ship.dmm index e96e07ab2f0..b1eda1b2093 100644 --- a/_maps/templates/NSV13_prison_ship.dmm +++ b/_maps/templates/NSV13_prison_ship.dmm @@ -1210,7 +1210,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/effect/mob_spawn/human/sephora/nt_prisoner, +/obj/effect/mob_spawn/human/nsv13/nt_prisoner, /turf/open/floor/plasteel/dark, /area/ruin/powered/nsv13/prisonship) "kb" = ( diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index fa71f63fc97..cd6a0ddbb61 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -21,7 +21,7 @@ #define DEADMIN_POSITION_HEAD (1<<17) #define DEADMIN_POSITION_SECURITY (1<<18) #define DEADMIN_POSITION_SILICON (1<<19) -#define WIDESCREEN_TOGGLE_PREF (1<<20) //Sephora - Widescreen preference +#define WIDESCREEN_TOGGLE_PREF (1<<20) //nsv13 - Widescreen preference #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS) diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index acb4fdfef67..4c14b7230c5 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -8,8 +8,8 @@ #define CHANNEL_AMBIENCE 1018 #define CHANNEL_BUZZ 1017 #define CHANNEL_BICYCLE 1016 -#define CHANNEL_SHIP_ALERT 1015 //Sephora - sound channel for looping ship alerts, EG general quarters -#define CHANNEL_REACTOR_ALERT 1014 //Sephora - sound channel for the nuclear storm drive meltdown sfx. +#define CHANNEL_SHIP_ALERT 1015 //nsv13 - sound channel for looping ship alerts, EG general quarters +#define CHANNEL_REACTOR_ALERT 1014 //nsv13 - sound channel for the nuclear storm drive meltdown sfx. //THIS SHOULD ALWAYS BE THE LOWEST ONE! //KEEP IT UPDATED diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index 091e9352fb4..2fa40c4a822 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -46,7 +46,7 @@ #define DEFAULT_UNDERLAY_ICON_STATE "plating" /atom/var/smooth = SMOOTH_FALSE -/atom/var/legacy_smooth = FALSE //Sephora - Goon walls +/atom/var/legacy_smooth = FALSE //nsv13 - Goon walls /atom/var/top_left_corner /atom/var/top_right_corner /atom/var/bottom_left_corner @@ -119,7 +119,7 @@ if(QDELETED(A)) return if(A.smooth & (SMOOTH_TRUE | SMOOTH_MORE)) - if(A.legacy_smooth) //Sephora - Adds support for goon style walls + if(A.legacy_smooth) //nsv13 - Adds support for goon style walls A.legacy_smooth() return var/adjacencies = calculate_adjacencies(A) diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm index 72520297de8..c15cd85f659 100644 --- a/code/_onclick/drag_drop.dm +++ b/code/_onclick/drag_drop.dm @@ -93,7 +93,7 @@ /obj/item/gun/CanItemAutoclick(object, location, params) . = automatic -//Sephora start - Overmap stuff +//nsv13 start - Overmap stuff /client/MouseMove(object,location,control,params) mouseParams = params mouseLocation = location @@ -107,7 +107,7 @@ /datum/proc/onMouseMove(object, location, control, params) return -//Sephora end +//nsv13 end /atom/proc/IsAutoclickable() . = 1 diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index be991960412..253ace5f193 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -217,7 +217,7 @@ if(!direct) direct = get_dir(src, newloc) setDir(direct) - //Sephora start - multi tile object handling + //nsv13 start - multi tile object handling if(bound_width != world.icon_size || bound_height != world.icon_size) var/list/newlocs = isturf(newloc) ? block(locate(newloc.x+(-bound_x)/world.icon_size,newloc.y+(-bound_y)/world.icon_size,newloc.z),locate(newloc.x+(-bound_x+bound_width)/world.icon_size-1,newloc.y+(-bound_y+bound_height)/world.icon_size-1,newloc.z)) : list(newloc) if(!newlocs) @@ -238,7 +238,7 @@ if(!newloc.Enter(src, src.loc)) return - //Sephora end + //nsv13 end if(!loc.Exit(src, newloc)) return diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index a5431a60928..272d053eccd 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1258,8 +1258,8 @@ icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi' overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_extmai - if("Ship") //Sephora Ship Stuff - icon = 'sephora/icons/obj/machinery/doors/standard.dmi' + if("Ship") //nsv13 Ship Stuff + icon = 'nsv13/icons/obj/machinery/doors/standard.dmi' overlays_file = null assemblytype = /obj/machinery/door/airlock/ship update_icon() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index d9086a3dc01..02fc2fad858 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -37,7 +37,7 @@ var/syndie = FALSE // If true, hears all well-known channels automatically, and can say/hear on the Syndicate channel. var/list/channels = list() // Map from name (see communications.dm) to on/off. First entry is current department (:h). var/list/secure_radio_connections - var/list/radio_sounds = list('sephora/sound/effects/radio1.ogg','sephora/sound/effects/radio2.ogg') //Sephora - Radios make small static noises now + var/list/radio_sounds = list('nsv13/sound/effects/radio1.ogg','nsv13/sound/effects/radio2.ogg') //nsv13 - Radios make small static noises now var/const/FREQ_LISTENING = 1 //FREQ_BROADCASTING = 2 @@ -205,7 +205,7 @@ return if(!M.IsVocal()) return - if(radio_sounds.len) //Sephora - Radios make small static sounds now. + if(radio_sounds.len) //nsv13 - Radios make small static sounds now. var/sound/radio_sound = pick(radio_sounds) playsound(M.loc, radio_sound, 50, 1) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e5afd57b93f..2a242af0630 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -15,7 +15,7 @@ /* * Metal */ - //Sephora - Torpedo Casing added to the end of this list + //nsv13 - Torpedo Casing added to the end of this list GLOBAL_LIST_INIT(metal_recipes, list ( \ new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \ diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index 2fb7b61381b..5b6cb2b55c8 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -13,4 +13,4 @@ var/perunit = MINERAL_MATERIAL_AMOUNT var/sheettype = null //this is used for girders in the creation of walls/false walls var/point_value = 0 //turn-in value for the gulag stacker - loosely relative to its rarity. - var/turf_type = null //Sephora - Wall stuff \ No newline at end of file + var/turf_type = null //nsv13 - Wall stuff \ No newline at end of file diff --git a/code/game/turfs/openspace/openspace.dm b/code/game/turfs/openspace/openspace.dm index 8371feb1a28..73c595a66e2 100644 --- a/code/game/turfs/openspace/openspace.dm +++ b/code/game/turfs/openspace/openspace.dm @@ -31,7 +31,7 @@ if(!T) vis_contents.len = 0 if(prune_on_fail) - ChangeTurf(/turf/open/space) //Sephora - Multiz explosions + ChangeTurf(/turf/open/space) //nsv13 - Multiz explosions return FALSE if(init) vis_contents += T diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index faea283ce23..c07f28b0295 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -11,7 +11,7 @@ name = "plating" icon_state = "plating" intact = FALSE - baseturfs = /turf/open/openspace //Sephora - Multiz explosions + baseturfs = /turf/open/openspace //nsv13 - Multiz explosions footstep = FOOTSTEP_PLATING barefootstep = FOOTSTEP_HARD_BAREFOOT clawfootstep = FOOTSTEP_HARD_CLAW diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 8473a15f719..f2fe7c1dc0d 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -181,7 +181,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car buttons_locked = sanitize_integer(buttons_locked, 0, 1, initial(buttons_locked)) windowflashing = sanitize_integer(windowflashing, 0, 1, initial(windowflashing)) default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot)) - toggles = sanitize_integer(toggles, 0, 105164000, initial(toggles)) //Sephora - PREFERENCES IMPORTANT! When you add a new toggle, you have to double this number. Thank you byond, VERY cool. + toggles = sanitize_integer(toggles, 0, 105164000, initial(toggles)) //nsv13 - PREFERENCES IMPORTANT! When you add a new toggle, you have to double this number. Thank you byond, VERY cool. clientfps = sanitize_integer(clientfps, 0, 1000, 0) parallax = sanitize_integer(parallax, PARALLAX_INSANE, PARALLAX_DISABLE, null) ambientocclusion = sanitize_integer(ambientocclusion, 0, 1, initial(ambientocclusion)) diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 03e9bb26eb2..ad37a599a3a 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -59,14 +59,14 @@ var/list/mind_traits // Traits added to the mind of the mob assigned this job var/display_order = JOB_DISPLAY_ORDER_DEFAULT - var/display_rank = "PVT" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + var/display_rank = "PVT" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev //Only override this proc //H is usually a human unless an /equip override transformed it /datum/job/proc/after_spawn(mob/living/H, mob/M, latejoin = FALSE) //do actions on H but send messages to M as the key may not have been transferred_yet if(ishuman(H)) //Don't give AIs a rank - H.fully_replace_character_name(H.real_name, "[display_rank] [H.real_name]") //Sephora - Visibly display player ranks with their names. + H.fully_replace_character_name(H.real_name, "[display_rank] [H.real_name]") //nsv13 - Visibly display player ranks with their names. if(mind_traits) for(var/t in mind_traits) ADD_TRAIT(H.mind, t, JOB_TRAIT) diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm index 93447d1c825..4c6e2393606 100644 --- a/code/modules/jobs/job_types/ai.dm +++ b/code/modules/jobs/job_types/ai.dm @@ -15,7 +15,7 @@ exp_type_department = EXP_TYPE_SILICON display_order = JOB_DISPLAY_ORDER_AI var/do_special_check = TRUE - display_rank = "CPU" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CPU" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/job/ai/equip(mob/living/carbon/human/H, visualsOnly, announce, latejoin, datum/outfit/outfit_override, client/preference_source = null) diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index e386b0f7c65..a58b9970a1d 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -19,7 +19,7 @@ paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_ENG display_order = JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN - display_rank = "LCPL" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "LCPL" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/atmos name = "Atmospheric Technician" diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index a95d1e3b665..b7de9be8457 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -17,7 +17,7 @@ paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_BARTENDER - display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/bartender name = "Bartender" diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index 5dc997051ad..78ea662f16f 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -16,7 +16,7 @@ paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_BOTANIST - display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/botanist name = "Botanist" diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index a0f0c77851b..dae70e6cbec 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -25,7 +25,7 @@ mind_traits = list(TRAIT_DISK_VERIFIER) display_order = JOB_DISPLAY_ORDER_CAPTAIN - display_rank = "CPT" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CPT" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/job/captain/get_access() return get_all_accesses() diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm index 6da6b76d703..d8fdf64e334 100644 --- a/code/modules/jobs/job_types/cargo_technician.dm +++ b/code/modules/jobs/job_types/cargo_technician.dm @@ -17,7 +17,7 @@ paycheck_department = ACCOUNT_CAR display_order = JOB_DISPLAY_ORDER_CARGO_TECHNICIAN - display_rank = "LCPL" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "LCPL" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/cargo_tech name = "Cargo Technician" diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index 31a0c2f80d2..fa92462f401 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -17,7 +17,7 @@ paycheck_department = ACCOUNT_CIV display_order = JOB_DISPLAY_ORDER_CHAPLAIN - display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/job/chaplain/after_spawn(mob/living/H, mob/M) . = ..() diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index c1ac17d2f91..5c1e28e5cc0 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -19,7 +19,7 @@ paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_CHEMIST - display_rank = "LCPL" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "LCPL" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/chemist name = "Chemist" diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 6d9f47585f7..79fd3d6f63d 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -30,7 +30,7 @@ paycheck_department = ACCOUNT_ENG display_order = JOB_DISPLAY_ORDER_CHIEF_ENGINEER - display_rank = "WO" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "WO" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/ce name = "Chief Engineer" diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 3dbf4653df3..33576424d4e 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -28,7 +28,7 @@ paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER - display_rank = "WO" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "WO" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/cmo name = "Chief Medical Officer" diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index 5be984ab85b..b210a368860 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -17,7 +17,7 @@ paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_CLOWN - display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/job/clown/after_spawn(mob/living/carbon/human/H, mob/M) diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index 584ce8a3e84..8f5abbf082c 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -18,7 +18,7 @@ paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_COOK - display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/cook name = "Cook" diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index a8fb135ee47..4eb4a075c07 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -17,7 +17,7 @@ paycheck_department = ACCOUNT_CIV display_order = JOB_DISPLAY_ORDER_CURATOR - display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/curator name = "Curator" diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm index bc36aade911..4660e5aec3e 100644 --- a/code/modules/jobs/job_types/cyborg.dm +++ b/code/modules/jobs/job_types/cyborg.dm @@ -13,7 +13,7 @@ exp_type = EXP_TYPE_CREW display_order = JOB_DISPLAY_ORDER_CYBORG - display_rank = "CPU" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CPU" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/job/cyborg/equip(mob/living/carbon/human/H, visualsOnly = FALSE, announce = TRUE, latejoin = FALSE, datum/outfit/outfit_override = null, client/preference_source = null) if(visualsOnly) diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 3332c5355cd..66e8d21e634 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -22,7 +22,7 @@ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) display_order = JOB_DISPLAY_ORDER_DETECTIVE - display_rank = "CPL" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CPL" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/detective name = "Detective" diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 9b8dbea4145..feff0cdf3cf 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -19,7 +19,7 @@ paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_GENETICIST - display_rank = "LCPL" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "LCPL" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/geneticist name = "Geneticist" diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 4632a9180c7..f12ccfd7f10 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -36,7 +36,7 @@ paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL - display_rank = "LT" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "LT" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/hop name = "Executive Officer" diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 32b30b249ac..7391ad3f9d4 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -31,7 +31,7 @@ paycheck_department = ACCOUNT_SEC display_order = JOB_DISPLAY_ORDER_HEAD_OF_SECURITY - display_rank = "WO" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "WO" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/hos name = "Head of Security" diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index 138e0e1fe2d..8c7cc751ff3 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -18,7 +18,7 @@ paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_JANITOR - display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/janitor name = "Janitor" diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index 5d862d82663..7637f10432e 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -19,7 +19,7 @@ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) display_order = JOB_DISPLAY_ORDER_LAWYER - display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/lawyer name = "Lawyer" diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 0a4e6059255..2473aeac20f 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -17,7 +17,7 @@ paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_MEDICAL_DOCTOR - display_rank = "CPL" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CPL" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/doctor name = "Medical Doctor" diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index fcbf81bd04d..b2ebcaa324e 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -17,7 +17,7 @@ paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_MIME - display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M) H.apply_pref_name("mime", M.client) diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 560bd02a966..1148f10dbe5 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -17,7 +17,7 @@ paycheck_department = ACCOUNT_CAR display_order = JOB_DISPLAY_ORDER_QUARTERMASTER - display_rank = "GSGT" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "GSGT" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/quartermaster name = "Quartermaster" diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 21a902b0e49..446dba7ef65 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -32,7 +32,7 @@ paycheck_department = ACCOUNT_SCI display_order = JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR - display_rank = "WO" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "WO" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/rd name = "Research Director" diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index bd1a1f3ba6e..803bff96bf9 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -19,7 +19,7 @@ paycheck_department = ACCOUNT_SCI display_order = JOB_DISPLAY_ORDER_ROBOTICIST - display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/roboticist name = "Roboticist" diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index 3e32c988760..c84b9624f93 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -20,7 +20,7 @@ paycheck_department = ACCOUNT_SCI display_order = JOB_DISPLAY_ORDER_SCIENTIST - display_rank = "CRW" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "CRW" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/scientist name = "Scientist" diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index aad8548a65c..5335de496cd 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -22,7 +22,7 @@ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) display_order = JOB_DISPLAY_ORDER_SECURITY_OFFICER - display_rank = "LCPL" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "LCPL" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/job/officer/get_access() var/list/L = list() diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index dc8ef7650c8..e2b059c7ed6 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -17,7 +17,7 @@ paycheck_department = ACCOUNT_CAR display_order = JOB_DISPLAY_ORDER_SHAFT_MINER - display_rank = "SPC" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "SPC" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/miner name = "Shaft Miner" diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index 7868c20b0ff..93862064be0 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -21,7 +21,7 @@ paycheck_department = ACCOUNT_ENG display_order = JOB_DISPLAY_ORDER_STATION_ENGINEER - display_rank = "LCPL" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "LCPL" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/engineer name = "Station Engineer" diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index 8309c145880..a9dc1d51738 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -19,7 +19,7 @@ paycheck_department = ACCOUNT_MED display_order = JOB_DISPLAY_ORDER_VIROLOGIST - display_rank = "LCPL" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "LCPL" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/outfit/job/virologist name = "Virologist" diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 65dc834e481..aa16f886d2c 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -22,7 +22,7 @@ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) display_order = JOB_DISPLAY_ORDER_WARDEN - display_rank = "GSGT" //Sephora - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev + display_rank = "GSGT" //nsv13 - Displays the player's actual rank alongside their name, such as GSGT Sergei Koralev /datum/job/warden/get_access() var/list/L = list() diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm index 83d2814283c..fb0c4035718 100644 --- a/code/modules/keybindings/bindings_mob.dm +++ b/code/modules/keybindings/bindings_mob.dm @@ -3,10 +3,10 @@ // Or we can have NPC's send actual keypresses and detect that by seeing no client /mob/key_down(_key, client/user) - if(overmap_ship)//Sephora start - Overmap hotkeys + if(overmap_ship)//nsv13 start - Overmap hotkeys if(overmap_ship.handle_hotkeys(_key, user)) return //Early return. Intercepts a keypress for overmap hotkeys - switch(_key) //Sephora end + switch(_key) //nsv13 end if("Delete", "H") if(!pulling) to_chat(src, "You are not pulling anything!") diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 37db7499483..9f39aaa6a94 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -194,7 +194,7 @@ ///List of progress bars this mob is currently seeing for actions var/list/progressbars = null //for stacking do_after bars - var/list/mousemove_intercept_objects //Sephora - Overmap movement + var/list/mousemove_intercept_objects //nsv13 - Overmap movement ///Allows a datum to intercept all click calls this mob is the source of var/datum/click_intercept diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 665c46313ea..bb047b44447 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -362,7 +362,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne var/sound/alert_sound = sound('sound/effects/alert.ogg') for(var/i in GLOB.mob_list) var/mob/M = i - if(M.z != z && !is_station_level(T.z)) //Sephora - Multiz gravgen. Continue if theyre not on our Z AND we're not the main gravgen for the primary ship. + if(M.z != z && !is_station_level(T.z)) //nsv13 - Multiz gravgen. Continue if theyre not on our Z AND we're not the main gravgen for the primary ship. continue M.update_gravity(M.mob_has_gravity()) if(M.client) @@ -379,7 +379,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne /obj/machinery/gravity_generator/main/proc/update_list() var/turf/T = get_turf(src) - if(is_station_level(T.z)) //Sephora - Multi-z gravity generators. + if(is_station_level(T.z)) //nsv13 - Multi-z gravity generators. for(var/z = 0 to world.maxz) //Loop through every Z level. If it's a station level (set by JSON file) then gravity it up. if(!GLOB.gravity_generators["[z]"]) GLOB.gravity_generators["[z]"] = list() diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index e8cc9d1b01c..d15ea4a0d24 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -240,26 +240,26 @@ if(checking.overmap_ship) if(checking.overmap_ship.faction == ship_target.faction) trajectory_ignore_forcemove = TRUE - //Sephora start - multitile objects + //nsv13 start - multitile objects var/turf/TT = trajectory.return_turf() if(!istype(TT)) qdel(src) return if(TT != loc) forceMove(get_step_towards(src, TT)) - //Sephora end + //nsv13 end trajectory_ignore_forcemove = FALSE return FALSE - if((A == firer) || (((A in firer.buckled_mobs) || (istype(checking) && (A == checking.buckled))) && (A != original)) || (A == firer.loc && (ismecha(A) || istype(A, /obj/structure/overmap)))) //cannot shoot yourself or your mech //Sephora - or your ship + if((A == firer) || (((A in firer.buckled_mobs) || (istype(checking) && (A == checking.buckled))) && (A != original)) || (A == firer.loc && (ismecha(A) || istype(A, /obj/structure/overmap)))) //cannot shoot yourself or your mech //nsv13 - or your ship trajectory_ignore_forcemove = TRUE - //Sephora start - multitile objects + //nsv13 start - multitile objects var/turf/TT = trajectory.return_turf() if(!istype(TT)) qdel(src) return if(TT != loc) forceMove(get_step_towards(src, TT)) - //Sephora end + //nsv13 end trajectory_ignore_forcemove = FALSE return FALSE var/distance = get_dist(T, starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations. diff --git a/code/modules/research/machinery/circuit_imprinter.dm b/code/modules/research/machinery/circuit_imprinter.dm index 145d2aa980b..e75adf9fe7c 100644 --- a/code/modules/research/machinery/circuit_imprinter.dm +++ b/code/modules/research/machinery/circuit_imprinter.dm @@ -19,7 +19,7 @@ ) production_animation = "circuit_imprinter_ani" allowed_buildtypes = IMPRINTER -//sephora added Advanced Munitions list above +//nsv13 added Advanced Munitions list above /obj/machinery/rnd/production/circuit_imprinter/disconnect_console() linked_console.linked_imprinter = null diff --git a/code/modules/research/machinery/protolathe.dm b/code/modules/research/machinery/protolathe.dm index 25adf7bf78b..14f769c3546 100644 --- a/code/modules/research/machinery/protolathe.dm +++ b/code/modules/research/machinery/protolathe.dm @@ -20,7 +20,7 @@ ) production_animation = "protolathe_n" allowed_buildtypes = PROTOLATHE -//sephora added Advanced Munitions list above +//nsv13 added Advanced Munitions list above /obj/machinery/rnd/production/protolathe/disconnect_console() linked_console.linked_lathe = null diff --git a/code/modules/research/machinery/techfab.dm b/code/modules/research/machinery/techfab.dm index 96721005c19..698fd73e37a 100644 --- a/code/modules/research/machinery/techfab.dm +++ b/code/modules/research/machinery/techfab.dm @@ -34,4 +34,4 @@ requires_console = FALSE consoleless_interface = TRUE allowed_buildtypes = PROTOLATHE | IMPRINTER -//sephora added Advanced Munitions list above +//nsv13 added Advanced Munitions list above diff --git a/sephora.dme b/nsv13.dme similarity index 98% rename from sephora.dme rename to nsv13.dme index 33480a18c66..946fd45bde0 100644 --- a/sephora.dme +++ b/nsv13.dme @@ -2883,39 +2883,39 @@ #include "interface\menu.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" -#include "sephora\_DEFINES\overmap.dm" -#include "sephora\code\_HELPERS\overmap.dm" -#include "sephora\code\_onclick\adjacent.dm" -#include "sephora\code\controllers\configuration\entries\game_options.dm" -#include "sephora\code\game\objects\structures\barricade.dm" -#include "sephora\code\game\objects\structures\curtains.dm" -#include "sephora\code\game\objects\structures\stairs.dm" -#include "sephora\code\modules\cargo\packs.dm" -#include "sephora\code\modules\client\preferences_toggles.dm" -#include "sephora\code\modules\client\zoom.dm" -#include "sephora\code\modules\clothing\custom_clothes.dm" -#include "sephora\code\modules\clothing\custom_outfits.dm" -#include "sephora\code\modules\clothing\masks\_masks.dm" -#include "sephora\code\modules\munitions\munitions.dm" -#include "sephora\code\modules\overmap\ai.dm" -#include "sephora\code\modules\overmap\camera.dm" -#include "sephora\code\modules\overmap\components.dm" -#include "sephora\code\modules\overmap\overmap.dm" -#include "sephora\code\modules\overmap\physics.dm" -#include "sephora\code\modules\overmap\types.dm" -#include "sephora\code\modules\overmap\weapons.dm" -#include "sephora\code\modules\power\stormdrive.dm" -#include "sephora\code\modules\recycling\disposal\multiz.dm" -#include "sephora\game\areas.dm" -#include "sephora\game\custom_airlocks.dm" -#include "sephora\game\custom_guns.dm" -#include "sephora\game\custom_items.dm" -#include "sephora\game\custom_materials.dm" -#include "sephora\game\custom_turfs.dm" -#include "sephora\game\lore_terminal.dm" -#include "sephora\game\objects\custom_ghost_role_spawners.dm" -#include "sephora\game\objects\railing.dm" -#include "sephora\goonstation\code\modules\icon_smoothing\turf_autoalign.dm" -#include "sephora\modules\atmospherics\multiz.dm" -#include "sephora\modules\power\multiz_power.dm" +#include "nsv13\_DEFINES\overmap.dm" +#include "nsv13\code\_HELPERS\overmap.dm" +#include "nsv13\code\_onclick\adjacent.dm" +#include "nsv13\code\controllers\configuration\entries\game_options.dm" +#include "nsv13\code\game\objects\structures\barricade.dm" +#include "nsv13\code\game\objects\structures\curtains.dm" +#include "nsv13\code\game\objects\structures\stairs.dm" +#include "nsv13\code\modules\cargo\packs.dm" +#include "nsv13\code\modules\client\preferences_toggles.dm" +#include "nsv13\code\modules\client\zoom.dm" +#include "nsv13\code\modules\clothing\custom_clothes.dm" +#include "nsv13\code\modules\clothing\custom_outfits.dm" +#include "nsv13\code\modules\clothing\masks\_masks.dm" +#include "nsv13\code\modules\munitions\munitions.dm" +#include "nsv13\code\modules\overmap\ai.dm" +#include "nsv13\code\modules\overmap\camera.dm" +#include "nsv13\code\modules\overmap\components.dm" +#include "nsv13\code\modules\overmap\overmap.dm" +#include "nsv13\code\modules\overmap\physics.dm" +#include "nsv13\code\modules\overmap\types.dm" +#include "nsv13\code\modules\overmap\weapons.dm" +#include "nsv13\code\modules\power\stormdrive.dm" +#include "nsv13\code\modules\recycling\disposal\multiz.dm" +#include "nsv13\game\areas.dm" +#include "nsv13\game\custom_airlocks.dm" +#include "nsv13\game\custom_guns.dm" +#include "nsv13\game\custom_items.dm" +#include "nsv13\game\custom_materials.dm" +#include "nsv13\game\custom_turfs.dm" +#include "nsv13\game\lore_terminal.dm" +#include "nsv13\game\objects\custom_ghost_role_spawners.dm" +#include "nsv13\game\objects\railing.dm" +#include "nsv13\goonstation\code\modules\icon_smoothing\turf_autoalign.dm" +#include "nsv13\modules\atmospherics\multiz.dm" +#include "nsv13\modules\power\multiz_power.dm" // END_INCLUDE diff --git a/nsv13/_DEFINES/overmap.dm b/nsv13/_DEFINES/overmap.dm new file mode 100644 index 00000000000..c48168ef31b --- /dev/null +++ b/nsv13/_DEFINES/overmap.dm @@ -0,0 +1,17 @@ +//Weapon modes + +#define FIRE_MODE_PDC 1 +#define FIRE_MODE_RAILGUN 2 +#define FIRE_MODE_TORPEDO 3 + +//AI behaviour + +#define AI_AGGRESSIVE 1 +#define AI_PASSIVE 2 +#define AI_RETALIATE 3 +#define AI_GUARD 4 + +#define isovermap(A) (istype(A, /obj/structure/overmap)) + +GLOBAL_LIST_INIT(overmap_objects, list()) +GLOBAL_LIST_INIT(overmap_impact_sounds, list('nsv13/sound/effects/ship/freespace2/impacts/boom_1.wav','nsv13/sound/effects/ship/freespace2/impacts/boom_2.wav','nsv13/sound/effects/ship/freespace2/impacts/boom_3.wav','nsv13/sound/effects/ship/freespace2/impacts/boom_4.wav','nsv13/sound/effects/ship/freespace2/impacts/m_hit.wav','nsv13/sound/effects/ship/freespace2/impacts/subhit.wav','nsv13/sound/effects/ship/freespace2/impacts/subhit2.wav','nsv13/sound/effects/ship/damage/consolehit.ogg','nsv13/sound/effects/ship/damage/consolehit2.ogg','nsv13/sound/effects/ship/damage/consolehit3.ogg','nsv13/sound/effects/ship/damage/consolehit4.ogg','nsv13/sound/effects/ship/damage/shiphit.ogg','nsv13/sound/effects/ship/damage/shiphit2.ogg','nsv13/sound/effects/ship/damage/shiphit3.ogg','nsv13/sound/effects/ship/damage/shiphit4.ogg','nsv13/sound/effects/ship/damage/torpedo_hit.ogg','nsv13/sound/effects/ship/damage/explosionfar_2.ogg','nsv13/sound/effects/ship/damage/explosionfar_3.ogg','nsv13/sound/effects/ship/damage/explosionfar_4.ogg','nsv13/sound/effects/ship/damage/explosionfar_5.ogg','nsv13/sound/effects/ship/damage/explosionfar_6.ogg')) \ No newline at end of file diff --git a/sephora/code/_HELPERS/overmap.dm b/nsv13/code/_HELPERS/overmap.dm similarity index 100% rename from sephora/code/_HELPERS/overmap.dm rename to nsv13/code/_HELPERS/overmap.dm diff --git a/sephora/code/_onclick/adjacent.dm b/nsv13/code/_onclick/adjacent.dm similarity index 100% rename from sephora/code/_onclick/adjacent.dm rename to nsv13/code/_onclick/adjacent.dm diff --git a/sephora/code/controllers/configuration/entries/game_options.dm b/nsv13/code/controllers/configuration/entries/game_options.dm similarity index 100% rename from sephora/code/controllers/configuration/entries/game_options.dm rename to nsv13/code/controllers/configuration/entries/game_options.dm diff --git a/sephora/code/game/objects/structures/barricade.dm b/nsv13/code/game/objects/structures/barricade.dm similarity index 96% rename from sephora/code/game/objects/structures/barricade.dm rename to nsv13/code/game/objects/structures/barricade.dm index c9eb92f4257..35d5368ae5e 100644 --- a/sephora/code/game/objects/structures/barricade.dm +++ b/nsv13/code/game/objects/structures/barricade.dm @@ -1,5 +1,5 @@ /obj/structure/peacekeeper_barricade //CREDIT TO CM FOR THIS. Cleanup up by Kmc. - icon = 'sephora/icons/obj/barricades.dmi' + icon = 'nsv13/icons/obj/barricades.dmi' climbable = TRUE anchored = TRUE density = TRUE @@ -201,14 +201,14 @@ if(!do_after(user, 20, target=src) || !can_wire) return - playsound(loc, 'sephora/sound/effects/barbed_wire_movement.ogg', 25, 1) + playsound(loc, 'nsv13/sound/effects/barbed_wire_movement.ogg', 25, 1) user.visible_message("[user] sets up [I] on [src].", "You set up [I] on [src].") if(!closed) - wired_overlay = image('sephora/icons/obj/barricades.dmi', icon_state = "[barricade_type]_wire") + wired_overlay = image('nsv13/icons/obj/barricades.dmi', icon_state = "[barricade_type]_wire") else - wired_overlay = image('sephora/icons/obj/barricades.dmi', icon_state = "[barricade_type]_closed_wire") + wired_overlay = image('nsv13/icons/obj/barricades.dmi', icon_state = "[barricade_type]_closed_wire") B.use(1) overlays += wired_overlay @@ -398,9 +398,9 @@ overlays -= wired_overlay if(!closed) - wired_overlay = image('sephora/icons/obj/barricades.dmi', icon_state = "[src.barricade_type]_wire") + wired_overlay = image('nsv13/icons/obj/barricades.dmi', icon_state = "[src.barricade_type]_wire") else - wired_overlay = image('sephora/icons/obj/barricades.dmi', icon_state = "[src.barricade_type]_closed_wire") + wired_overlay = image('nsv13/icons/obj/barricades.dmi', icon_state = "[src.barricade_type]_closed_wire") overlays += wired_overlay /obj/structure/peacekeeper_barricade/take_damage(amount) @@ -459,7 +459,7 @@ /obj/item/stack/barbed_wire name = "barbed wire" desc = "A spiky length of wire." - icon = 'sephora/icons/obj/barricades.dmi' + icon = 'nsv13/icons/obj/barricades.dmi' icon_state = "barbed_wire" singular_name = "length" w_class = WEIGHT_CLASS_SMALL diff --git a/sephora/code/game/objects/structures/curtains.dm b/nsv13/code/game/objects/structures/curtains.dm similarity index 100% rename from sephora/code/game/objects/structures/curtains.dm rename to nsv13/code/game/objects/structures/curtains.dm diff --git a/sephora/code/game/objects/structures/stairs.dm b/nsv13/code/game/objects/structures/stairs.dm similarity index 100% rename from sephora/code/game/objects/structures/stairs.dm rename to nsv13/code/game/objects/structures/stairs.dm diff --git a/sephora/code/modules/cargo/packs.dm b/nsv13/code/modules/cargo/packs.dm similarity index 100% rename from sephora/code/modules/cargo/packs.dm rename to nsv13/code/modules/cargo/packs.dm diff --git a/sephora/code/modules/client/preferences_toggles.dm b/nsv13/code/modules/client/preferences_toggles.dm similarity index 100% rename from sephora/code/modules/client/preferences_toggles.dm rename to nsv13/code/modules/client/preferences_toggles.dm diff --git a/sephora/code/modules/client/zoom.dm b/nsv13/code/modules/client/zoom.dm similarity index 100% rename from sephora/code/modules/client/zoom.dm rename to nsv13/code/modules/client/zoom.dm diff --git a/sephora/code/modules/clothing/custom_clothes.dm b/nsv13/code/modules/clothing/custom_clothes.dm similarity index 85% rename from sephora/code/modules/clothing/custom_clothes.dm rename to nsv13/code/modules/clothing/custom_clothes.dm index 65c4796f47f..3d096426aa7 100644 --- a/sephora/code/modules/clothing/custom_clothes.dm +++ b/nsv13/code/modules/clothing/custom_clothes.dm @@ -1,7 +1,7 @@ /obj/item/clothing/under/ship name = "Placeholder" - icon = 'sephora/icons/obj/clothing/uniforms.dmi' //Placeholder subtype for our own iconsets - alternate_worn_icon = 'sephora/icons/mob/uniform.dmi' + icon = 'nsv13/icons/obj/clothing/uniforms.dmi' //Placeholder subtype for our own iconsets + alternate_worn_icon = 'nsv13/icons/mob/uniform.dmi' icon_state = "nothing" //References uniforms.dmi item_color = "nothing" //Icon state for its worn icon, references uniform.dmi item_state = "bl_suit" @@ -46,8 +46,8 @@ /obj/item/clothing/suit/ship name = "Placeholder" - icon = 'sephora/icons/obj/clothing/suits.dmi' //Placeholder subtype for our own iconsets - alternate_worn_icon = 'sephora/icons/mob/suit.dmi' + icon = 'nsv13/icons/obj/clothing/suits.dmi' //Placeholder subtype for our own iconsets + alternate_worn_icon = 'nsv13/icons/mob/suit.dmi' /obj/item/clothing/suit/ship/peacekeeper name = "Peacekeer vest" @@ -91,16 +91,16 @@ /obj/item/clothing/head/ship name = "placeholder" - icon = 'sephora/icons/obj/clothing/hats.dmi' //Placeholder subtype for our own iconsets - alternate_worn_icon = 'sephora/icons/mob/head.dmi' + icon = 'nsv13/icons/obj/clothing/hats.dmi' //Placeholder subtype for our own iconsets + alternate_worn_icon = 'nsv13/icons/mob/head.dmi' icon_state = "beret" item_color = null /obj/item/clothing/head/ship/marine name = "Nt-4 Marine helmet" desc = "A large helmet made out of damage resistant materials." - icon = 'sephora/icons/obj/clothing/hats.dmi' //Placeholder subtype for our own iconsets - alternate_worn_icon = 'sephora/icons/mob/head.dmi' + icon = 'nsv13/icons/obj/clothing/hats.dmi' //Placeholder subtype for our own iconsets + alternate_worn_icon = 'nsv13/icons/mob/head.dmi' icon_state = "marine" item_color = null armor = list("melee" = 20, "bullet" = 20, "laser" = 10,"energy" = 5, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) @@ -108,8 +108,8 @@ /obj/item/clothing/head/beret/ship name = "beret" desc = "A beret, a mime's favorite headwear." - icon = 'sephora/icons/obj/clothing/hats.dmi' //Placeholder subtype for our own iconsets - alternate_worn_icon = 'sephora/icons/mob/head.dmi' + icon = 'nsv13/icons/obj/clothing/hats.dmi' //Placeholder subtype for our own iconsets + alternate_worn_icon = 'nsv13/icons/mob/head.dmi' icon_state = "beret" item_color = null @@ -134,10 +134,10 @@ /obj/item/clothing/head/radiation //CREDIT TO GOON FOR THE SPRITE! name = "hazmat hood" desc = "A lead lined hood which is guaranteed to keep you safe from harmful nuclear emissions. Recommended by 9/10 nuclear engineers." - icon = 'sephora/icons/obj/clothing/hats.dmi' //Placeholder subtype for our own iconsets - alternate_worn_icon = 'sephora/icons/mob/head.dmi' + icon = 'nsv13/icons/obj/clothing/hats.dmi' //Placeholder subtype for our own iconsets + alternate_worn_icon = 'nsv13/icons/mob/head.dmi' /obj/item/clothing/suit/radiation //CREDIT TO GOON FOR THE SPRITE! name = "hazmat suit" - icon = 'sephora/icons/obj/clothing/suits.dmi' //Placeholder subtype for our own iconsets - alternate_worn_icon = 'sephora/icons/mob/suit.dmi' \ No newline at end of file + icon = 'nsv13/icons/obj/clothing/suits.dmi' //Placeholder subtype for our own iconsets + alternate_worn_icon = 'nsv13/icons/mob/suit.dmi' \ No newline at end of file diff --git a/sephora/code/modules/clothing/custom_outfits.dm b/nsv13/code/modules/clothing/custom_outfits.dm similarity index 97% rename from sephora/code/modules/clothing/custom_outfits.dm rename to nsv13/code/modules/clothing/custom_outfits.dm index be6af95d39e..dfac0d18aed 100644 --- a/sephora/code/modules/clothing/custom_outfits.dm +++ b/nsv13/code/modules/clothing/custom_outfits.dm @@ -1,24 +1,24 @@ -/datum/outfit/syndicate/sleeper/pilot - name = "Syndicate Pilot - Sleeper" - gloves = /obj/item/clothing/gloves/color/black - back = null - l_pocket = null - belt = null - id = /obj/item/card/id/syndicate_command //create new id at some point - tc = 0 - -/datum/outfit/syndicate/sleeper/soldier - name = "Syndicate Soldier - Sleeper" - suit = /obj/item/clothing/suit/armor/vest - head = /obj/item/clothing/head/helmet - back = null - l_pocket = /obj/item/kitchen/knife/combat/survival - belt = null - id = /obj/item/card/id/syndicate_command //create new id at some point - tc = 0 - -/datum/outfit/sleeper/prisoner - name = "NT Prisoner - Sleeper" - uniform = /obj/item/clothing/under/rank/prisoner - shoes = /obj/item/clothing/shoes/sneakers/orange +/datum/outfit/syndicate/sleeper/pilot + name = "Syndicate Pilot - Sleeper" + gloves = /obj/item/clothing/gloves/color/black + back = null + l_pocket = null + belt = null + id = /obj/item/card/id/syndicate_command //create new id at some point + tc = 0 + +/datum/outfit/syndicate/sleeper/soldier + name = "Syndicate Soldier - Sleeper" + suit = /obj/item/clothing/suit/armor/vest + head = /obj/item/clothing/head/helmet + back = null + l_pocket = /obj/item/kitchen/knife/combat/survival + belt = null + id = /obj/item/card/id/syndicate_command //create new id at some point + tc = 0 + +/datum/outfit/sleeper/prisoner + name = "NT Prisoner - Sleeper" + uniform = /obj/item/clothing/under/rank/prisoner + shoes = /obj/item/clothing/shoes/sneakers/orange id = /obj/item/card/id/prisoner \ No newline at end of file diff --git a/sephora/code/modules/clothing/masks/_masks.dm b/nsv13/code/modules/clothing/masks/_masks.dm similarity index 94% rename from sephora/code/modules/clothing/masks/_masks.dm rename to nsv13/code/modules/clothing/masks/_masks.dm index eb61e78b4dd..9ee556520f7 100644 --- a/sephora/code/modules/clothing/masks/_masks.dm +++ b/nsv13/code/modules/clothing/masks/_masks.dm @@ -53,6 +53,6 @@ soundloop?.stop() /datum/looping_sound/gasmask - mid_sounds = list('sephora/sound/effects/ship/reactor/gasmask.ogg') + mid_sounds = list('nsv13/sound/effects/ship/reactor/gasmask.ogg') mid_length = 3 SECONDS volume = 30 \ No newline at end of file diff --git a/sephora/code/modules/munitions/munitions.dm b/nsv13/code/modules/munitions/munitions.dm similarity index 95% rename from sephora/code/modules/munitions/munitions.dm rename to nsv13/code/modules/munitions/munitions.dm index bc7c35cf712..9086c9ce886 100644 --- a/sephora/code/modules/munitions/munitions.dm +++ b/nsv13/code/modules/munitions/munitions.dm @@ -1,6 +1,6 @@ /obj/structure/munition //CREDIT TO CM FOR THIS SPRITE name = "NTP-2 530mm torpedo" - icon = 'sephora/icons/obj/munition_types.dmi' + icon = 'nsv13/icons/obj/munition_types.dmi' icon_state = "standard" desc = "A fairly standard torpedo which is designed to cause massive structural damage to a target. It is fitted with a basic homing mechanism to ensure it always hits the mark." anchored = TRUE @@ -11,28 +11,28 @@ /obj/structure/munition/hull_shredder //High damage torp. Use this when youve exhausted their flak. name = "NTP-4 'BNKR' 430mm torpedo" - icon = 'sephora/icons/obj/munition_types.dmi' + icon = 'nsv13/icons/obj/munition_types.dmi' icon_state = "hull_shredder" desc = "A heavy torpedo which is packed with a high energy plasma charge, allowing it to impact a target with massive force." torpedo_type = /obj/item/projectile/bullet/torpedo/shredder /obj/structure/munition/fast //Gap closer, weaker but quick. name = "NTP-1 'SPD' 430mm high velocity torpedo" - icon = 'sephora/icons/obj/munition_types.dmi' + icon = 'nsv13/icons/obj/munition_types.dmi' icon_state = "highvelocity" desc = "A small torpedo which is fitted with an advanced propulsion system, allowing it to rapidly travel long distances. Due to its smaller frame however, it packs less of a punch." torpedo_type = /obj/item/projectile/bullet/torpedo/fast /obj/structure/munition/decoy //A dud missile designed to exhaust flak name = "NTP-0x 'DCY' 530mm electronic countermeasure" - icon = 'sephora/icons/obj/munition_types.dmi' + icon = 'nsv13/icons/obj/munition_types.dmi' icon_state = "decoy" desc = "A simple electronic countermeasure packed inside a standard torpedo casing. This model excels at diverting enemy PDC emplacements away from friendly ships, or even another barrage of missiles." torpedo_type = /obj/item/projectile/bullet/torpedo/decoy /obj/structure/munition/nuke //The alpha torpedo name = "NTNK 'Oncoming Storm' 700mm thermonuclear warhead" - icon = 'sephora/icons/obj/munition_types.dmi' + icon = 'nsv13/icons/obj/munition_types.dmi' icon_state = "nuke" desc = "The NTX-class IV nuclear torpedo carries a radiological payload which is capable of inflicting catastrophic damage against enemy ships, stations or dense population centers. These weapons are utterly without mercy and will annihilate indiscriminately, use with EXTREME caution." torpedo_type = /obj/item/projectile/bullet/torpedo/nuclear @@ -71,7 +71,7 @@ /obj/structure/munitions_trolley name = "Munitions trolley" - icon = 'sephora/icons/obj/munitions.dmi' + icon = 'nsv13/icons/obj/munitions.dmi' icon_state = "trolley" desc = "A large trolley designed for ferrying munitions around. It has slots for traditional ammo magazines as well as a rack for loading torpedoes. To load it, click and drag the desired munition onto the rack." anchored = FALSE @@ -122,7 +122,7 @@ // if(istype(A, /obj/item)) // if(!user.transferItemToLoc(A, src)) // return - playsound(src, 'sephora/sound/effects/ship/mac_load.ogg', 100, 1) + playsound(src, 'nsv13/sound/effects/ship/mac_load.ogg', 100, 1) if(istype(A, /obj/structure/munition)) A.forceMove(src) A.pixel_y = 10+(capacity*10) @@ -178,7 +178,7 @@ /obj/structure/ship_weapon //CREDIT TO CM FOR THE SPRITES! name = "A ship weapon" desc = "Don't use this, use the subtypes" - icon = 'sephora/icons/obj/railgun.dmi' + icon = 'nsv13/icons/obj/railgun.dmi' icon_state = "OBC" density = TRUE anchored = TRUE @@ -186,8 +186,8 @@ bound_height = 64 pixel_y = -64 layer = BELOW_OBJ_LAYER - var/fire_sound = 'sephora/sound/effects/ship/mac_fire.ogg' - var/load_sound = 'sephora/sound/effects/ship/reload.ogg' + var/fire_sound = 'nsv13/sound/effects/ship/mac_fire.ogg' + var/load_sound = 'nsv13/sound/effects/ship/reload.ogg' var/safety = TRUE //Can only fire when safeties are off var/loading = FALSE var/obj/structure/munition/preload = null @@ -218,18 +218,18 @@ /obj/structure/ship_weapon/torpedo_launcher //heavily modified CM sprite name = "M4-B Torpedo tube" desc = "A weapon system that's employed by nigh on all modern ships. It's capable of delivering a self-propelling warhead with pinpoint accuracy to utterly annihilate a target." - icon = 'sephora/icons/obj/railgun.dmi' + icon = 'nsv13/icons/obj/railgun.dmi' icon_state = "torpedo" bound_height = 32 bound_width = 96 pixel_y = -72 pixel_x = -32 - fire_sound = 'sephora/sound/effects/ship/plasma.ogg' - load_sound = 'sephora/sound/effects/ship/freespace2/m_load.wav' + fire_sound = 'nsv13/sound/effects/ship/plasma.ogg' + load_sound = 'nsv13/sound/effects/ship/freespace2/m_load.wav' /obj/structure/ship_weapon_computer name = "munitions control computer" - icon = 'sephora/icons/obj/munitions.dmi' + icon = 'nsv13/icons/obj/munitions.dmi' icon_state = "munitions_console" density = TRUE anchored = TRUE @@ -297,7 +297,7 @@ to_chat(user, "You load [A] into [src].") loading = FALSE A.forceMove(src) - playsound(src, 'sephora/sound/effects/ship/mac_load.ogg', 100, 1) + playsound(src, 'nsv13/sound/effects/ship/mac_load.ogg', 100, 1) preload = A loading = FALSE else @@ -307,7 +307,7 @@ if(!preload || loaded) return flick("[initial(icon_state)]_loading",src) - playsound(src, 'sephora/sound/effects/ship/freespace2/crane_short.ogg', 100, 1) + playsound(src, 'nsv13/sound/effects/ship/freespace2/crane_short.ogg', 100, 1) var/atom/movable/temp = preload preload = null sleep(20) @@ -320,7 +320,7 @@ if(!loaded || firing) return flick("[initial(icon_state)]_unloading",src) - playsound(src, 'sephora/sound/effects/ship/freespace2/crane_short.ogg', 100, 1) + playsound(src, 'nsv13/sound/effects/ship/freespace2/crane_short.ogg', 100, 1) sleep(20) loaded.forceMove(get_turf(src)) preload = null @@ -335,7 +335,7 @@ flick("[initial(icon_state)]_chambering",src) sleep(10) icon_state = "[initial(icon_state)]_chambered" - playsound(src, 'sephora/sound/weapons/railgun/ready.ogg', 100, 1) + playsound(src, 'nsv13/sound/weapons/railgun/ready.ogg', 100, 1) /obj/structure/ship_weapon/proc/fire() if(!chambered || safety || firing) @@ -367,7 +367,7 @@ /obj/structure/ship_weapon/railgun name = "NT-STC4 Ship mounted railgun chamber" desc = "A powerful ship-to-ship weapon which uses a localized magnetic field accelerate a projectile through a spinally mounted railgun with a 360 degree rotation axis. This particular model has an effective range of 20,000KM." - icon = 'sephora/icons/obj/railgun.dmi' + icon = 'nsv13/icons/obj/railgun.dmi' icon_state = "OBC" /obj/structure/ship_weapon/railgun/MouseDrop_T(obj/structure/A, mob/user) @@ -377,9 +377,9 @@ name = "M4 NTRS '30mm' teflon coated tungsten round" desc = "A gigantic slug that's designed to be fired out of a railgun. It's extremely heavy, but doesn't actually contain any volatile components, so it's safe to manhandle." icon_state = "railgun_ammo" - lefthand_file = 'sephora/icons/mob/inhands/weapons/bombs_lefthand.dmi' - righthand_file = 'sephora/icons/mob/inhands/weapons/bombs_righthand.dmi' - icon = 'sephora/icons/obj/munitions.dmi' + lefthand_file = 'nsv13/icons/mob/inhands/weapons/bombs_lefthand.dmi' + righthand_file = 'nsv13/icons/mob/inhands/weapons/bombs_righthand.dmi' + icon = 'nsv13/icons/obj/munitions.dmi' w_class = 4 var/proj_type = /obj/item/projectile/bullet/railgun_slug @@ -395,7 +395,7 @@ to_chat(user, "You load [I] into [src].") loading = FALSE I.forceMove(src) - playsound(src, 'sephora/sound/effects/ship/mac_load.ogg', 100, 1) + playsound(src, 'nsv13/sound/effects/ship/mac_load.ogg', 100, 1) preload = I return FALSE loading = FALSE @@ -405,7 +405,7 @@ /obj/structure/pdc_mount name = "PDC loading rack" - icon = 'sephora/icons/obj/munitions.dmi' + icon = 'nsv13/icons/obj/munitions.dmi' icon_state = "pdc" desc = "Seegson's all-in-one PDC targeting computer, ammunition loader, and human interface has proven extremely popular in recent times. It's rare to see a ship without one of these." anchored = TRUE @@ -777,7 +777,7 @@ /obj/item/torpedo/warhead name = "NTP-2 standard torpedo warhead" - icon = 'sephora/icons/obj/munitions.dmi' + icon = 'nsv13/icons/obj/munitions.dmi' icon_state = "warhead" desc = "A heavy warhead designed to be fitted to a torpedo. It's currently inert." w_class = WEIGHT_CLASS_HUGE @@ -809,7 +809,7 @@ /obj/item/torpedo/guidance_system name = "torpedo guidance system" - icon = 'sephora/icons/obj/munitions.dmi' + icon = 'nsv13/icons/obj/munitions.dmi' icon_state = "guidance" desc = "A guidance module for a torpedo which allows them to lock onto a target inside their operational range. The microcomputer inside it is capable of performing thousands of calculations a second." w_class = WEIGHT_CLASS_NORMAL @@ -817,7 +817,7 @@ /obj/item/torpedo/propulsion_system name = "torpedo propulsion system" - icon = 'sephora/icons/obj/munitions.dmi' + icon = 'nsv13/icons/obj/munitions.dmi' icon_state = "propulsion" desc = "A gimballed thruster with an attachment nozzle, designed to be mounted in torpedoes." w_class = WEIGHT_CLASS_BULKY @@ -825,7 +825,7 @@ /obj/item/torpedo/iff_card //This should be abuseable via emag name = "torpedo IFF card" - icon = 'sephora/icons/obj/munitions.dmi' + icon = 'nsv13/icons/obj/munitions.dmi' icon_state = "iff" desc = "An IFF chip which allows a torpedo to distinguish friend from foe. The electronics contained herein are relatively simple, but they form a crucial part of any good torpedo." w_class = WEIGHT_CLASS_SMALL diff --git a/sephora/code/modules/overmap/ai.dm b/nsv13/code/modules/overmap/ai.dm similarity index 94% rename from sephora/code/modules/overmap/ai.dm rename to nsv13/code/modules/overmap/ai.dm index 3fd74f570c9..6f208531d2c 100644 --- a/sephora/code/modules/overmap/ai.dm +++ b/nsv13/code/modules/overmap/ai.dm @@ -65,6 +65,6 @@ return enemies += target if(OM.tactical) - var/sound = pick('sephora/sound/effects/computer/alarm.ogg','sephora/sound/effects/computer/alarm_3.ogg','sephora/sound/effects/computer/alarm_4.ogg') + var/sound = pick('nsv13/sound/effects/computer/alarm.ogg','nsv13/sound/effects/computer/alarm_3.ogg','nsv13/sound/effects/computer/alarm_4.ogg') var/message = "DANGER: [src] is now targeting [OM]." OM.tactical.relay_sound(sound, message) \ No newline at end of file diff --git a/sephora/code/modules/overmap/camera.dm b/nsv13/code/modules/overmap/camera.dm similarity index 95% rename from sephora/code/modules/overmap/camera.dm rename to nsv13/code/modules/overmap/camera.dm index 11d535bf8d0..3690e2bcfda 100644 --- a/sephora/code/modules/overmap/camera.dm +++ b/nsv13/code/modules/overmap/camera.dm @@ -34,10 +34,10 @@ if(M == pilot) pilot = null if(helm) - playsound(helm, 'sephora/sound/effects/computer/hum.ogg', 100, 1) + playsound(helm, 'nsv13/sound/effects/computer/hum.ogg', 100, 1) if(M == gunner) if(tactical) - playsound(tactical, 'sephora/sound/effects/computer/hum.ogg', 100, 1) + playsound(tactical, 'nsv13/sound/effects/computer/hum.ogg', 100, 1) gunner = null if(M.client) M.client.check_view() diff --git a/sephora/code/modules/overmap/components.dm b/nsv13/code/modules/overmap/components.dm similarity index 71% rename from sephora/code/modules/overmap/components.dm rename to nsv13/code/modules/overmap/components.dm index 0a8ae4b8434..b84de280843 100644 --- a/sephora/code/modules/overmap/components.dm +++ b/nsv13/code/modules/overmap/components.dm @@ -1,4 +1,4 @@ -GLOBAL_LIST_INIT(computer_beeps, list('sephora/sound/effects/computer/beep.ogg','sephora/sound/effects/computer/beep2.ogg','sephora/sound/effects/computer/beep3.ogg','sephora/sound/effects/computer/beep4.ogg','sephora/sound/effects/computer/beep5.ogg','sephora/sound/effects/computer/beep6.ogg','sephora/sound/effects/computer/beep7.ogg','sephora/sound/effects/computer/beep8.ogg','sephora/sound/effects/computer/beep9.ogg','sephora/sound/effects/computer/beep10.ogg','sephora/sound/effects/computer/beep11.ogg','sephora/sound/effects/computer/beep12.ogg')) +GLOBAL_LIST_INIT(computer_beeps, list('nsv13/sound/effects/computer/beep.ogg','nsv13/sound/effects/computer/beep2.ogg','nsv13/sound/effects/computer/beep3.ogg','nsv13/sound/effects/computer/beep4.ogg','nsv13/sound/effects/computer/beep5.ogg','nsv13/sound/effects/computer/beep6.ogg','nsv13/sound/effects/computer/beep7.ogg','nsv13/sound/effects/computer/beep8.ogg','nsv13/sound/effects/computer/beep9.ogg','nsv13/sound/effects/computer/beep10.ogg','nsv13/sound/effects/computer/beep11.ogg','nsv13/sound/effects/computer/beep12.ogg')) /obj/machinery/computer/ship name = "A ship component" @@ -37,18 +37,18 @@ GLOBAL_LIST_INIT(computer_beeps, list('sephora/sound/effects/computer/beep.ogg', /obj/machinery/computer/ship/attack_hand(mob/user) if(!allowed(user)) - var/sound = pick('sephora/sound/effects/computer/error.ogg','sephora/sound/effects/computer/error2.ogg','sephora/sound/effects/computer/error3.ogg') + var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg') playsound(src, sound, 100, 1) to_chat(user, "Access denied") return if(!has_overmap()) - var/sound = pick('sephora/sound/effects/computer/error.ogg','sephora/sound/effects/computer/error2.ogg','sephora/sound/effects/computer/error3.ogg') + var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg') playsound(src, sound, 100, 1) to_chat(user, "A warning flashes across [src]'s screen: Unable to locate thrust parameters, no registered ship stored in microprocessor.") return if(!position) return - playsound(src, 'sephora/sound/effects/computer/startup.ogg', 75, 1) + playsound(src, 'nsv13/sound/effects/computer/startup.ogg', 75, 1) return linked.start_piloting(user, position) /obj/machinery/computer/ship/helm @@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(computer_beeps, list('sephora/sound/effects/computer/beep.ogg', /obj/machinery/computer/ship/viewscreen name = "Seegson model M viewscreen" desc = "A large CRT monitor which shows an exterior view of the ship." - icon = 'sephora/icons/obj/computers.dmi' + icon = 'nsv13/icons/obj/computers.dmi' icon_state = "viewscreen" mouse_over_pointer = MOUSE_HAND_POINTER pixel_y = 26 @@ -85,12 +85,12 @@ GLOBAL_LIST_INIT(computer_beeps, list('sephora/sound/effects/computer/beep.ogg', . = ..() if(!has_overmap()) return - playsound(src, 'sephora/sound/effects/computer/hum.ogg', 100, 1) + playsound(src, 'nsv13/sound/effects/computer/hum.ogg', 100, 1) linked.start_piloting(user, "observer") /obj/machinery/computer/ship/viewscreen/attack_hand(mob/user) . = ..() if(!has_overmap()) return - playsound(src, 'sephora/sound/effects/computer/hum.ogg', 100, 1) + playsound(src, 'nsv13/sound/effects/computer/hum.ogg', 100, 1) linked.start_piloting(user, "observer") \ No newline at end of file diff --git a/sephora/code/modules/overmap/overmap.dm b/nsv13/code/modules/overmap/overmap.dm similarity index 98% rename from sephora/code/modules/overmap/overmap.dm rename to nsv13/code/modules/overmap/overmap.dm index a03103b6aa6..88c066bc99e 100644 --- a/sephora/code/modules/overmap/overmap.dm +++ b/nsv13/code/modules/overmap/overmap.dm @@ -15,7 +15,7 @@ /obj/structure/overmap name = "overmap ship" desc = "A space faring vessel." - icon = 'sephora/icons/overmap/default.dmi' + icon = 'nsv13/icons/overmap/default.dmi' icon_state = "default" density = TRUE dir = NORTH @@ -194,7 +194,7 @@ if(WEST) desired_angle -= max_angular_acceleration*0.1 -// relay('sephora/sound/effects/ship/rcs.ogg') +// relay('nsv13/sound/effects/ship/rcs.ogg') /obj/structure/overmap/onMouseMove(object,location,control,params) if(!pilot || !pilot.client || pilot.incapacitated() || !move_by_mouse)//TEST REMOVE ME @@ -220,7 +220,7 @@ if(angle == desired_angle) return //No RCS needed if we're already facing where we want to go if(prob(20) && desired_angle) - playsound(src, 'sephora/sound/effects/ship/rcs.ogg', 30, 1) + playsound(src, 'nsv13/sound/effects/ship/rcs.ogg', 30, 1) var/list/left_thrusts = list() left_thrusts.len = 8 var/list/right_thrusts = list() diff --git a/sephora/code/modules/overmap/physics.dm b/nsv13/code/modules/overmap/physics.dm similarity index 100% rename from sephora/code/modules/overmap/physics.dm rename to nsv13/code/modules/overmap/physics.dm diff --git a/sephora/code/modules/overmap/types.dm b/nsv13/code/modules/overmap/types.dm similarity index 86% rename from sephora/code/modules/overmap/types.dm rename to nsv13/code/modules/overmap/types.dm index 5953fe1aa6e..5e18103cd51 100644 --- a/sephora/code/modules/overmap/types.dm +++ b/nsv13/code/modules/overmap/types.dm @@ -1,14 +1,14 @@ /obj/structure/overmap/nanotrasen name = "nanotrasen ship" desc = "A NT owned space faring vessel." - icon = 'sephora/icons/overmap/default.dmi' + icon = 'nsv13/icons/overmap/default.dmi' icon_state = "default" faction = "nanotrasen" /obj/structure/overmap/nanotrasen/light_cruiser name = "loki class light cruiser" desc = "A small and agile vessel which is designed for escort missions and independant patrols. This ship class is the backbone of Nanotrasen's navy." - icon = 'sephora/icons/overmap/nanotrasen/light_cruiser.dmi' + icon = 'nsv13/icons/overmap/nanotrasen/light_cruiser.dmi' icon_state = "cruiser" bound_width = 96 //Change this on a per ship basis bound_height = 96 @@ -19,7 +19,7 @@ /obj/structure/overmap/nanotrasen/patrol_cruiser name = "ragnarok class heavy cruiser" desc = "A medium sized ship with an advanced railgun, long range torpedo systems and multiple PDCs. This ship is still somewhat agile, but excels at bombarding targets from extreme range." - icon = 'sephora/icons/overmap/nanotrasen/patrol_cruiser.dmi' + icon = 'nsv13/icons/overmap/nanotrasen/patrol_cruiser.dmi' icon_state = "patrol_cruiser" bound_width = 128 //Change this on a per ship basis bound_height = 256 @@ -39,7 +39,7 @@ ai_behaviour = AI_AGGRESSIVE /obj/structure/overmap/nanotrasen/ai //Generic good guy #10000. - icon = 'sephora/icons/overmap/nanotrasen/light_cruiser.dmi' + icon = 'nsv13/icons/overmap/nanotrasen/light_cruiser.dmi' icon_state = "cruiser" ai_controlled = TRUE ai_behaviour = AI_AGGRESSIVE @@ -54,12 +54,12 @@ /obj/structure/overmap/syndicate name = "syndicate ship" desc = "A syndicate owned space faring vessel, it's painted with an ominous black and red motif." - icon = 'sephora/icons/overmap/default.dmi' + icon = 'nsv13/icons/overmap/default.dmi' icon_state = "default" faction = "syndicate" /obj/structure/overmap/syndicate/ai //Generic bad guy #10000. GRR. - icon = 'sephora/icons/overmap/nanotrasen/light_cruiser.dmi' + icon = 'nsv13/icons/overmap/nanotrasen/light_cruiser.dmi' icon_state = "cruiser" ai_controlled = TRUE ai_behaviour = AI_AGGRESSIVE diff --git a/sephora/code/modules/overmap/weapons.dm b/nsv13/code/modules/overmap/weapons.dm similarity index 89% rename from sephora/code/modules/overmap/weapons.dm rename to nsv13/code/modules/overmap/weapons.dm index 2c988d798d9..56da10ec1bd 100644 --- a/sephora/code/modules/overmap/weapons.dm +++ b/nsv13/code/modules/overmap/weapons.dm @@ -38,7 +38,7 @@ var/obj/structure/overmap/our_ship = enemy.overmap_ship if(OM.faction != our_ship.faction) new /obj/effect/temp_visual/impact_effect/torpedo(get_turf(src)) //Exploding effect - var/sound/chosen = pick('sephora/sound/effects/ship/torpedo_detonate.ogg','sephora/sound/effects/ship/freespace2/impacts/boom_2.wav','sephora/sound/effects/ship/freespace2/impacts/boom_3.wav','sephora/sound/effects/ship/freespace2/impacts/subhit.wav','sephora/sound/effects/ship/freespace2/impacts/subhit2.wav','sephora/sound/effects/ship/freespace2/impacts/m_hit.wav','sephora/sound/effects/ship/freespace2/impacts/hit_1.wav') + var/sound/chosen = pick('nsv13/sound/effects/ship/torpedo_detonate.ogg','nsv13/sound/effects/ship/freespace2/impacts/boom_2.wav','nsv13/sound/effects/ship/freespace2/impacts/boom_3.wav','nsv13/sound/effects/ship/freespace2/impacts/subhit.wav','nsv13/sound/effects/ship/freespace2/impacts/subhit2.wav','nsv13/sound/effects/ship/freespace2/impacts/m_hit.wav','nsv13/sound/effects/ship/freespace2/impacts/hit_1.wav') OM.relay_to_nearby(chosen) qdel(src) return FALSE @@ -91,7 +91,7 @@ if(!can_fire_pdcs(shots_per)) to_chat(gunner, "DANGER: Point defense emplacements are unable to fire due to lack of ammunition.") return - var/sound/chosen = pick('sephora/sound/effects/ship/pdc.ogg','sephora/sound/effects/ship/pdc2.ogg','sephora/sound/effects/ship/pdc3.ogg') + var/sound/chosen = pick('nsv13/sound/effects/ship/pdc.ogg','nsv13/sound/effects/ship/pdc2.ogg','nsv13/sound/effects/ship/pdc3.ogg') relay_to_nearby(chosen) for(var/i = 0, i < shots_per, i++) sleep(1) @@ -145,7 +145,7 @@ if(FIRE_MODE_RAILGUN) flick("railgun_charge",railgun_overlay) addtimer(CALLBACK(src, .proc/fire_railgun, target), 20) - var/sound/chosen = pick('sephora/sound/effects/ship/railgun.ogg','sephora/sound/effects/ship/railgun2.ogg') + var/sound/chosen = pick('nsv13/sound/effects/ship/railgun.ogg','nsv13/sound/effects/ship/railgun2.ogg') relay_to_nearby(chosen) if(FIRE_MODE_TORPEDO) //In case of bugs. fire_torpedo(target) @@ -162,15 +162,15 @@ switch(fire_mode) if(FIRE_MODE_PDC) to_chat(usr, "Defensive flak screens: OFFLINE. Activating manual point defense cannon control.") - relay('sephora/sound/effects/ship/pdc_start.ogg') + relay('nsv13/sound/effects/ship/pdc_start.ogg') swap_to(FIRE_MODE_PDC) if(FIRE_MODE_RAILGUN) to_chat(usr, "Charging railgun hardpoints...") - relay('sephora/sound/effects/ship/railgun_ready.ogg') + relay('nsv13/sound/effects/ship/railgun_ready.ogg') swap_to(FIRE_MODE_RAILGUN) if(FIRE_MODE_TORPEDO) to_chat(usr, "Long range target acquisition systems: online.") - relay('sephora/sound/effects/ship/reload.ogg') + relay('nsv13/sound/effects/ship/reload.ogg') swap_to(FIRE_MODE_TORPEDO) /obj/structure/overmap/proc/swap_to(what=FIRE_MODE_PDC) @@ -219,7 +219,7 @@ if(proj_type) //Found a gun and fired it. No need to fire all the guns at once break if(proj_type) - var/sound/chosen = pick('sephora/sound/effects/ship/torpedo.ogg','sephora/sound/effects/ship/freespace2/m_shrike.wav','sephora/sound/effects/ship/freespace2/m_stiletto.wav','sephora/sound/effects/ship/freespace2/m_tsunami.wav','sephora/sound/effects/ship/freespace2/m_wasp.wav') + var/sound/chosen = pick('nsv13/sound/effects/ship/torpedo.ogg','nsv13/sound/effects/ship/freespace2/m_shrike.wav','nsv13/sound/effects/ship/freespace2/m_stiletto.wav','nsv13/sound/effects/ship/freespace2/m_tsunami.wav','nsv13/sound/effects/ship/freespace2/m_wasp.wav') relay_to_nearby(chosen) if(proj_type == /obj/item/projectile/bullet/torpedo/dud) //Some brainlet MAA loaded an incomplete torp fire_projectile(proj_type, target, homing = FALSE, speed=1, explosive = TRUE) diff --git a/sephora/code/modules/power/stormdrive.dm b/nsv13/code/modules/power/stormdrive.dm similarity index 97% rename from sephora/code/modules/power/stormdrive.dm rename to nsv13/code/modules/power/stormdrive.dm index 1bb5b35c829..18b5f944c0f 100644 --- a/sephora/code/modules/power/stormdrive.dm +++ b/nsv13/code/modules/power/stormdrive.dm @@ -62,7 +62,7 @@ Takes plasma and outputs superheated plasma and a shitload of radiation. /obj/machinery/power/stormdrive_reactor name = "class IV nuclear storm drive" desc = "This monstrosity is what we got when nanotrasen engineers decided to inject magnetically constricted plasma into a nuclear reactor. It's able of outputting an ungodly amount of super-heated plasma, radiation, and fire... But god help you if it ever melts down." - icon = 'sephora/goonstation/icons/reactor.dmi' + icon = 'nsv13/goonstation/icons/reactor.dmi' icon_state = "reactor_off" pixel_x = -16 density = TRUE @@ -139,12 +139,12 @@ Takes plasma and outputs superheated plasma and a shitload of radiation. state = REACTOR_STATE_IDLE //Force reactor restart. set_light(0) var/area/AR = get_area(src) - AR.looping_ambience = 'sephora/sound/ambience/shipambience.ogg' + AR.looping_ambience = 'nsv13/sound/ambience/shipambience.ogg' /obj/structure/reactor_control_computer name = "Seegson model RBMK reactor control console" desc = "A state of the art terminal which is linked to a nuclear storm drive reactor. It has several buttons labelled 'AZ' on the keyboard." - icon = 'sephora/icons/obj/machinery/reactor_parts.dmi' + icon = 'nsv13/icons/obj/machinery/reactor_parts.dmi' icon_state = "rodconsole" density = TRUE anchored = TRUE @@ -162,7 +162,7 @@ Takes plasma and outputs superheated plasma and a shitload of radiation. if(!reactor) return if(!allowed(user)) - var/sound = pick('sephora/sound/effects/computer/error.ogg','sephora/sound/effects/computer/error2.ogg','sephora/sound/effects/computer/error3.ogg') + var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg') playsound(src, sound, 100, 1) to_chat(user, "Access denied") return @@ -181,7 +181,7 @@ Takes plasma and outputs superheated plasma and a shitload of radiation. if(reactor.pipe?.on == FALSE) dat += "AZ-6: Open release valve
" dat += "

---Statistics:---

" - dat += " Last recorded temperature: [reactor?.heat] (°C)
" + dat += " Last recorded temperature: [reactor?.heat] (�C)
" dat += " Reported control rod health: [reactor?.rod_integrity] %
" if(reactor.pipe) var/datum/gas_mixture/air1 = reactor.pipe.airs[1] @@ -270,11 +270,11 @@ Takes plasma and outputs superheated plasma and a shitload of radiation. START_PROCESSING(SSmachines,src) state = REACTOR_STATE_RUNNING set_light(5) - var/startup_sound = pick('sephora/sound/effects/ship/reactor/startup.ogg', 'sephora/sound/effects/ship/reactor/startup2.ogg') + var/startup_sound = pick('nsv13/sound/effects/ship/reactor/startup.ogg', 'nsv13/sound/effects/ship/reactor/startup2.ogg') playsound(loc, startup_sound, 100) send_alert("Fission reaction initiated. Reactor now on-line.", override=TRUE) var/area/AR = get_area(src) - AR.looping_ambience = 'sephora/sound/ambience/engineering.ogg' + AR.looping_ambience = 'nsv13/sound/ambience/engineering.ogg' return TRUE return FALSE @@ -292,7 +292,7 @@ Takes plasma and outputs superheated plasma and a shitload of radiation. if(heat >= REACTOR_HEAT_VERYHOT) send_alert("DANGER: Reactor core overheating. Nuclear meltdown imminent", override=TRUE) warning_state = WARNING_STATE_OVERHEAT - var/sound = 'sephora/sound/effects/ship/reactor/core_overheating.ogg' + var/sound = 'nsv13/sound/effects/ship/reactor/core_overheating.ogg' var/obj/structure/overmap/OM = get_overmap() OM?.relay(sound, null, loop=TRUE, channel = CHANNEL_REACTOR_ALERT) return TRUE @@ -312,7 +312,7 @@ Takes plasma and outputs superheated plasma and a shitload of radiation. rod_integrity = 0 //Burn through the control rods if we haven't already. send_alert("ERROR IN MODULE FISSREAC0 AT ADDRESS 0x12DF. CONTROL RODS HAVE FAILED. IMMEDIATE INTERVENTION REQUIRED.", override=TRUE) warning_state = WARNING_STATE_MELTDOWN - var/sound = 'sephora/sound/effects/ship/reactor/meltdown.ogg' + var/sound = 'nsv13/sound/effects/ship/reactor/meltdown.ogg' addtimer(CALLBACK(src, .proc/meltdown), 18 SECONDS) var/obj/structure/overmap/OM = get_overmap() OM?.relay(sound, null, loop=FALSE, channel = CHANNEL_REACTOR_ALERT) @@ -320,7 +320,7 @@ Takes plasma and outputs superheated plasma and a shitload of radiation. /obj/machinery/power/stormdrive_reactor/proc/meltdown() if(heat >= REACTOR_HEAT_MELTDOWN) state = REACTOR_STATE_MELTDOWN - var/sound = 'sephora/sound/effects/ship/reactor/explode.ogg' + var/sound = 'nsv13/sound/effects/ship/reactor/explode.ogg' var/obj/structure/overmap/OM = get_overmap() OM?.relay(sound, null, loop=FALSE, channel = CHANNEL_REACTOR_ALERT) cut_overlays() @@ -454,7 +454,7 @@ Takes plasma and outputs superheated plasma and a shitload of radiation. /obj/machinery/power/magnetic_constrictor //This heats the plasma up to acceptable levels for use in the reactor. name = "magnetic constrictor" desc = "A large magnet which is capable of pressurizing plasma into a more energetic state. It is able to self-regulate its plasma input valve, as long as plasma is supplied to it." - icon = 'sephora/icons/obj/machinery/reactor_parts.dmi' + icon = 'nsv13/icons/obj/machinery/reactor_parts.dmi' icon_state = "constrictor_assembly" density = TRUE anchored = FALSE @@ -625,7 +625,7 @@ Takes plasma and outputs superheated plasma and a shitload of radiation. /obj/effect/decal/nuclear_waste name = "Plutonium sludge" desc = "A writhing pool of heavily irradiated, spent reactor fuel. You probably shouldn't step through this..." - icon = 'sephora/icons/obj/machinery/reactor_parts.dmi' + icon = 'nsv13/icons/obj/machinery/reactor_parts.dmi' icon_state = "nuclearwaste" alpha = 150 @@ -681,7 +681,7 @@ Takes plasma and outputs superheated plasma and a shitload of radiation. weather_duration_upper = 1500 weather_color = "green" telegraph_sound = null - weather_sound = 'sephora/sound/effects/ship/reactor/falloutwind.ogg' + weather_sound = 'nsv13/sound/effects/ship/reactor/falloutwind.ogg' end_duration = 100 area_type = /area protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer, diff --git a/sephora/code/modules/recycling/disposal/multiz.dm b/nsv13/code/modules/recycling/disposal/multiz.dm similarity index 100% rename from sephora/code/modules/recycling/disposal/multiz.dm rename to nsv13/code/modules/recycling/disposal/multiz.dm diff --git a/sephora/game/areas.dm b/nsv13/game/areas.dm similarity index 67% rename from sephora/game/areas.dm rename to nsv13/game/areas.dm index 85ffa733e57..8e10cd48411 100644 --- a/sephora/game/areas.dm +++ b/nsv13/game/areas.dm @@ -1,30 +1,30 @@ /client/var/last_ambience = null /area - var/looping_ambience = 'sephora/sound/ambience/shipambience.ogg' //If you want an ambient sound to play on loop while theyre in a specific area, set this. Defaults to the classic "engine rumble" + var/looping_ambience = 'nsv13/sound/ambience/shipambience.ogg' //If you want an ambient sound to play on loop while theyre in a specific area, set this. Defaults to the classic "engine rumble" var/obj/structure/overmap/linked_overmap = null //For relaying damage etc. to the interior. /area/space looping_ambience = null /area/maintenance - looping_ambience = 'sephora/sound/ambience/maintenance.ogg' - ambientsounds = list('sephora/sound/ambience/leit_motif.ogg','sephora/sound/ambience/wind.ogg','sephora/sound/ambience/wind2.ogg','sephora/sound/ambience/wind3.ogg','sephora/sound/ambience/wind4.ogg','sephora/sound/ambience/wind5.ogg','sephora/sound/ambience/wind6.ogg') + looping_ambience = 'nsv13/sound/ambience/maintenance.ogg' + ambientsounds = list('nsv13/sound/ambience/leit_motif.ogg','nsv13/sound/ambience/wind.ogg','nsv13/sound/ambience/wind2.ogg','nsv13/sound/ambience/wind3.ogg','nsv13/sound/ambience/wind4.ogg','nsv13/sound/ambience/wind5.ogg','nsv13/sound/ambience/wind6.ogg') /area/medical - looping_ambience = 'sephora/sound/ambience/medbay.ogg' + looping_ambience = 'nsv13/sound/ambience/medbay.ogg' ambientsounds = list() /area/ai_monitored - looping_ambience = 'sephora/sound/ambience/computer_core.ogg' + looping_ambience = 'nsv13/sound/ambience/computer_core.ogg' ambientsounds = list() /area/bridge - looping_ambience = 'sephora/sound/ambience/bridge.ogg' + looping_ambience = 'nsv13/sound/ambience/bridge.ogg' ambientsounds = list() /area/science - looping_ambience = 'sephora/sound/ambience/computer_core.ogg' + looping_ambience = 'nsv13/sound/ambience/computer_core.ogg' ambientsounds = list() /area/Entered(atom/movable/M) @@ -54,7 +54,7 @@ progress = CLAMP(progress, 0, goal) progress = round(((progress / goal) * 100), 50)//If the ship goes below 50% health, we start creaking like mad. if(progress <= 50) - var/list/creaks = list('sephora/sound/ambience/ship_damage/creak1.ogg','sephora/sound/ambience/ship_damage/creak2.ogg','sephora/sound/ambience/ship_damage/creak3.ogg','sephora/sound/ambience/ship_damage/creak4.ogg','sephora/sound/ambience/ship_damage/creak5.ogg','sephora/sound/ambience/ship_damage/creak6.ogg','sephora/sound/ambience/ship_damage/creak7.ogg') + var/list/creaks = list('nsv13/sound/ambience/ship_damage/creak1.ogg','nsv13/sound/ambience/ship_damage/creak2.ogg','nsv13/sound/ambience/ship_damage/creak3.ogg','nsv13/sound/ambience/ship_damage/creak4.ogg','nsv13/sound/ambience/ship_damage/creak5.ogg','nsv13/sound/ambience/ship_damage/creak6.ogg','nsv13/sound/ambience/ship_damage/creak7.ogg') var/creak = pick(creaks) SEND_SOUND(L, sound(creak, repeat = 0, wait = 0, volume = 100, channel = CHANNEL_AMBIENCE)) L.client.played = TRUE diff --git a/sephora/game/custom_airlocks.dm b/nsv13/game/custom_airlocks.dm similarity index 75% rename from sephora/game/custom_airlocks.dm rename to nsv13/game/custom_airlocks.dm index 37375319c00..7221d2d587e 100644 --- a/sephora/game/custom_airlocks.dm +++ b/nsv13/game/custom_airlocks.dm @@ -1,6 +1,6 @@ /obj/machinery/door/airlock/ship name = "Airtight hatch" - icon = 'sephora/icons/obj/machinery/doors/standard.dmi' + icon = 'nsv13/icons/obj/machinery/doors/standard.dmi' desc = "A durasteel bulkhead which opens and closes. Hope you're good at hatch hopping" icon_state = "closed" // doorOpen = 'DS13/sound/effects/tng_airlock.ogg' @@ -9,7 +9,7 @@ /obj/machinery/door/poddoor/ship name = "Double reinforced durasteel blast door" - icon = 'sephora/goonstation/icons/blastdoor.dmi' + icon = 'nsv13/goonstation/icons/blastdoor.dmi' desc = "A titanic hunk of durasteel which is designed to absorb high velocity rounds, explosive forces and general impacts. It's equipped with a triple deadlock seal, preventing anyone from getting past it." /obj/machinery/door/poddoor/ship/preopen @@ -19,36 +19,36 @@ /obj/machinery/door/airlock/ship/command name = "Command" - icon = 'sephora/goonstation/icons/command.dmi' + icon = 'nsv13/goonstation/icons/command.dmi' req_one_access_txt = "19" /obj/machinery/door/airlock/ship/engineering name = "Engineering wing" - icon = 'sephora/goonstation/icons/engineering.dmi' + icon = 'nsv13/goonstation/icons/engineering.dmi' req_one_access_txt = "10" /obj/machinery/door/airlock/ship/external name = "External airlock" - icon = 'sephora/goonstation/icons/external.dmi' + icon = 'nsv13/goonstation/icons/external.dmi' req_one_access_txt = "13" /obj/machinery/door/airlock/ship/maintenance name = "Maintenance tunnels" - icon = 'sephora/goonstation/icons/maintenance.dmi' + icon = 'nsv13/goonstation/icons/maintenance.dmi' req_one_access_txt = "12" /obj/machinery/door/airlock/ship/public name = "Public airlock" - icon = 'sephora/goonstation/icons/public.dmi' + icon = 'nsv13/goonstation/icons/public.dmi' /obj/machinery/door/airlock/ship/medical name = "Infirmary" - icon = 'sephora/goonstation/icons/medical.dmi' + icon = 'nsv13/goonstation/icons/medical.dmi' req_one_access_txt = "5" /obj/machinery/door/airlock/ship/security name = "Brig" - icon = 'sephora/goonstation/icons/security.dmi' + icon = 'nsv13/goonstation/icons/security.dmi' req_one_access_txt = "63" /obj/machinery/door/airlock/ship/cargo diff --git a/sephora/game/custom_guns.dm b/nsv13/game/custom_guns.dm similarity index 96% rename from sephora/game/custom_guns.dm rename to nsv13/game/custom_guns.dm index df600d8365c..fd390c63544 100644 --- a/sephora/game/custom_guns.dm +++ b/nsv13/game/custom_guns.dm @@ -1,7 +1,7 @@ /obj/item/gun/ballistic/automatic/peacekeeper name = "M2A45 security pulse rifle" desc = "A large personal defense weapon commonly employed by the colonial peacekeepers. This advanced weapon uses a magnetic acceleration system in favour of traditional gunpowder, allowing specialized 6mm rounds to be loaded." - icon = 'sephora/icons/obj/guns/projectile.dmi' + icon = 'nsv13/icons/obj/guns/projectile.dmi' icon_state = "peacekeeper" item_state = "peacekeeper" mag_type = /obj/item/ammo_box/magazine/peacekeeper @@ -17,7 +17,7 @@ empty_indicator = TRUE weapon_weight = WEAPON_HEAVY slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT - fire_sound = 'sephora/sound/weapons/m4_fire.wav' + fire_sound = 'nsv13/sound/weapons/m4_fire.wav' recoil = 0.1 //Tiny jolt when you fire it. /obj/item/ammo_casing/peacekeeper diff --git a/sephora/game/custom_items.dm b/nsv13/game/custom_items.dm similarity index 89% rename from sephora/game/custom_items.dm rename to nsv13/game/custom_items.dm index 254ffe15e6a..5e72760e158 100644 --- a/sephora/game/custom_items.dm +++ b/nsv13/game/custom_items.dm @@ -1,13 +1,13 @@ /obj/item/melee/classic_baton/telescopic/stunsword name = "MK-1 ion current sabre" desc = "An exceedingly rare, nigh on priceless weapon which channels a highly unstable current of ions to produce a dazzling blade of pure energy around a durasteel blade. These weapons are highly sought after, and are only given to high ranking officers with a proven track record." - icon = 'sephora/icons/obj/items_and_weapons.dmi' + icon = 'nsv13/icons/obj/items_and_weapons.dmi' icon_state = "stunsword" item_state = "stunsword" slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_BULKY force = 0 - on_stun_sound = 'sephora/sound/effects/saberhit.ogg' + on_stun_sound = 'nsv13/sound/effects/saberhit.ogg' on_icon_state = "stunsword_active" off_icon_state = "stunsword" @@ -35,18 +35,18 @@ if(on) flick("stunsword_ignite",src) visible_message("[user] swings [src] around, igniting it in the process.") - playsound(user.loc, 'sephora/sound/effects/saberon.ogg', 100, 1) + playsound(user.loc, 'nsv13/sound/effects/saberon.ogg', 100, 1) to_chat(user, "You ignite [src]. Your attacks with it will now stun targets nonlethally.") icon_state = on_icon_state item_state = on_item_state force = force_on attack_verb = list("sliced", "cut", "striken", "immobilized") - hitsound = 'sephora/sound/effects/saberhit.ogg' + hitsound = 'nsv13/sound/effects/saberhit.ogg' set_light(3) else flick("stunsword_extinguish",src) visible_message("[user] swings [src] around, extinguishing it in the process.") - playsound(user.loc, 'sephora/sound/effects/saberoff.ogg', 100, 1) + playsound(user.loc, 'nsv13/sound/effects/saberoff.ogg', 100, 1) to_chat(user, "You extinguish [src]. It will now physically wound targets on impact.") item_state = "stunsword_extinguish" icon_state = off_icon_state diff --git a/sephora/game/custom_materials.dm b/nsv13/game/custom_materials.dm similarity index 91% rename from sephora/game/custom_materials.dm rename to nsv13/game/custom_materials.dm index dc9e7eff7eb..8c73e6e26d7 100644 --- a/sephora/game/custom_materials.dm +++ b/nsv13/game/custom_materials.dm @@ -1,74 +1,74 @@ -//Metals - -/obj/item/stack/sheet/duranium - name = "duranium sheet" - desc = "This sheet is an extra durable alloy of durasteel and plasteel." - icon = 'sephora/icons/obj/custom_stack_objects.dmi' - icon_state = "sheet-duranium" - item_state = "sheet-duranium" - throwforce = 10 - flags_1 = CONDUCT_1 - resistance_flags = FIRE_PROOF - merge_type = /obj/item/stack/sheet/duranium - turf_type = /turf/closed/wall/ship - -/obj/item/stack/sheet/duranium/twenty - amount = 20 - -/obj/item/stack/sheet/duranium/fifty - amount = 50 - -GLOBAL_LIST_INIT(durasteel_recipes, list ( \ - new/datum/stack_recipe("nanoweave plating", /obj/item/stack/tile/carpet/ship, 1, 4, 20), \ - new/datum/stack_recipe("durasteel hull plating", /obj/item/stack/tile/plasteel/ship, 1, 4, 20), \ - new/datum/stack_recipe("riveted hull plating", /obj/item/stack/tile/plasteel/ship/riveted, 1, 4, 20), \ - new/datum/stack_recipe("padded steel hull plating", /obj/item/stack/tile/plasteel/padded, 1, 4, 20), \ - new/datum/stack_recipe("embossed hull plating", /obj/item/stack/tile/plasteel/ship/techfloor, 1, 4, 20), \ - new/datum/stack_recipe("embossed hull plating - alt", /obj/item/stack/tile/plasteel/ship/techfloor/alt, 1, 4, 20), \ - )) - -/obj/item/stack/sheet/durasteel - name = "durasteel sheet" - desc = "This sheet is a durable alloy of iron and silver." - icon = 'sephora/icons/obj/custom_stack_objects.dmi' - icon_state = "sheet-durasteel" - item_state = "sheet-durasteel" - throwforce = 10 - flags_1 = CONDUCT_1 - resistance_flags = FIRE_PROOF - merge_type = /obj/item/stack/sheet/durasteel - turf_type = /turf/closed/wall/r_wall/ship - -/obj/item/stack/sheet/durasteel/twenty - amount = 20 - -/obj/item/stack/sheet/durasteel/fifty - amount = 50 - -/obj/item/stack/sheet/durasteel/Initialize(mapload, new_amount, merge = TRUE) - recipes = GLOB.durasteel_recipes - return ..() - -GLOBAL_LIST_INIT(nanocarbon_glass_recipes, list (\ - new/datum/stack_recipe("nanocarbon reinforced fulltile window", /obj/structure/window/reinforced/fulltile/ship, 2, time = 60, one_per_turf = TRUE, on_floor = TRUE) \ - )) - -/obj/item/stack/sheet/nanocarbon_glass - name = "nanocarbon glass" - desc = "This glass sheet is reinforced with a nanocarbon weave." - icon = 'sephora/icons/obj/custom_stack_objects.dmi' - icon_state = "sheet-nanocarbon-glass" - item_state = "sheet-nanocarbon-glass" - throwforce = 10 - resistance_flags = FIRE_PROOF - merge_type = /obj/item/stack/sheet/nanocarbon_glass - -/obj/item/stack/sheet/nanocarbon_glass/twenty - amount = 20 - -/obj/item/stack/sheet/nanocarbon_glass/fifty - amount = 50 - -/obj/item/stack/sheet/nanocarbon_glass/Initialize(mapload, new_amount, merge = TRUE) - recipes = GLOB.nanocarbon_glass_recipes +//Metals + +/obj/item/stack/sheet/duranium + name = "duranium sheet" + desc = "This sheet is an extra durable alloy of durasteel and plasteel." + icon = 'nsv13/icons/obj/custom_stack_objects.dmi' + icon_state = "sheet-duranium" + item_state = "sheet-duranium" + throwforce = 10 + flags_1 = CONDUCT_1 + resistance_flags = FIRE_PROOF + merge_type = /obj/item/stack/sheet/duranium + turf_type = /turf/closed/wall/ship + +/obj/item/stack/sheet/duranium/twenty + amount = 20 + +/obj/item/stack/sheet/duranium/fifty + amount = 50 + +GLOBAL_LIST_INIT(durasteel_recipes, list ( \ + new/datum/stack_recipe("nanoweave plating", /obj/item/stack/tile/carpet/ship, 1, 4, 20), \ + new/datum/stack_recipe("durasteel hull plating", /obj/item/stack/tile/plasteel/ship, 1, 4, 20), \ + new/datum/stack_recipe("riveted hull plating", /obj/item/stack/tile/plasteel/ship/riveted, 1, 4, 20), \ + new/datum/stack_recipe("padded steel hull plating", /obj/item/stack/tile/plasteel/padded, 1, 4, 20), \ + new/datum/stack_recipe("embossed hull plating", /obj/item/stack/tile/plasteel/ship/techfloor, 1, 4, 20), \ + new/datum/stack_recipe("embossed hull plating - alt", /obj/item/stack/tile/plasteel/ship/techfloor/alt, 1, 4, 20), \ + )) + +/obj/item/stack/sheet/durasteel + name = "durasteel sheet" + desc = "This sheet is a durable alloy of iron and silver." + icon = 'nsv13/icons/obj/custom_stack_objects.dmi' + icon_state = "sheet-durasteel" + item_state = "sheet-durasteel" + throwforce = 10 + flags_1 = CONDUCT_1 + resistance_flags = FIRE_PROOF + merge_type = /obj/item/stack/sheet/durasteel + turf_type = /turf/closed/wall/r_wall/ship + +/obj/item/stack/sheet/durasteel/twenty + amount = 20 + +/obj/item/stack/sheet/durasteel/fifty + amount = 50 + +/obj/item/stack/sheet/durasteel/Initialize(mapload, new_amount, merge = TRUE) + recipes = GLOB.durasteel_recipes + return ..() + +GLOBAL_LIST_INIT(nanocarbon_glass_recipes, list (\ + new/datum/stack_recipe("nanocarbon reinforced fulltile window", /obj/structure/window/reinforced/fulltile/ship, 2, time = 60, one_per_turf = TRUE, on_floor = TRUE) \ + )) + +/obj/item/stack/sheet/nanocarbon_glass + name = "nanocarbon glass" + desc = "This glass sheet is reinforced with a nanocarbon weave." + icon = 'nsv13/icons/obj/custom_stack_objects.dmi' + icon_state = "sheet-nanocarbon-glass" + item_state = "sheet-nanocarbon-glass" + throwforce = 10 + resistance_flags = FIRE_PROOF + merge_type = /obj/item/stack/sheet/nanocarbon_glass + +/obj/item/stack/sheet/nanocarbon_glass/twenty + amount = 20 + +/obj/item/stack/sheet/nanocarbon_glass/fifty + amount = 50 + +/obj/item/stack/sheet/nanocarbon_glass/Initialize(mapload, new_amount, merge = TRUE) + recipes = GLOB.nanocarbon_glass_recipes return ..() \ No newline at end of file diff --git a/sephora/game/custom_turfs.dm b/nsv13/game/custom_turfs.dm similarity index 90% rename from sephora/game/custom_turfs.dm rename to nsv13/game/custom_turfs.dm index 6d8c88ce660..7ed1c78625c 100644 --- a/sephora/game/custom_turfs.dm +++ b/nsv13/game/custom_turfs.dm @@ -1,5 +1,5 @@ /turf/closed/wall/r_wall/ship - icon = 'sephora/icons/turf/reinforced_wall.dmi' + icon = 'nsv13/icons/turf/reinforced_wall.dmi' name = "Duranium hull" desc = "A large hull segment designed to create vessels and structures capable of supporting life in even the most hazardous places." legacy_smooth = TRUE //Override /tg/ iconsmooths @@ -31,7 +31,7 @@ /turf/open/floor/carpet/ship name = "nanoweave carpet" desc = "A padded piece of hull plating which can make a space based installation feel more homely." - icon = 'sephora/icons/turf/dark_carpet.dmi' + icon = 'nsv13/icons/turf/dark_carpet.dmi' icon_state = "dark_carpet" floor_tile = /obj/item/stack/tile/carpet/ship canSmoothWith = list(/turf/open/floor/carpet/ship) @@ -40,7 +40,7 @@ name = "nanoweave carpet tile" singular_name = "nanoweave carpet tile" desc = "A regular nanoweave carpet tile" - icon = 'sephora/icons/turf/dark_carpet.dmi' + icon = 'nsv13/icons/turf/dark_carpet.dmi' icon_state = "dark_carpet_tile" resistance_flags = FLAMMABLE turf_type = /turf/open/floor/carpet/ship @@ -48,7 +48,7 @@ /obj/structure/window/reinforced/fulltile/ship name = "Nanocarbon reinforced window" desc = "A heavyset window reinforced with tiny carbon structures which is designed to take a beating." - icon = 'sephora/icons/obj/structures/windows.dmi' + icon = 'nsv13/icons/obj/structures/windows.dmi' icon_state = "rwindow" glass_type = /obj/item/stack/sheet/nanocarbon_glass legacy_smooth = TRUE //Override /tg/ iconsmooths @@ -58,13 +58,13 @@ /obj/structure/fluff/support_beam name = "Support beam" desc = "A large metal support which helps hold the ship together." - icon = 'sephora/icons/obj/structures/ship_structures.dmi' + icon = 'nsv13/icons/obj/structures/ship_structures.dmi' icon_state = "support_beam" density = FALSE /turf/open/floor/plasteel/ship name = "durasteel hull plating" - icon = 'sephora/icons/turf/floors.dmi' + icon = 'nsv13/icons/turf/floors.dmi' icon_state = "durasteel" floor_tile = /obj/item/stack/tile/plasteel/ship @@ -72,7 +72,7 @@ name = "durasteel hull plating tile" singular_name = "durasteel hull plating tile" desc = "A regular durasteel hull plating tile" - icon = 'sephora/icons/turf/floors.dmi' + icon = 'nsv13/icons/turf/floors.dmi' icon_state = "durasteel_tile" turf_type = /turf/open/floor/plasteel/ship @@ -97,7 +97,7 @@ name = "padded steel hull plating tile" singular_name = "padded steel hull plating tile" desc = "A regular padded steel hull plating tile" - icon = 'sephora/icons/turf/floors.dmi' + icon = 'nsv13/icons/turf/floors.dmi' icon_state = "padded_tile" turf_type = /turf/open/floor/plasteel/ship/padded @@ -110,7 +110,7 @@ name = "embossed hull plating tile" singular_name = "embossed hull plating tile" desc = "A regular embossed hull plating tile" - icon = 'sephora/icons/turf/floors.dmi' + icon = 'nsv13/icons/turf/floors.dmi' icon_state = "eris_techfloor_tile" turf_type = /turf/open/floor/plasteel/ship/techfloor @@ -123,6 +123,6 @@ name = "embossed hull plating tile" singular_name = "embossed hull plating tile" desc = "A regular embossed hull plating tile" - icon = 'sephora/icons/turf/floors.dmi' + icon = 'nsv13/icons/turf/floors.dmi' icon_state = "eris_techfloor_alt_tile" turf_type = /turf/open/floor/plasteel/ship/techfloor/alt diff --git a/sephora/game/lore_terminal.dm b/nsv13/game/lore_terminal.dm similarity index 91% rename from sephora/game/lore_terminal.dm rename to nsv13/game/lore_terminal.dm index 828a3cdd87a..9f62f63df3b 100644 --- a/sephora/game/lore_terminal.dm +++ b/nsv13/game/lore_terminal.dm @@ -3,7 +3,7 @@ GLOBAL_DATUM_INIT(lore_terminal_controller, /datum/lore_controller, new) /obj/machinery/computer/lore_terminal name = "Seegson info-link terminal" desc = "A small CRT display with an inbuilt microcomputer which is loaded with an extensive database. These terminals contain eveyrthing from information about historical events to instruction manuals for common ship appliances." - icon = 'sephora/icons/obj/computers.dmi' + icon = 'nsv13/icons/obj/computers.dmi' icon_state = "terminal" pixel_y = 26 //So they snap to walls correctly density = FALSE @@ -26,7 +26,7 @@ GLOBAL_DATUM_INIT(lore_terminal_controller, /datum/lore_controller, new) soundloop = new(list(src), FALSE) /datum/looping_sound/computer_click - mid_sounds = list('sephora/sound/effects/computer/scroll1.ogg','sephora/sound/effects/computer/scroll2.ogg','sephora/sound/effects/computer/scroll3.ogg','sephora/sound/effects/computer/scroll5.ogg') + mid_sounds = list('nsv13/sound/effects/computer/scroll1.ogg','nsv13/sound/effects/computer/scroll2.ogg','nsv13/sound/effects/computer/scroll3.ogg','nsv13/sound/effects/computer/scroll5.ogg') mid_length = 0.8 SECONDS volume = 30 @@ -39,11 +39,11 @@ GLOBAL_DATUM_INIT(lore_terminal_controller, /datum/lore_controller, new) /obj/machinery/computer/lore_terminal/attack_hand(mob/user) . = ..() if(!allowed(user)) - var/sound = pick('sephora/sound/effects/computer/error.ogg','sephora/sound/effects/computer/error2.ogg','sephora/sound/effects/computer/error3.ogg') + var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg') playsound(src, sound, 100, 1) to_chat(user, "Access denied") return - playsound(src, 'sephora/sound/effects/computer/scroll_start.ogg', 100, 1) + playsound(src, 'nsv13/sound/effects/computer/scroll_start.ogg', 100, 1) user.set_machine(src) var/dat if(!entries.len) @@ -60,7 +60,7 @@ GLOBAL_DATUM_INIT(lore_terminal_controller, /datum/lore_controller, new) if(!in_range(src, usr)) return if(in_use) - var/sound = 'sephora/sound/effects/computer/buzz2.ogg' + var/sound = 'nsv13/sound/effects/computer/buzz2.ogg' playsound(src, sound, 100, 1) to_chat(usr, "ERROR: I/O function busy. A file is still loading...") return @@ -76,7 +76,7 @@ GLOBAL_DATUM_INIT(lore_terminal_controller, /datum/lore_controller, new) \

ACCESS FILE: C:/entries/local/[content.name]

\

Classification: [content.classified]

\ -
- © Seegson systems inc, 2257
\ +
- � Seegson systems inc, 2257
\
\

[content.title]

\ \ @@ -144,7 +144,7 @@ GLOBAL_DATUM_INIT(lore_terminal_controller, /datum/lore_controller, new) \ " usr << browse(dat, "window=lore_console[content.name];size=600x600") - playsound(src, pick('sephora/sound/effects/computer/buzz.ogg','sephora/sound/effects/computer/buzz2.ogg'), 100, TRUE) + playsound(src, pick('nsv13/sound/effects/computer/buzz.ogg','nsv13/sound/effects/computer/buzz2.ogg'), 100, TRUE) in_use = TRUE //Stops you from crashing the server with infinite sounds icon_state = "terminal_scroll" clicks = clicks/3 @@ -191,25 +191,25 @@ SPECIAL KEYS RESPOND AS FOLLOWS: ` = newline (br) (AKA when you press enter) ~ = horizontal line (hr) -° = bullet point +� = bullet point */ /datum/lore_entry/nt name = "new_employees_memo.ntmail" title = "Intercepted message" - path = "sephora/lore_entries/welcome.txt" + path = "nsv13/lore_entries/welcome.txt" access_tag = "ntcommon" /datum/lore_entry/nt/ragnarok name = "ragnarok_class.ntdoc" title = "Ragnarok Class Specifications" - path = "sephora/lore_entries/ragnarok.txt" + path = "nsv13/lore_entries/ragnarok.txt" /datum/lore_entry/nt/firing_proceedure name = "firing_proceedure.ntdoc" title = "Ship-to-ship munitions" - path = "sephora/lore_entries/firing_proceedure.txt" + path = "nsv13/lore_entries/firing_proceedure.txt" /datum/lore_entry/nt/stormdrive_operation name = "stormdrive_operation.ntdoc" @@ -229,7 +229,7 @@ SPECIAL KEYS RESPOND AS FOLLOWS: /datum/lore_entry/away_example/pilot_log name = "pilot_log.txt" - content = "They're coming in hot! Prepare for flip and bur']###£$55%%% -=File Access Terminated=-" + content = "They're coming in hot! Prepare for flip and bur']###�$55%%% -=File Access Terminated=-" /datum/lore_entry/away_example/weapons_log name = "weapon_systems_dump2259/11/25.txt" diff --git a/sephora/game/objects/custom_ghost_role_spawners.dm b/nsv13/game/objects/custom_ghost_role_spawners.dm similarity index 82% rename from sephora/game/objects/custom_ghost_role_spawners.dm rename to nsv13/game/objects/custom_ghost_role_spawners.dm index 2aacf28e61d..c6e2b8d11e6 100644 --- a/sephora/game/objects/custom_ghost_role_spawners.dm +++ b/nsv13/game/objects/custom_ghost_role_spawners.dm @@ -1,57 +1,57 @@ -/obj/effect/mob_spawn/human/sephora/syndicate_crew/ - name = "a syndicate soldier class stasis pod" - desc = "Although this stasis pod looks medicinal, it seems as though it's meant to preserve something for a very long time. It has a name and Syndicate insignia on it." - mob_name = "Syndicate Soldier" - icon = 'icons/obj/machines/sleeper.dmi' - icon_state = "sleeper_s" - roundstart = FALSE - death = FALSE - flavour_text = "You are a Syndicate Soldier, part of the crew of a Syndicate Space Vessel. Your objective is to protect your ship and its valuable assets such as prisoners or navigational data at all costs. Failure will not be accepted." - assignedrole = "Syndicate Soldier" - outfit = /datum/outfit/syndicate/sleeper/soldier - -/obj/effect/mob_spawn/human/sephora/syndicate_crew/pilot - name = "a syndicate pilot class stasis pod" - desc = "Although this stasis pod looks medicinal, it seems as though it's meant to preserve something for a very long time. It has as Officer's name and Syndicate insignia on it." - mob_name = "Syndicate Pilot" - flavour_text = "You are a Syndicate Pilot, part of the crew of a Syndicate Space Vessel. Your objective is to fly and protect the bridge of the ship that you have been stationed on. Keep the navigational data from falling into enemy hands." - assignedrole = "Syndicate Pilot" - outfit = /datum/outfit/syndicate/sleeper/pilot - -/obj/effect/mob_spawn/human/sephora/syndicate_crew/Destroy() - new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src)) - return ..() - -/obj/effect/mob_spawn/human/sephora/syndicate_crew/special(mob/living/new_spawn) - new_spawn.fully_replace_character_name(null,random_unique_name(gender)) - -/obj/effect/mob_spawn/human/sephora/syndicate_crew/Initialize(mapload) - . = ..() - var/area/A = get_area(src) - if(A) - notify_ghosts("A Syndicate Crewmember is about to thaw from cryo on \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_SYNDICATE) - -/obj/effect/mob_spawn/human/sephora/nt_prisoner/ - name = "a prisoner stasis pod" - desc = "Although this stasis pod looks medicinal, it seems as though it's meant to preserve something for a very long time. It has a prisoner's identification number and a Nanotrasen insignia on it. It seems like it's been ashed around quite a bit." - mob_name = "NT Prisoner" - icon = 'icons/obj/machines/sleeper.dmi' - icon_state = "sleeper" - roundstart = FALSE - death = FALSE - flavour_text = "You are a prisoner of the Syndicate. You are a Nanotrasen employee captured by the syndicate. Your objective is to escape the ship you are on alive. Hopefully your extensive training will help you!THIS IS NOT AN ANTAGONIST ROLE!" - assignedrole = "NT Prisoner" - outfit = /datum/outfit/sleeper/prisoner - -/obj/effect/mob_spawn/human/sephora/nt_prisoner/Destroy() - new/obj/structure/fluff/empty_sleeper(get_turf(src)) - return ..() - -/obj/effect/mob_spawn/human/sephora/nt_prisoner/special(mob/living/new_spawn) - new_spawn.fully_replace_character_name(null,random_unique_name(gender)) - -/obj/effect/mob_spawn/human/sephora/nt_prisoner/Initialize(mapload) - . = ..() - var/area/A = get_area(src) - if(A) +/obj/effect/mob_spawn/human/nsv13/syndicate_crew/ + name = "a syndicate soldier class stasis pod" + desc = "Although this stasis pod looks medicinal, it seems as though it's meant to preserve something for a very long time. It has a name and Syndicate insignia on it." + mob_name = "Syndicate Soldier" + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper_s" + roundstart = FALSE + death = FALSE + flavour_text = "You are a Syndicate Soldier, part of the crew of a Syndicate Space Vessel. Your objective is to protect your ship and its valuable assets such as prisoners or navigational data at all costs. Failure will not be accepted." + assignedrole = "Syndicate Soldier" + outfit = /datum/outfit/syndicate/sleeper/soldier + +/obj/effect/mob_spawn/human/nsv13/syndicate_crew/pilot + name = "a syndicate pilot class stasis pod" + desc = "Although this stasis pod looks medicinal, it seems as though it's meant to preserve something for a very long time. It has as Officer's name and Syndicate insignia on it." + mob_name = "Syndicate Pilot" + flavour_text = "You are a Syndicate Pilot, part of the crew of a Syndicate Space Vessel. Your objective is to fly and protect the bridge of the ship that you have been stationed on. Keep the navigational data from falling into enemy hands." + assignedrole = "Syndicate Pilot" + outfit = /datum/outfit/syndicate/sleeper/pilot + +/obj/effect/mob_spawn/human/nsv13/syndicate_crew/Destroy() + new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src)) + return ..() + +/obj/effect/mob_spawn/human/nsv13/syndicate_crew/special(mob/living/new_spawn) + new_spawn.fully_replace_character_name(null,random_unique_name(gender)) + +/obj/effect/mob_spawn/human/nsv13/syndicate_crew/Initialize(mapload) + . = ..() + var/area/A = get_area(src) + if(A) + notify_ghosts("A Syndicate Crewmember is about to thaw from cryo on \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_SYNDICATE) + +/obj/effect/mob_spawn/human/nsv13/nt_prisoner/ + name = "a prisoner stasis pod" + desc = "Although this stasis pod looks medicinal, it seems as though it's meant to preserve something for a very long time. It has a prisoner's identification number and a Nanotrasen insignia on it. It seems like it's been ashed around quite a bit." + mob_name = "NT Prisoner" + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper" + roundstart = FALSE + death = FALSE + flavour_text = "You are a prisoner of the Syndicate. You are a Nanotrasen employee captured by the syndicate. Your objective is to escape the ship you are on alive. Hopefully your extensive training will help you!THIS IS NOT AN ANTAGONIST ROLE!" + assignedrole = "NT Prisoner" + outfit = /datum/outfit/sleeper/prisoner + +/obj/effect/mob_spawn/human/nsv13/nt_prisoner/Destroy() + new/obj/structure/fluff/empty_sleeper(get_turf(src)) + return ..() + +/obj/effect/mob_spawn/human/nsv13/nt_prisoner/special(mob/living/new_spawn) + new_spawn.fully_replace_character_name(null,random_unique_name(gender)) + +/obj/effect/mob_spawn/human/nsv13/nt_prisoner/Initialize(mapload) + . = ..() + var/area/A = get_area(src) + if(A) notify_ghosts("An NT Prisoner is about to thaw from cryo on \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_POSIBRAIN) //I don't know which POLL_IGNORE to use here \ No newline at end of file diff --git a/sephora/game/objects/railing.dm b/nsv13/game/objects/railing.dm similarity index 69% rename from sephora/game/objects/railing.dm rename to nsv13/game/objects/railing.dm index 47ccf4cad75..344aa14b651 100644 --- a/sephora/game/objects/railing.dm +++ b/nsv13/game/objects/railing.dm @@ -2,7 +2,7 @@ /obj/structure/railing name = "railing" desc = "A standard steel railing. Prevents stupid people from falling to their doom. Drag yourself onto it to climb over, or click it with an open hand whilst pulling something to dump it over the edge." - icon = 'sephora/icons/obj/structures/railing.dmi' + icon = 'nsv13/icons/obj/structures/railing.dmi' density = TRUE climbable = TRUE anchored = TRUE @@ -65,37 +65,37 @@ var/Rturn = turn(src.dir, -90) var/Lturn = turn(src.dir, 90) - for(var/obj/structure/railing/R in src.loc)// Àíàëèç êëåòêè, ãäå íàõîäèòñÿ ñàì îáúåêò - if ((R.dir == Lturn) && R.anchored)//Ïðîâåðêà ëåâîé ñòîðîíû + for(var/obj/structure/railing/R in src.loc)// ������ ������, ��� ��������� ��� ������ + if ((R.dir == Lturn) && R.anchored)//�������� ����� ������� //src.LeftSide[1] = 1 check |= 32 if (UpdateNeighbors) R.update_icon(0) - if ((R.dir == Rturn) && R.anchored)//Ïðîâåðêà ïðàâîé ñòîðîíû + if ((R.dir == Rturn) && R.anchored)//�������� ������ ������� //src.RightSide[1] = 1 check |= 2 if (UpdateNeighbors) R.update_icon(0) - for (var/obj/structure/railing/R in get_step(src, Lturn))//Àíàëèç ëåâîé êëåòêè îò íàïðàâëåíèÿ îáúåêòà + for (var/obj/structure/railing/R in get_step(src, Lturn))//������ ����� ������ �� ����������� ������� if ((R.dir == src.dir) && R.anchored) //src.LeftSide[2] = 1 check |= 16 if (UpdateNeighbors) R.update_icon(0) - for (var/obj/structure/railing/R in get_step(src, Rturn))//Àíàëèç ïðàâîé êëåòêè îò íàïðàâëåíèÿ îáúåêòà + for (var/obj/structure/railing/R in get_step(src, Rturn))//������ ������ ������ �� ����������� ������� if ((R.dir == src.dir) && R.anchored) //src.RightSide[2] = 1 check |= 1 if (UpdateNeighbors) R.update_icon(0) - for (var/obj/structure/railing/R in get_step(src, (Lturn + src.dir)))//Àíàëèç ïåðåäíåé-ëåâîé äèàãîíàëè îòíîñèòåëüíî íàïðàâëåíèÿ îáúåêòà. + for (var/obj/structure/railing/R in get_step(src, (Lturn + src.dir)))//������ ��������-����� ��������� ������������ ����������� �������. if ((R.dir == Rturn) && R.anchored) check |= 64 if (UpdateNeighbors) R.update_icon(0) - for (var/obj/structure/railing/R in get_step(src, (Rturn + src.dir)))//Àíàëèç ïåðåäíåé-ïðàâîé äèàãîíàëè îòíîñèòåëüíî íàïðàâëåíèÿ îáúåêòà. + for (var/obj/structure/railing/R in get_step(src, (Rturn + src.dir)))//������ ��������-������ ��������� ������������ ����������� �������. if ((R.dir == Lturn) && R.anchored) check |= 4 if (UpdateNeighbors) @@ -108,23 +108,23 @@ icon_state = "railing0" else icon_state = "railing1" - //ëåâàÿ ñòîðîíà + //����� ������� if (check & 32) - overlays += image ('sephora/icons/obj/structures/railing.dmi', src, "corneroverlay") + overlays += image ('nsv13/icons/obj/structures/railing.dmi', src, "corneroverlay") if ((check & 16) || !(check & 32) || (check & 64)) - overlays += image ('sephora/icons/obj/structures/railing.dmi', src, "frontoverlay_l") + overlays += image ('nsv13/icons/obj/structures/railing.dmi', src, "frontoverlay_l") if (!(check & 2) || (check & 1) || (check & 4)) - overlays += image ('sephora/icons/obj/structures/railing.dmi', src, "frontoverlay_r") + overlays += image ('nsv13/icons/obj/structures/railing.dmi', src, "frontoverlay_r") if(check & 4) switch (src.dir) if (NORTH) - overlays += image ('sephora/icons/obj/structures/railing.dmi', src, "mcorneroverlay", pixel_x = 32) + overlays += image ('nsv13/icons/obj/structures/railing.dmi', src, "mcorneroverlay", pixel_x = 32) if (SOUTH) - overlays += image ('sephora/icons/obj/structures/railing.dmi', src, "mcorneroverlay", pixel_x = -32) + overlays += image ('nsv13/icons/obj/structures/railing.dmi', src, "mcorneroverlay", pixel_x = -32) if (EAST) - overlays += image ('sephora/icons/obj/structures/railing.dmi', src, "mcorneroverlay", pixel_y = -32) + overlays += image ('nsv13/icons/obj/structures/railing.dmi', src, "mcorneroverlay", pixel_y = -32) if (WEST) - overlays += image ('sephora/icons/obj/structures/railing.dmi', src, "mcorneroverlay", pixel_y = 32) + overlays += image ('nsv13/icons/obj/structures/railing.dmi', src, "mcorneroverlay", pixel_y = 32) /obj/structure/railing/verb/rotate() set name = "Rotate Railing Counter-Clockwise" diff --git a/sephora/goonstation/code/modules/icon_smoothing/turf_autoalign.dm b/nsv13/goonstation/code/modules/icon_smoothing/turf_autoalign.dm similarity index 97% rename from sephora/goonstation/code/modules/icon_smoothing/turf_autoalign.dm rename to nsv13/goonstation/code/modules/icon_smoothing/turf_autoalign.dm index 4d73ac183d2..25fcad16d42 100644 --- a/sephora/goonstation/code/modules/icon_smoothing/turf_autoalign.dm +++ b/nsv13/goonstation/code/modules/icon_smoothing/turf_autoalign.dm @@ -9,7 +9,7 @@ var/smoothing_d_state = 0 //Smoothing stuff /turf/closed/wall/ship - icon = 'sephora/icons/turf/interior_wall.dmi' + icon = 'nsv13/icons/turf/interior_wall.dmi' name = "Durasteel hull" desc = "A large hull segment designed to create vessels and structures capable of supporting life in even the most hazardous places." legacy_smooth = TRUE //Override /tg/ iconsmooths diff --git a/sephora/goonstation/icons/airlocks.dmi b/nsv13/goonstation/icons/airlocks.dmi similarity index 100% rename from sephora/goonstation/icons/airlocks.dmi rename to nsv13/goonstation/icons/airlocks.dmi diff --git a/sephora/goonstation/icons/blastdoor.dmi b/nsv13/goonstation/icons/blastdoor.dmi similarity index 100% rename from sephora/goonstation/icons/blastdoor.dmi rename to nsv13/goonstation/icons/blastdoor.dmi diff --git a/sephora/goonstation/icons/command.dmi b/nsv13/goonstation/icons/command.dmi similarity index 100% rename from sephora/goonstation/icons/command.dmi rename to nsv13/goonstation/icons/command.dmi diff --git a/sephora/goonstation/icons/engineering.dmi b/nsv13/goonstation/icons/engineering.dmi similarity index 100% rename from sephora/goonstation/icons/engineering.dmi rename to nsv13/goonstation/icons/engineering.dmi diff --git a/sephora/goonstation/icons/external.dmi b/nsv13/goonstation/icons/external.dmi similarity index 100% rename from sephora/goonstation/icons/external.dmi rename to nsv13/goonstation/icons/external.dmi diff --git a/sephora/goonstation/icons/maintenance.dmi b/nsv13/goonstation/icons/maintenance.dmi similarity index 100% rename from sephora/goonstation/icons/maintenance.dmi rename to nsv13/goonstation/icons/maintenance.dmi diff --git a/sephora/goonstation/icons/medical.dmi b/nsv13/goonstation/icons/medical.dmi similarity index 100% rename from sephora/goonstation/icons/medical.dmi rename to nsv13/goonstation/icons/medical.dmi diff --git a/sephora/goonstation/icons/public.dmi b/nsv13/goonstation/icons/public.dmi similarity index 100% rename from sephora/goonstation/icons/public.dmi rename to nsv13/goonstation/icons/public.dmi diff --git a/sephora/goonstation/icons/reactor.dmi b/nsv13/goonstation/icons/reactor.dmi similarity index 100% rename from sephora/goonstation/icons/reactor.dmi rename to nsv13/goonstation/icons/reactor.dmi diff --git a/sephora/goonstation/icons/reactor_parts.dmi b/nsv13/goonstation/icons/reactor_parts.dmi similarity index 100% rename from sephora/goonstation/icons/reactor_parts.dmi rename to nsv13/goonstation/icons/reactor_parts.dmi diff --git a/sephora/goonstation/icons/security.dmi b/nsv13/goonstation/icons/security.dmi similarity index 100% rename from sephora/goonstation/icons/security.dmi rename to nsv13/goonstation/icons/security.dmi diff --git a/sephora/icons/mob/head.dmi b/nsv13/icons/mob/head.dmi similarity index 100% rename from sephora/icons/mob/head.dmi rename to nsv13/icons/mob/head.dmi diff --git a/sephora/icons/mob/inhands/weapons/bombs_lefthand.dmi b/nsv13/icons/mob/inhands/weapons/bombs_lefthand.dmi similarity index 100% rename from sephora/icons/mob/inhands/weapons/bombs_lefthand.dmi rename to nsv13/icons/mob/inhands/weapons/bombs_lefthand.dmi diff --git a/sephora/icons/mob/inhands/weapons/bombs_righthand.dmi b/nsv13/icons/mob/inhands/weapons/bombs_righthand.dmi similarity index 100% rename from sephora/icons/mob/inhands/weapons/bombs_righthand.dmi rename to nsv13/icons/mob/inhands/weapons/bombs_righthand.dmi diff --git a/sephora/icons/mob/suit.dmi b/nsv13/icons/mob/suit.dmi similarity index 100% rename from sephora/icons/mob/suit.dmi rename to nsv13/icons/mob/suit.dmi diff --git a/sephora/icons/mob/uniform.dmi b/nsv13/icons/mob/uniform.dmi similarity index 100% rename from sephora/icons/mob/uniform.dmi rename to nsv13/icons/mob/uniform.dmi diff --git a/sephora/icons/obj/atmos.dmi b/nsv13/icons/obj/atmos.dmi similarity index 100% rename from sephora/icons/obj/atmos.dmi rename to nsv13/icons/obj/atmos.dmi diff --git a/sephora/icons/obj/barricades.dmi b/nsv13/icons/obj/barricades.dmi similarity index 100% rename from sephora/icons/obj/barricades.dmi rename to nsv13/icons/obj/barricades.dmi diff --git a/sephora/icons/obj/clothing/hats.dmi b/nsv13/icons/obj/clothing/hats.dmi similarity index 100% rename from sephora/icons/obj/clothing/hats.dmi rename to nsv13/icons/obj/clothing/hats.dmi diff --git a/sephora/icons/obj/clothing/suits.dmi b/nsv13/icons/obj/clothing/suits.dmi similarity index 100% rename from sephora/icons/obj/clothing/suits.dmi rename to nsv13/icons/obj/clothing/suits.dmi diff --git a/sephora/icons/obj/clothing/uniforms.dmi b/nsv13/icons/obj/clothing/uniforms.dmi similarity index 100% rename from sephora/icons/obj/clothing/uniforms.dmi rename to nsv13/icons/obj/clothing/uniforms.dmi diff --git a/sephora/icons/obj/computers.dmi b/nsv13/icons/obj/computers.dmi similarity index 100% rename from sephora/icons/obj/computers.dmi rename to nsv13/icons/obj/computers.dmi diff --git a/sephora/icons/obj/custom_stack_objects.dmi b/nsv13/icons/obj/custom_stack_objects.dmi similarity index 100% rename from sephora/icons/obj/custom_stack_objects.dmi rename to nsv13/icons/obj/custom_stack_objects.dmi diff --git a/sephora/icons/obj/guns/projectile.dmi b/nsv13/icons/obj/guns/projectile.dmi similarity index 100% rename from sephora/icons/obj/guns/projectile.dmi rename to nsv13/icons/obj/guns/projectile.dmi diff --git a/sephora/icons/obj/items_and_weapons.dmi b/nsv13/icons/obj/items_and_weapons.dmi similarity index 100% rename from sephora/icons/obj/items_and_weapons.dmi rename to nsv13/icons/obj/items_and_weapons.dmi diff --git a/sephora/icons/obj/machinery/doors/standard.dmi b/nsv13/icons/obj/machinery/doors/standard.dmi similarity index 100% rename from sephora/icons/obj/machinery/doors/standard.dmi rename to nsv13/icons/obj/machinery/doors/standard.dmi diff --git a/sephora/icons/obj/machinery/reactor_parts.dmi b/nsv13/icons/obj/machinery/reactor_parts.dmi similarity index 100% rename from sephora/icons/obj/machinery/reactor_parts.dmi rename to nsv13/icons/obj/machinery/reactor_parts.dmi diff --git a/sephora/icons/obj/munition_types.dmi b/nsv13/icons/obj/munition_types.dmi similarity index 100% rename from sephora/icons/obj/munition_types.dmi rename to nsv13/icons/obj/munition_types.dmi diff --git a/sephora/icons/obj/munitions.dmi b/nsv13/icons/obj/munitions.dmi similarity index 100% rename from sephora/icons/obj/munitions.dmi rename to nsv13/icons/obj/munitions.dmi diff --git a/sephora/icons/obj/ork.dmi b/nsv13/icons/obj/ork.dmi similarity index 100% rename from sephora/icons/obj/ork.dmi rename to nsv13/icons/obj/ork.dmi diff --git a/sephora/icons/obj/power.dmi b/nsv13/icons/obj/power.dmi similarity index 100% rename from sephora/icons/obj/power.dmi rename to nsv13/icons/obj/power.dmi diff --git a/sephora/icons/obj/railgun.dmi b/nsv13/icons/obj/railgun.dmi similarity index 100% rename from sephora/icons/obj/railgun.dmi rename to nsv13/icons/obj/railgun.dmi diff --git a/sephora/icons/obj/stairs_large.dmi b/nsv13/icons/obj/stairs_large.dmi similarity index 100% rename from sephora/icons/obj/stairs_large.dmi rename to nsv13/icons/obj/stairs_large.dmi diff --git a/sephora/icons/obj/structures/railing.dmi b/nsv13/icons/obj/structures/railing.dmi similarity index 100% rename from sephora/icons/obj/structures/railing.dmi rename to nsv13/icons/obj/structures/railing.dmi diff --git a/sephora/icons/obj/structures/ship_structures.dmi b/nsv13/icons/obj/structures/ship_structures.dmi similarity index 100% rename from sephora/icons/obj/structures/ship_structures.dmi rename to nsv13/icons/obj/structures/ship_structures.dmi diff --git a/sephora/icons/obj/structures/windows.dmi b/nsv13/icons/obj/structures/windows.dmi similarity index 100% rename from sephora/icons/obj/structures/windows.dmi rename to nsv13/icons/obj/structures/windows.dmi diff --git a/sephora/icons/overmap/default.dmi b/nsv13/icons/overmap/default.dmi similarity index 100% rename from sephora/icons/overmap/default.dmi rename to nsv13/icons/overmap/default.dmi diff --git a/sephora/icons/overmap/nanotrasen/light_cruiser.dmi b/nsv13/icons/overmap/nanotrasen/light_cruiser.dmi similarity index 100% rename from sephora/icons/overmap/nanotrasen/light_cruiser.dmi rename to nsv13/icons/overmap/nanotrasen/light_cruiser.dmi diff --git a/sephora/icons/overmap/nanotrasen/patrol_cruiser.dmi b/nsv13/icons/overmap/nanotrasen/patrol_cruiser.dmi similarity index 100% rename from sephora/icons/overmap/nanotrasen/patrol_cruiser.dmi rename to nsv13/icons/overmap/nanotrasen/patrol_cruiser.dmi diff --git a/sephora/icons/turf/dark_carpet.dmi b/nsv13/icons/turf/dark_carpet.dmi similarity index 100% rename from sephora/icons/turf/dark_carpet.dmi rename to nsv13/icons/turf/dark_carpet.dmi diff --git a/sephora/icons/turf/floors.dmi b/nsv13/icons/turf/floors.dmi similarity index 100% rename from sephora/icons/turf/floors.dmi rename to nsv13/icons/turf/floors.dmi diff --git a/sephora/icons/turf/interior_wall.dmi b/nsv13/icons/turf/interior_wall.dmi similarity index 100% rename from sephora/icons/turf/interior_wall.dmi rename to nsv13/icons/turf/interior_wall.dmi diff --git a/sephora/icons/turf/reinforced_wall.dmi b/nsv13/icons/turf/reinforced_wall.dmi similarity index 100% rename from sephora/icons/turf/reinforced_wall.dmi rename to nsv13/icons/turf/reinforced_wall.dmi diff --git a/sephora/lore_entries/firing_proceedure.txt b/nsv13/lore_entries/firing_proceedure.txt similarity index 100% rename from sephora/lore_entries/firing_proceedure.txt rename to nsv13/lore_entries/firing_proceedure.txt diff --git a/sephora/lore_entries/lore_terminal - Copy.html b/nsv13/lore_entries/lore_terminal - Copy.html similarity index 100% rename from sephora/lore_entries/lore_terminal - Copy.html rename to nsv13/lore_entries/lore_terminal - Copy.html diff --git a/sephora/lore_entries/lore_terminal.txt b/nsv13/lore_entries/lore_terminal.txt similarity index 100% rename from sephora/lore_entries/lore_terminal.txt rename to nsv13/lore_entries/lore_terminal.txt diff --git a/sephora/lore_entries/meltdowns.txt b/nsv13/lore_entries/meltdowns.txt similarity index 100% rename from sephora/lore_entries/meltdowns.txt rename to nsv13/lore_entries/meltdowns.txt diff --git a/sephora/lore_entries/ragnarok.txt b/nsv13/lore_entries/ragnarok.txt similarity index 100% rename from sephora/lore_entries/ragnarok.txt rename to nsv13/lore_entries/ragnarok.txt diff --git a/sephora/lore_entries/stormdrive.txt b/nsv13/lore_entries/stormdrive.txt similarity index 100% rename from sephora/lore_entries/stormdrive.txt rename to nsv13/lore_entries/stormdrive.txt diff --git a/sephora/lore_entries/welcome.txt b/nsv13/lore_entries/welcome.txt similarity index 100% rename from sephora/lore_entries/welcome.txt rename to nsv13/lore_entries/welcome.txt diff --git a/sephora/modules/atmospherics/multiz.dm b/nsv13/modules/atmospherics/multiz.dm similarity index 85% rename from sephora/modules/atmospherics/multiz.dm rename to nsv13/modules/atmospherics/multiz.dm index cdc98b242cb..b657a5dd1d5 100644 --- a/sephora/modules/atmospherics/multiz.dm +++ b/nsv13/modules/atmospherics/multiz.dm @@ -2,19 +2,19 @@ name = "multi deck pipe adapter" desc = "An adapter which allows pipes to connect to other pipenets on different decks." icon_state = "pipe11-2" - icon = 'sephora/icons/obj/atmos.dmi' + icon = 'nsv13/icons/obj/atmos.dmi' /obj/machinery/atmospherics/pipe/simple/multiz/update_icon() . = ..() cut_overlays() //This adds the overlay showing it's a multiz pipe. This should go above turfs and such var/image/multiz_overlay_node = new(src) //If we have a firing state, light em up! - multiz_overlay_node.icon = 'sephora/icons/obj/atmos.dmi' + multiz_overlay_node.icon = 'nsv13/icons/obj/atmos.dmi' multiz_overlay_node.icon_state = "multiz_pipe" multiz_overlay_node.layer = HIGH_OBJ_LAYER add_overlay(multiz_overlay_node) /obj/machinery/atmospherics/pipe/simple/multiz/pipeline_expansion() - icon = 'sephora/icons/obj/atmos.dmi' //Just to refresh. + icon = 'nsv13/icons/obj/atmos.dmi' //Just to refresh. var/turf/T = get_turf(src) var/obj/machinery/atmospherics/pipe/simple/multiz/above = locate(/obj/machinery/atmospherics/pipe/simple/multiz) in(SSmapping.get_turf_above(T)) if(above) diff --git a/sephora/modules/power/multiz_power.dm b/nsv13/modules/power/multiz_power.dm similarity index 98% rename from sephora/modules/power/multiz_power.dm rename to nsv13/modules/power/multiz_power.dm index 0b68821d506..cee4b808c04 100644 --- a/sephora/modules/power/multiz_power.dm +++ b/nsv13/modules/power/multiz_power.dm @@ -1,7 +1,7 @@ /obj/machinery/power/deck_relay //This bridges powernets name = "Multi-deck power adapter" desc = "A huge bundle of double insulated cabling which seems to run up into the ceiling." - icon = 'sephora/icons/obj/power.dmi' + icon = 'nsv13/icons/obj/power.dmi' icon_state = "cablerelay-off" var/obj/machinery/power/deck_relay/below var/obj/machinery/power/deck_relay/above diff --git a/sephora/sound/ambience/bridge.ogg b/nsv13/sound/ambience/bridge.ogg similarity index 100% rename from sephora/sound/ambience/bridge.ogg rename to nsv13/sound/ambience/bridge.ogg diff --git a/sephora/sound/ambience/computer_core.ogg b/nsv13/sound/ambience/computer_core.ogg similarity index 100% rename from sephora/sound/ambience/computer_core.ogg rename to nsv13/sound/ambience/computer_core.ogg diff --git a/sephora/sound/ambience/creaking_ambience.ogg b/nsv13/sound/ambience/creaking_ambience.ogg similarity index 100% rename from sephora/sound/ambience/creaking_ambience.ogg rename to nsv13/sound/ambience/creaking_ambience.ogg diff --git a/sephora/sound/ambience/engineering.ogg b/nsv13/sound/ambience/engineering.ogg similarity index 100% rename from sephora/sound/ambience/engineering.ogg rename to nsv13/sound/ambience/engineering.ogg diff --git a/sephora/sound/ambience/leit_motif.ogg b/nsv13/sound/ambience/leit_motif.ogg similarity index 100% rename from sephora/sound/ambience/leit_motif.ogg rename to nsv13/sound/ambience/leit_motif.ogg diff --git a/sephora/sound/ambience/maintenance.ogg b/nsv13/sound/ambience/maintenance.ogg similarity index 100% rename from sephora/sound/ambience/maintenance.ogg rename to nsv13/sound/ambience/maintenance.ogg diff --git a/sephora/sound/ambience/medbay.ogg b/nsv13/sound/ambience/medbay.ogg similarity index 100% rename from sephora/sound/ambience/medbay.ogg rename to nsv13/sound/ambience/medbay.ogg diff --git a/sephora/sound/ambience/self destruct.ogg b/nsv13/sound/ambience/self destruct.ogg similarity index 100% rename from sephora/sound/ambience/self destruct.ogg rename to nsv13/sound/ambience/self destruct.ogg diff --git a/sephora/sound/ambience/ship_damage/creak1.ogg b/nsv13/sound/ambience/ship_damage/creak1.ogg similarity index 100% rename from sephora/sound/ambience/ship_damage/creak1.ogg rename to nsv13/sound/ambience/ship_damage/creak1.ogg diff --git a/sephora/sound/ambience/ship_damage/creak2.ogg b/nsv13/sound/ambience/ship_damage/creak2.ogg similarity index 100% rename from sephora/sound/ambience/ship_damage/creak2.ogg rename to nsv13/sound/ambience/ship_damage/creak2.ogg diff --git a/sephora/sound/ambience/ship_damage/creak3.ogg b/nsv13/sound/ambience/ship_damage/creak3.ogg similarity index 100% rename from sephora/sound/ambience/ship_damage/creak3.ogg rename to nsv13/sound/ambience/ship_damage/creak3.ogg diff --git a/sephora/sound/ambience/ship_damage/creak4.ogg b/nsv13/sound/ambience/ship_damage/creak4.ogg similarity index 100% rename from sephora/sound/ambience/ship_damage/creak4.ogg rename to nsv13/sound/ambience/ship_damage/creak4.ogg diff --git a/sephora/sound/ambience/ship_damage/creak5.ogg b/nsv13/sound/ambience/ship_damage/creak5.ogg similarity index 100% rename from sephora/sound/ambience/ship_damage/creak5.ogg rename to nsv13/sound/ambience/ship_damage/creak5.ogg diff --git a/sephora/sound/ambience/ship_damage/creak6.ogg b/nsv13/sound/ambience/ship_damage/creak6.ogg similarity index 100% rename from sephora/sound/ambience/ship_damage/creak6.ogg rename to nsv13/sound/ambience/ship_damage/creak6.ogg diff --git a/sephora/sound/ambience/ship_damage/creak7.ogg b/nsv13/sound/ambience/ship_damage/creak7.ogg similarity index 100% rename from sephora/sound/ambience/ship_damage/creak7.ogg rename to nsv13/sound/ambience/ship_damage/creak7.ogg diff --git a/sephora/sound/ambience/shipambience.ogg b/nsv13/sound/ambience/shipambience.ogg similarity index 100% rename from sephora/sound/ambience/shipambience.ogg rename to nsv13/sound/ambience/shipambience.ogg diff --git a/sephora/sound/ambience/wind.ogg b/nsv13/sound/ambience/wind.ogg similarity index 100% rename from sephora/sound/ambience/wind.ogg rename to nsv13/sound/ambience/wind.ogg diff --git a/sephora/sound/ambience/wind2.ogg b/nsv13/sound/ambience/wind2.ogg similarity index 100% rename from sephora/sound/ambience/wind2.ogg rename to nsv13/sound/ambience/wind2.ogg diff --git a/sephora/sound/ambience/wind3.ogg b/nsv13/sound/ambience/wind3.ogg similarity index 100% rename from sephora/sound/ambience/wind3.ogg rename to nsv13/sound/ambience/wind3.ogg diff --git a/sephora/sound/ambience/wind4.ogg b/nsv13/sound/ambience/wind4.ogg similarity index 100% rename from sephora/sound/ambience/wind4.ogg rename to nsv13/sound/ambience/wind4.ogg diff --git a/sephora/sound/ambience/wind5.ogg b/nsv13/sound/ambience/wind5.ogg similarity index 100% rename from sephora/sound/ambience/wind5.ogg rename to nsv13/sound/ambience/wind5.ogg diff --git a/sephora/sound/ambience/wind6.ogg b/nsv13/sound/ambience/wind6.ogg similarity index 100% rename from sephora/sound/ambience/wind6.ogg rename to nsv13/sound/ambience/wind6.ogg diff --git a/sephora/sound/effects/barbed_wire_movement.ogg b/nsv13/sound/effects/barbed_wire_movement.ogg similarity index 100% rename from sephora/sound/effects/barbed_wire_movement.ogg rename to nsv13/sound/effects/barbed_wire_movement.ogg diff --git a/sephora/sound/effects/computer/alarm.ogg b/nsv13/sound/effects/computer/alarm.ogg similarity index 100% rename from sephora/sound/effects/computer/alarm.ogg rename to nsv13/sound/effects/computer/alarm.ogg diff --git a/sephora/sound/effects/computer/alarm_2.ogg b/nsv13/sound/effects/computer/alarm_2.ogg similarity index 100% rename from sephora/sound/effects/computer/alarm_2.ogg rename to nsv13/sound/effects/computer/alarm_2.ogg diff --git a/sephora/sound/effects/computer/alarm_3.ogg b/nsv13/sound/effects/computer/alarm_3.ogg similarity index 100% rename from sephora/sound/effects/computer/alarm_3.ogg rename to nsv13/sound/effects/computer/alarm_3.ogg diff --git a/sephora/sound/effects/computer/alarm_4.ogg b/nsv13/sound/effects/computer/alarm_4.ogg similarity index 100% rename from sephora/sound/effects/computer/alarm_4.ogg rename to nsv13/sound/effects/computer/alarm_4.ogg diff --git a/sephora/sound/effects/computer/beep.ogg b/nsv13/sound/effects/computer/beep.ogg similarity index 100% rename from sephora/sound/effects/computer/beep.ogg rename to nsv13/sound/effects/computer/beep.ogg diff --git a/sephora/sound/effects/computer/beep10.ogg b/nsv13/sound/effects/computer/beep10.ogg similarity index 100% rename from sephora/sound/effects/computer/beep10.ogg rename to nsv13/sound/effects/computer/beep10.ogg diff --git a/sephora/sound/effects/computer/beep11.ogg b/nsv13/sound/effects/computer/beep11.ogg similarity index 100% rename from sephora/sound/effects/computer/beep11.ogg rename to nsv13/sound/effects/computer/beep11.ogg diff --git a/sephora/sound/effects/computer/beep12.ogg b/nsv13/sound/effects/computer/beep12.ogg similarity index 100% rename from sephora/sound/effects/computer/beep12.ogg rename to nsv13/sound/effects/computer/beep12.ogg diff --git a/sephora/sound/effects/computer/beep2.ogg b/nsv13/sound/effects/computer/beep2.ogg similarity index 100% rename from sephora/sound/effects/computer/beep2.ogg rename to nsv13/sound/effects/computer/beep2.ogg diff --git a/sephora/sound/effects/computer/beep3.ogg b/nsv13/sound/effects/computer/beep3.ogg similarity index 100% rename from sephora/sound/effects/computer/beep3.ogg rename to nsv13/sound/effects/computer/beep3.ogg diff --git a/sephora/sound/effects/computer/beep4.ogg b/nsv13/sound/effects/computer/beep4.ogg similarity index 100% rename from sephora/sound/effects/computer/beep4.ogg rename to nsv13/sound/effects/computer/beep4.ogg diff --git a/sephora/sound/effects/computer/beep5.ogg b/nsv13/sound/effects/computer/beep5.ogg similarity index 100% rename from sephora/sound/effects/computer/beep5.ogg rename to nsv13/sound/effects/computer/beep5.ogg diff --git a/sephora/sound/effects/computer/beep6.ogg b/nsv13/sound/effects/computer/beep6.ogg similarity index 100% rename from sephora/sound/effects/computer/beep6.ogg rename to nsv13/sound/effects/computer/beep6.ogg diff --git a/sephora/sound/effects/computer/beep7.ogg b/nsv13/sound/effects/computer/beep7.ogg similarity index 100% rename from sephora/sound/effects/computer/beep7.ogg rename to nsv13/sound/effects/computer/beep7.ogg diff --git a/sephora/sound/effects/computer/beep8.ogg b/nsv13/sound/effects/computer/beep8.ogg similarity index 100% rename from sephora/sound/effects/computer/beep8.ogg rename to nsv13/sound/effects/computer/beep8.ogg diff --git a/sephora/sound/effects/computer/beep9.ogg b/nsv13/sound/effects/computer/beep9.ogg similarity index 100% rename from sephora/sound/effects/computer/beep9.ogg rename to nsv13/sound/effects/computer/beep9.ogg diff --git a/sephora/sound/effects/computer/buzz.ogg b/nsv13/sound/effects/computer/buzz.ogg similarity index 100% rename from sephora/sound/effects/computer/buzz.ogg rename to nsv13/sound/effects/computer/buzz.ogg diff --git a/sephora/sound/effects/computer/buzz2.ogg b/nsv13/sound/effects/computer/buzz2.ogg similarity index 100% rename from sephora/sound/effects/computer/buzz2.ogg rename to nsv13/sound/effects/computer/buzz2.ogg diff --git a/sephora/sound/effects/computer/error.ogg b/nsv13/sound/effects/computer/error.ogg similarity index 100% rename from sephora/sound/effects/computer/error.ogg rename to nsv13/sound/effects/computer/error.ogg diff --git a/sephora/sound/effects/computer/error2.ogg b/nsv13/sound/effects/computer/error2.ogg similarity index 100% rename from sephora/sound/effects/computer/error2.ogg rename to nsv13/sound/effects/computer/error2.ogg diff --git a/sephora/sound/effects/computer/error3.ogg b/nsv13/sound/effects/computer/error3.ogg similarity index 100% rename from sephora/sound/effects/computer/error3.ogg rename to nsv13/sound/effects/computer/error3.ogg diff --git a/sephora/sound/effects/computer/hum.ogg b/nsv13/sound/effects/computer/hum.ogg similarity index 100% rename from sephora/sound/effects/computer/hum.ogg rename to nsv13/sound/effects/computer/hum.ogg diff --git a/sephora/sound/effects/computer/hum2.ogg b/nsv13/sound/effects/computer/hum2.ogg similarity index 100% rename from sephora/sound/effects/computer/hum2.ogg rename to nsv13/sound/effects/computer/hum2.ogg diff --git a/sephora/sound/effects/computer/hum3.ogg b/nsv13/sound/effects/computer/hum3.ogg similarity index 100% rename from sephora/sound/effects/computer/hum3.ogg rename to nsv13/sound/effects/computer/hum3.ogg diff --git a/sephora/sound/effects/computer/scroll1.ogg b/nsv13/sound/effects/computer/scroll1.ogg similarity index 100% rename from sephora/sound/effects/computer/scroll1.ogg rename to nsv13/sound/effects/computer/scroll1.ogg diff --git a/sephora/sound/effects/computer/scroll2.ogg b/nsv13/sound/effects/computer/scroll2.ogg similarity index 100% rename from sephora/sound/effects/computer/scroll2.ogg rename to nsv13/sound/effects/computer/scroll2.ogg diff --git a/sephora/sound/effects/computer/scroll3.ogg b/nsv13/sound/effects/computer/scroll3.ogg similarity index 100% rename from sephora/sound/effects/computer/scroll3.ogg rename to nsv13/sound/effects/computer/scroll3.ogg diff --git a/sephora/sound/effects/computer/scroll4.ogg b/nsv13/sound/effects/computer/scroll4.ogg similarity index 100% rename from sephora/sound/effects/computer/scroll4.ogg rename to nsv13/sound/effects/computer/scroll4.ogg diff --git a/sephora/sound/effects/computer/scroll5.ogg b/nsv13/sound/effects/computer/scroll5.ogg similarity index 100% rename from sephora/sound/effects/computer/scroll5.ogg rename to nsv13/sound/effects/computer/scroll5.ogg diff --git a/sephora/sound/effects/computer/scroll_short.ogg b/nsv13/sound/effects/computer/scroll_short.ogg similarity index 100% rename from sephora/sound/effects/computer/scroll_short.ogg rename to nsv13/sound/effects/computer/scroll_short.ogg diff --git a/sephora/sound/effects/computer/scroll_short_2.ogg b/nsv13/sound/effects/computer/scroll_short_2.ogg similarity index 100% rename from sephora/sound/effects/computer/scroll_short_2.ogg rename to nsv13/sound/effects/computer/scroll_short_2.ogg diff --git a/sephora/sound/effects/computer/scroll_start.ogg b/nsv13/sound/effects/computer/scroll_start.ogg similarity index 100% rename from sephora/sound/effects/computer/scroll_start.ogg rename to nsv13/sound/effects/computer/scroll_start.ogg diff --git a/sephora/sound/effects/computer/startup.ogg b/nsv13/sound/effects/computer/startup.ogg similarity index 100% rename from sephora/sound/effects/computer/startup.ogg rename to nsv13/sound/effects/computer/startup.ogg diff --git a/sephora/sound/effects/radio1.ogg b/nsv13/sound/effects/radio1.ogg similarity index 100% rename from sephora/sound/effects/radio1.ogg rename to nsv13/sound/effects/radio1.ogg diff --git a/sephora/sound/effects/radio2.ogg b/nsv13/sound/effects/radio2.ogg similarity index 100% rename from sephora/sound/effects/radio2.ogg rename to nsv13/sound/effects/radio2.ogg diff --git a/sephora/sound/effects/saberhit.ogg b/nsv13/sound/effects/saberhit.ogg similarity index 100% rename from sephora/sound/effects/saberhit.ogg rename to nsv13/sound/effects/saberhit.ogg diff --git a/sephora/sound/effects/saberoff.ogg b/nsv13/sound/effects/saberoff.ogg similarity index 100% rename from sephora/sound/effects/saberoff.ogg rename to nsv13/sound/effects/saberoff.ogg diff --git a/sephora/sound/effects/saberon.ogg b/nsv13/sound/effects/saberon.ogg similarity index 100% rename from sephora/sound/effects/saberon.ogg rename to nsv13/sound/effects/saberon.ogg diff --git a/sephora/sound/effects/ship/boarding_pod.ogg b/nsv13/sound/effects/ship/boarding_pod.ogg similarity index 100% rename from sephora/sound/effects/ship/boarding_pod.ogg rename to nsv13/sound/effects/ship/boarding_pod.ogg diff --git a/sephora/sound/effects/ship/damage/consolehit.ogg b/nsv13/sound/effects/ship/damage/consolehit.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/consolehit.ogg rename to nsv13/sound/effects/ship/damage/consolehit.ogg diff --git a/sephora/sound/effects/ship/damage/consolehit2.ogg b/nsv13/sound/effects/ship/damage/consolehit2.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/consolehit2.ogg rename to nsv13/sound/effects/ship/damage/consolehit2.ogg diff --git a/sephora/sound/effects/ship/damage/consolehit3.ogg b/nsv13/sound/effects/ship/damage/consolehit3.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/consolehit3.ogg rename to nsv13/sound/effects/ship/damage/consolehit3.ogg diff --git a/sephora/sound/effects/ship/damage/consolehit4.ogg b/nsv13/sound/effects/ship/damage/consolehit4.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/consolehit4.ogg rename to nsv13/sound/effects/ship/damage/consolehit4.ogg diff --git a/sephora/sound/effects/ship/damage/disable.ogg b/nsv13/sound/effects/ship/damage/disable.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/disable.ogg rename to nsv13/sound/effects/ship/damage/disable.ogg diff --git a/sephora/sound/effects/ship/damage/explosionfar_2.ogg b/nsv13/sound/effects/ship/damage/explosionfar_2.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/explosionfar_2.ogg rename to nsv13/sound/effects/ship/damage/explosionfar_2.ogg diff --git a/sephora/sound/effects/ship/damage/explosionfar_3.ogg b/nsv13/sound/effects/ship/damage/explosionfar_3.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/explosionfar_3.ogg rename to nsv13/sound/effects/ship/damage/explosionfar_3.ogg diff --git a/sephora/sound/effects/ship/damage/explosionfar_4.ogg b/nsv13/sound/effects/ship/damage/explosionfar_4.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/explosionfar_4.ogg rename to nsv13/sound/effects/ship/damage/explosionfar_4.ogg diff --git a/sephora/sound/effects/ship/damage/explosionfar_5.ogg b/nsv13/sound/effects/ship/damage/explosionfar_5.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/explosionfar_5.ogg rename to nsv13/sound/effects/ship/damage/explosionfar_5.ogg diff --git a/sephora/sound/effects/ship/damage/explosionfar_6.ogg b/nsv13/sound/effects/ship/damage/explosionfar_6.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/explosionfar_6.ogg rename to nsv13/sound/effects/ship/damage/explosionfar_6.ogg diff --git a/sephora/sound/effects/ship/damage/ship_explode.ogg b/nsv13/sound/effects/ship/damage/ship_explode.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/ship_explode.ogg rename to nsv13/sound/effects/ship/damage/ship_explode.ogg diff --git a/sephora/sound/effects/ship/damage/shiphit.ogg b/nsv13/sound/effects/ship/damage/shiphit.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/shiphit.ogg rename to nsv13/sound/effects/ship/damage/shiphit.ogg diff --git a/sephora/sound/effects/ship/damage/shiphit2.ogg b/nsv13/sound/effects/ship/damage/shiphit2.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/shiphit2.ogg rename to nsv13/sound/effects/ship/damage/shiphit2.ogg diff --git a/sephora/sound/effects/ship/damage/shiphit3.ogg b/nsv13/sound/effects/ship/damage/shiphit3.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/shiphit3.ogg rename to nsv13/sound/effects/ship/damage/shiphit3.ogg diff --git a/sephora/sound/effects/ship/damage/shiphit4.ogg b/nsv13/sound/effects/ship/damage/shiphit4.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/shiphit4.ogg rename to nsv13/sound/effects/ship/damage/shiphit4.ogg diff --git a/sephora/sound/effects/ship/damage/torpedo_hit.ogg b/nsv13/sound/effects/ship/damage/torpedo_hit.ogg similarity index 100% rename from sephora/sound/effects/ship/damage/torpedo_hit.ogg rename to nsv13/sound/effects/ship/damage/torpedo_hit.ogg diff --git a/sephora/sound/effects/ship/freespace2/Credits.txt b/nsv13/sound/effects/ship/freespace2/Credits.txt similarity index 100% rename from sephora/sound/effects/ship/freespace2/Credits.txt rename to nsv13/sound/effects/ship/freespace2/Credits.txt diff --git a/sephora/sound/effects/ship/freespace2/beam_shot2.wav b/nsv13/sound/effects/ship/freespace2/beam_shot2.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/beam_shot2.wav rename to nsv13/sound/effects/ship/freespace2/beam_shot2.wav diff --git a/sephora/sound/effects/ship/freespace2/computer/arc_01.wav b/nsv13/sound/effects/ship/freespace2/computer/arc_01.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/computer/arc_01.wav rename to nsv13/sound/effects/ship/freespace2/computer/arc_01.wav diff --git a/sephora/sound/effects/ship/freespace2/computer/arc_02.wav b/nsv13/sound/effects/ship/freespace2/computer/arc_02.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/computer/arc_02.wav rename to nsv13/sound/effects/ship/freespace2/computer/arc_02.wav diff --git a/sephora/sound/effects/ship/freespace2/computer/arc_03.wav b/nsv13/sound/effects/ship/freespace2/computer/arc_03.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/computer/arc_03.wav rename to nsv13/sound/effects/ship/freespace2/computer/arc_03.wav diff --git a/sephora/sound/effects/ship/freespace2/computer/arc_04.wav b/nsv13/sound/effects/ship/freespace2/computer/arc_04.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/computer/arc_04.wav rename to nsv13/sound/effects/ship/freespace2/computer/arc_04.wav diff --git a/sephora/sound/effects/ship/freespace2/computer/arc_05.wav b/nsv13/sound/effects/ship/freespace2/computer/arc_05.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/computer/arc_05.wav rename to nsv13/sound/effects/ship/freespace2/computer/arc_05.wav diff --git a/sephora/sound/effects/ship/freespace2/computer/escape.wav b/nsv13/sound/effects/ship/freespace2/computer/escape.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/computer/escape.wav rename to nsv13/sound/effects/ship/freespace2/computer/escape.wav diff --git a/sephora/sound/effects/ship/freespace2/computer/fail.wav b/nsv13/sound/effects/ship/freespace2/computer/fail.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/computer/fail.wav rename to nsv13/sound/effects/ship/freespace2/computer/fail.wav diff --git a/sephora/sound/effects/ship/freespace2/computer/scan.wav b/nsv13/sound/effects/ship/freespace2/computer/scan.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/computer/scan.wav rename to nsv13/sound/effects/ship/freespace2/computer/scan.wav diff --git a/sephora/sound/effects/ship/freespace2/computer/textdraw.wav b/nsv13/sound/effects/ship/freespace2/computer/textdraw.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/computer/textdraw.wav rename to nsv13/sound/effects/ship/freespace2/computer/textdraw.wav diff --git a/sephora/sound/effects/ship/freespace2/crane_1.wav b/nsv13/sound/effects/ship/freespace2/crane_1.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/crane_1.wav rename to nsv13/sound/effects/ship/freespace2/crane_1.wav diff --git a/sephora/sound/effects/ship/freespace2/crane_2.wav b/nsv13/sound/effects/ship/freespace2/crane_2.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/crane_2.wav rename to nsv13/sound/effects/ship/freespace2/crane_2.wav diff --git a/sephora/sound/effects/ship/freespace2/crane_short.ogg b/nsv13/sound/effects/ship/freespace2/crane_short.ogg similarity index 100% rename from sephora/sound/effects/ship/freespace2/crane_short.ogg rename to nsv13/sound/effects/ship/freespace2/crane_short.ogg diff --git a/sephora/sound/effects/ship/freespace2/debris.wav b/nsv13/sound/effects/ship/freespace2/debris.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/debris.wav rename to nsv13/sound/effects/ship/freespace2/debris.wav diff --git a/sephora/sound/effects/ship/freespace2/ding1.wav b/nsv13/sound/effects/ship/freespace2/ding1.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/ding1.wav rename to nsv13/sound/effects/ship/freespace2/ding1.wav diff --git a/sephora/sound/effects/ship/freespace2/ding2.wav b/nsv13/sound/effects/ship/freespace2/ding2.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/ding2.wav rename to nsv13/sound/effects/ship/freespace2/ding2.wav diff --git a/sephora/sound/effects/ship/freespace2/ding3.wav b/nsv13/sound/effects/ship/freespace2/ding3.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/ding3.wav rename to nsv13/sound/effects/ship/freespace2/ding3.wav diff --git a/sephora/sound/effects/ship/freespace2/ding4.wav b/nsv13/sound/effects/ship/freespace2/ding4.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/ding4.wav rename to nsv13/sound/effects/ship/freespace2/ding4.wav diff --git a/sephora/sound/effects/ship/freespace2/ding5.wav b/nsv13/sound/effects/ship/freespace2/ding5.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/ding5.wav rename to nsv13/sound/effects/ship/freespace2/ding5.wav diff --git a/sephora/sound/effects/ship/freespace2/flaklaunch.wav b/nsv13/sound/effects/ship/freespace2/flaklaunch.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/flaklaunch.wav rename to nsv13/sound/effects/ship/freespace2/flaklaunch.wav diff --git a/sephora/sound/effects/ship/freespace2/impacts/boom_1.wav b/nsv13/sound/effects/ship/freespace2/impacts/boom_1.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/impacts/boom_1.wav rename to nsv13/sound/effects/ship/freespace2/impacts/boom_1.wav diff --git a/sephora/sound/effects/ship/freespace2/impacts/boom_2.wav b/nsv13/sound/effects/ship/freespace2/impacts/boom_2.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/impacts/boom_2.wav rename to nsv13/sound/effects/ship/freespace2/impacts/boom_2.wav diff --git a/sephora/sound/effects/ship/freespace2/impacts/boom_3.wav b/nsv13/sound/effects/ship/freespace2/impacts/boom_3.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/impacts/boom_3.wav rename to nsv13/sound/effects/ship/freespace2/impacts/boom_3.wav diff --git a/sephora/sound/effects/ship/freespace2/impacts/boom_4.wav b/nsv13/sound/effects/ship/freespace2/impacts/boom_4.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/impacts/boom_4.wav rename to nsv13/sound/effects/ship/freespace2/impacts/boom_4.wav diff --git a/sephora/sound/effects/ship/freespace2/impacts/hit_1.wav b/nsv13/sound/effects/ship/freespace2/impacts/hit_1.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/impacts/hit_1.wav rename to nsv13/sound/effects/ship/freespace2/impacts/hit_1.wav diff --git a/sephora/sound/effects/ship/freespace2/impacts/m_hit.wav b/nsv13/sound/effects/ship/freespace2/impacts/m_hit.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/impacts/m_hit.wav rename to nsv13/sound/effects/ship/freespace2/impacts/m_hit.wav diff --git a/sephora/sound/effects/ship/freespace2/impacts/subhit.wav b/nsv13/sound/effects/ship/freespace2/impacts/subhit.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/impacts/subhit.wav rename to nsv13/sound/effects/ship/freespace2/impacts/subhit.wav diff --git a/sephora/sound/effects/ship/freespace2/impacts/subhit2.wav b/nsv13/sound/effects/ship/freespace2/impacts/subhit2.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/impacts/subhit2.wav rename to nsv13/sound/effects/ship/freespace2/impacts/subhit2.wav diff --git a/sephora/sound/effects/ship/freespace2/m_load.wav b/nsv13/sound/effects/ship/freespace2/m_load.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/m_load.wav rename to nsv13/sound/effects/ship/freespace2/m_load.wav diff --git a/sephora/sound/effects/ship/freespace2/m_lock.wav b/nsv13/sound/effects/ship/freespace2/m_lock.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/m_lock.wav rename to nsv13/sound/effects/ship/freespace2/m_lock.wav diff --git a/sephora/sound/effects/ship/freespace2/m_shrike.wav b/nsv13/sound/effects/ship/freespace2/m_shrike.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/m_shrike.wav rename to nsv13/sound/effects/ship/freespace2/m_shrike.wav diff --git a/sephora/sound/effects/ship/freespace2/m_stiletto.wav b/nsv13/sound/effects/ship/freespace2/m_stiletto.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/m_stiletto.wav rename to nsv13/sound/effects/ship/freespace2/m_stiletto.wav diff --git a/sephora/sound/effects/ship/freespace2/m_tsunami.wav b/nsv13/sound/effects/ship/freespace2/m_tsunami.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/m_tsunami.wav rename to nsv13/sound/effects/ship/freespace2/m_tsunami.wav diff --git a/sephora/sound/effects/ship/freespace2/m_wasp.wav b/nsv13/sound/effects/ship/freespace2/m_wasp.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/m_wasp.wav rename to nsv13/sound/effects/ship/freespace2/m_wasp.wav diff --git a/sephora/sound/effects/ship/freespace2/shockwave.wav b/nsv13/sound/effects/ship/freespace2/shockwave.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/shockwave.wav rename to nsv13/sound/effects/ship/freespace2/shockwave.wav diff --git a/sephora/sound/effects/ship/freespace2/supnova1.wav b/nsv13/sound/effects/ship/freespace2/supnova1.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/supnova1.wav rename to nsv13/sound/effects/ship/freespace2/supnova1.wav diff --git a/sephora/sound/effects/ship/freespace2/supnova2.wav b/nsv13/sound/effects/ship/freespace2/supnova2.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/supnova2.wav rename to nsv13/sound/effects/ship/freespace2/supnova2.wav diff --git a/sephora/sound/effects/ship/freespace2/warp_close.wav b/nsv13/sound/effects/ship/freespace2/warp_close.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/warp_close.wav rename to nsv13/sound/effects/ship/freespace2/warp_close.wav diff --git a/sephora/sound/effects/ship/freespace2/warp_open.wav b/nsv13/sound/effects/ship/freespace2/warp_open.wav similarity index 100% rename from sephora/sound/effects/ship/freespace2/warp_open.wav rename to nsv13/sound/effects/ship/freespace2/warp_open.wav diff --git a/sephora/sound/effects/ship/general_quarters.ogg b/nsv13/sound/effects/ship/general_quarters.ogg similarity index 100% rename from sephora/sound/effects/ship/general_quarters.ogg rename to nsv13/sound/effects/ship/general_quarters.ogg diff --git a/sephora/sound/effects/ship/mac_charge.ogg b/nsv13/sound/effects/ship/mac_charge.ogg similarity index 100% rename from sephora/sound/effects/ship/mac_charge.ogg rename to nsv13/sound/effects/ship/mac_charge.ogg diff --git a/sephora/sound/effects/ship/mac_fire.ogg b/nsv13/sound/effects/ship/mac_fire.ogg similarity index 100% rename from sephora/sound/effects/ship/mac_fire.ogg rename to nsv13/sound/effects/ship/mac_fire.ogg diff --git a/sephora/sound/effects/ship/mac_hold.ogg b/nsv13/sound/effects/ship/mac_hold.ogg similarity index 100% rename from sephora/sound/effects/ship/mac_hold.ogg rename to nsv13/sound/effects/ship/mac_hold.ogg diff --git a/sephora/sound/effects/ship/mac_load.ogg b/nsv13/sound/effects/ship/mac_load.ogg similarity index 100% rename from sephora/sound/effects/ship/mac_load.ogg rename to nsv13/sound/effects/ship/mac_load.ogg diff --git a/sephora/sound/effects/ship/pdc.ogg b/nsv13/sound/effects/ship/pdc.ogg similarity index 100% rename from sephora/sound/effects/ship/pdc.ogg rename to nsv13/sound/effects/ship/pdc.ogg diff --git a/sephora/sound/effects/ship/pdc2.ogg b/nsv13/sound/effects/ship/pdc2.ogg similarity index 100% rename from sephora/sound/effects/ship/pdc2.ogg rename to nsv13/sound/effects/ship/pdc2.ogg diff --git a/sephora/sound/effects/ship/pdc3.ogg b/nsv13/sound/effects/ship/pdc3.ogg similarity index 100% rename from sephora/sound/effects/ship/pdc3.ogg rename to nsv13/sound/effects/ship/pdc3.ogg diff --git a/sephora/sound/effects/ship/pdc_start.ogg b/nsv13/sound/effects/ship/pdc_start.ogg similarity index 100% rename from sephora/sound/effects/ship/pdc_start.ogg rename to nsv13/sound/effects/ship/pdc_start.ogg diff --git a/sephora/sound/effects/ship/plasma.ogg b/nsv13/sound/effects/ship/plasma.ogg similarity index 100% rename from sephora/sound/effects/ship/plasma.ogg rename to nsv13/sound/effects/ship/plasma.ogg diff --git a/sephora/sound/effects/ship/railgun.ogg b/nsv13/sound/effects/ship/railgun.ogg similarity index 100% rename from sephora/sound/effects/ship/railgun.ogg rename to nsv13/sound/effects/ship/railgun.ogg diff --git a/sephora/sound/effects/ship/railgun2.ogg b/nsv13/sound/effects/ship/railgun2.ogg similarity index 100% rename from sephora/sound/effects/ship/railgun2.ogg rename to nsv13/sound/effects/ship/railgun2.ogg diff --git a/sephora/sound/effects/ship/railgun_ready.ogg b/nsv13/sound/effects/ship/railgun_ready.ogg similarity index 100% rename from sephora/sound/effects/ship/railgun_ready.ogg rename to nsv13/sound/effects/ship/railgun_ready.ogg diff --git a/sephora/sound/effects/ship/rcs.ogg b/nsv13/sound/effects/ship/rcs.ogg similarity index 100% rename from sephora/sound/effects/ship/rcs.ogg rename to nsv13/sound/effects/ship/rcs.ogg diff --git a/sephora/sound/effects/ship/reactor/core_overheating.ogg b/nsv13/sound/effects/ship/reactor/core_overheating.ogg similarity index 100% rename from sephora/sound/effects/ship/reactor/core_overheating.ogg rename to nsv13/sound/effects/ship/reactor/core_overheating.ogg diff --git a/sephora/sound/effects/ship/reactor/explode.ogg b/nsv13/sound/effects/ship/reactor/explode.ogg similarity index 100% rename from sephora/sound/effects/ship/reactor/explode.ogg rename to nsv13/sound/effects/ship/reactor/explode.ogg diff --git a/sephora/sound/effects/ship/reactor/falloutwind.ogg b/nsv13/sound/effects/ship/reactor/falloutwind.ogg similarity index 100% rename from sephora/sound/effects/ship/reactor/falloutwind.ogg rename to nsv13/sound/effects/ship/reactor/falloutwind.ogg diff --git a/sephora/sound/effects/ship/reactor/gasmask.ogg b/nsv13/sound/effects/ship/reactor/gasmask.ogg similarity index 100% rename from sephora/sound/effects/ship/reactor/gasmask.ogg rename to nsv13/sound/effects/ship/reactor/gasmask.ogg diff --git a/sephora/sound/effects/ship/reactor/meltdown.ogg b/nsv13/sound/effects/ship/reactor/meltdown.ogg similarity index 100% rename from sephora/sound/effects/ship/reactor/meltdown.ogg rename to nsv13/sound/effects/ship/reactor/meltdown.ogg diff --git a/sephora/sound/effects/ship/reactor/startup.ogg b/nsv13/sound/effects/ship/reactor/startup.ogg similarity index 100% rename from sephora/sound/effects/ship/reactor/startup.ogg rename to nsv13/sound/effects/ship/reactor/startup.ogg diff --git a/sephora/sound/effects/ship/reactor/startup2.ogg b/nsv13/sound/effects/ship/reactor/startup2.ogg similarity index 100% rename from sephora/sound/effects/ship/reactor/startup2.ogg rename to nsv13/sound/effects/ship/reactor/startup2.ogg diff --git a/sephora/sound/effects/ship/reload.ogg b/nsv13/sound/effects/ship/reload.ogg similarity index 100% rename from sephora/sound/effects/ship/reload.ogg rename to nsv13/sound/effects/ship/reload.ogg diff --git a/sephora/sound/effects/ship/torpedo.ogg b/nsv13/sound/effects/ship/torpedo.ogg similarity index 100% rename from sephora/sound/effects/ship/torpedo.ogg rename to nsv13/sound/effects/ship/torpedo.ogg diff --git a/sephora/sound/effects/ship/torpedo_detonate.ogg b/nsv13/sound/effects/ship/torpedo_detonate.ogg similarity index 100% rename from sephora/sound/effects/ship/torpedo_detonate.ogg rename to nsv13/sound/effects/ship/torpedo_detonate.ogg diff --git a/sephora/sound/weapons/m4_fire.wav b/nsv13/sound/weapons/m4_fire.wav similarity index 100% rename from sephora/sound/weapons/m4_fire.wav rename to nsv13/sound/weapons/m4_fire.wav diff --git a/sephora/sound/weapons/railgun/fire.ogg b/nsv13/sound/weapons/railgun/fire.ogg similarity index 100% rename from sephora/sound/weapons/railgun/fire.ogg rename to nsv13/sound/weapons/railgun/fire.ogg diff --git a/sephora/sound/weapons/railgun/load.ogg b/nsv13/sound/weapons/railgun/load.ogg similarity index 100% rename from sephora/sound/weapons/railgun/load.ogg rename to nsv13/sound/weapons/railgun/load.ogg diff --git a/sephora/sound/weapons/railgun/ready.ogg b/nsv13/sound/weapons/railgun/ready.ogg similarity index 100% rename from sephora/sound/weapons/railgun/ready.ogg rename to nsv13/sound/weapons/railgun/ready.ogg diff --git a/sephora/_DEFINES/overmap.dm b/sephora/_DEFINES/overmap.dm deleted file mode 100644 index 4bf9eb068a8..00000000000 --- a/sephora/_DEFINES/overmap.dm +++ /dev/null @@ -1,17 +0,0 @@ -//Weapon modes - -#define FIRE_MODE_PDC 1 -#define FIRE_MODE_RAILGUN 2 -#define FIRE_MODE_TORPEDO 3 - -//AI behaviour - -#define AI_AGGRESSIVE 1 -#define AI_PASSIVE 2 -#define AI_RETALIATE 3 -#define AI_GUARD 4 - -#define isovermap(A) (istype(A, /obj/structure/overmap)) - -GLOBAL_LIST_INIT(overmap_objects, list()) -GLOBAL_LIST_INIT(overmap_impact_sounds, list('sephora/sound/effects/ship/freespace2/impacts/boom_1.wav','sephora/sound/effects/ship/freespace2/impacts/boom_2.wav','sephora/sound/effects/ship/freespace2/impacts/boom_3.wav','sephora/sound/effects/ship/freespace2/impacts/boom_4.wav','sephora/sound/effects/ship/freespace2/impacts/m_hit.wav','sephora/sound/effects/ship/freespace2/impacts/subhit.wav','sephora/sound/effects/ship/freespace2/impacts/subhit2.wav','sephora/sound/effects/ship/damage/consolehit.ogg','sephora/sound/effects/ship/damage/consolehit2.ogg','sephora/sound/effects/ship/damage/consolehit3.ogg','sephora/sound/effects/ship/damage/consolehit4.ogg','sephora/sound/effects/ship/damage/shiphit.ogg','sephora/sound/effects/ship/damage/shiphit2.ogg','sephora/sound/effects/ship/damage/shiphit3.ogg','sephora/sound/effects/ship/damage/shiphit4.ogg','sephora/sound/effects/ship/damage/torpedo_hit.ogg','sephora/sound/effects/ship/damage/explosionfar_2.ogg','sephora/sound/effects/ship/damage/explosionfar_3.ogg','sephora/sound/effects/ship/damage/explosionfar_4.ogg','sephora/sound/effects/ship/damage/explosionfar_5.ogg','sephora/sound/effects/ship/damage/explosionfar_6.ogg')) \ No newline at end of file diff --git a/tools/deploy.sh b/tools/deploy.sh index 98922f40277..c80d579a7c1 100755 --- a/tools/deploy.sh +++ b/tools/deploy.sh @@ -22,7 +22,7 @@ if [ -d ".git" ]; then cp -r .git/logs/* $1/.git/logs/ fi -cp sephora.dmb sephora.rsc $1/ +cp nsv13.dmb nsv13.rsc $1/ cp -r _maps/* $1/_maps/ cp icons/default_title.dmi $1/icons/ cp -r sound/chatter/* $1/sound/chatter/ diff --git a/tools/travis/run_server.sh b/tools/travis/run_server.sh index 8676c6d29e2..76839d898f7 100755 --- a/tools/travis/run_server.sh +++ b/tools/travis/run_server.sh @@ -9,6 +9,6 @@ cp tools/travis/travis_config.txt travis_test/config/config.txt cd travis_test ln -s $HOME/libmariadb/libmariadb.so libmariadb.so -DreamDaemon sephora.dmb -close -trusted -verbose -params "test-run&log-directory=travis" +DreamDaemon nsv13.dmb -close -trusted -verbose -params "test-run&log-directory=travis" cd .. cat travis_test/data/logs/travis/clean_run.lk