From dd44b4ba0171921a719a24e4066cbff13fadb8fe Mon Sep 17 00:00:00 2001 From: Mark Suckerberg Date: Mon, 25 Jan 2021 00:19:04 -0600 Subject: [PATCH] Whitesands Regex/Replacements (#708) I sure bloody hope this doesn't break anything * clustertruck * whoops * a few more changes * fixes errors * final adjustments --- .github/AUTODOC_GUIDE.md | 4 +- .github/CODEOWNERS | 17 +- .github/CONTRIBUTING.md | 12 +- .github/DOWNLOADING.md | 11 +- .github/FUNDING.yml | 4 +- .github/MAPS_AND_AWAY_MISSIONS.md | 14 +- .github/RUNNING_A_SERVER.md | 4 +- .github/labeler.yml | 2 +- .github/workflows/compile_changelogs.yml | 4 +- .github/workflows/docker_publish.yml | 2 +- .github/workflows/generate_documentation.yml | 2 +- .github/workflows/make_changelogs.yml | 4 +- .github/workflows/update_tgs_dmapi.yml | 4 +- README.md | 8 +- code/__DEFINES/DNA.dm | 2 +- code/__DEFINES/access.dm | 4 +- code/__DEFINES/admin.dm | 2 +- code/__DEFINES/colors.dm | 4 +- code/__DEFINES/dcs/signals.dm | 2 +- code/__DEFINES/inventory.dm | 2 +- code/__DEFINES/is_helpers.dm | 12 +- code/__DEFINES/layers.dm | 4 +- code/__DEFINES/logging.dm | 12 +- code/__DEFINES/maps.dm | 4 +- code/__DEFINES/misc.dm | 2 +- code/__DEFINES/mobs.dm | 6 +- code/__DEFINES/obj_flags.dm | 2 +- code/__DEFINES/power.dm | 2 +- code/__DEFINES/preferences.dm | 4 +- code/__DEFINES/radio.dm | 8 +- code/__DEFINES/role_preferences.dm | 4 +- code/__DEFINES/say.dm | 8 +- code/__DEFINES/sound.dm | 2 +- .../icon_smoothing.dm | 0 .../_defines.dm | 2 +- .../atmospherics.dm | 0 .../bone_flags.dm | 0 .../jobs.dm | 0 .../machines.dm | 0 .../maths.dm | 0 .../metacoin.dm | 0 .../movespeed_modification.dm | 2 +- .../obj_flags.dm | 0 .../overmap.dm | 0 .../shuttles.dm | 0 .../spacepods.dm | 0 .../status_effects.dm | 0 .../traits.dm | 0 code/__HELPERS/_logging.dm | 4 +- code/__HELPERS/game.dm | 4 +- code/__HELPERS/global_lists.dm | 4 +- code/__HELPERS/priority_announce.dm | 6 +- code/__HELPERS/roundend.dm | 8 +- code/__HELPERS/text.dm | 4 +- code/_globalvars/configuration.dm | 2 +- code/_globalvars/lists/maintenance_loot.dm | 6 +- code/_globalvars/lists/poll_ignore.dm | 4 +- code/_globalvars/traits.dm | 4 +- code/_onclick/drag_drop.dm | 4 +- code/_onclick/hud/_defines.dm | 4 +- code/_onclick/hud/hud.dm | 4 +- code/_onclick/hud/screen_objects.dm | 4 +- code/_onclick/item_attack.dm | 2 +- .../controllers/configuration/config_entry.dm | 2 +- .../configuration/entries/game_options.dm | 2 +- .../configuration/entries/general.dm | 10 +- code/controllers/subsystem/air.dm | 2 +- code/controllers/subsystem/blackbox.dm | 4 +- code/controllers/subsystem/communications.dm | 4 +- code/controllers/subsystem/job.dm | 8 +- code/controllers/subsystem/mapping.dm | 8 +- code/controllers/subsystem/persistence.dm | 2 +- code/controllers/subsystem/shuttle.dm | 2 +- code/controllers/subsystem/ticker.dm | 20 +- code/controllers/subsystem/traumas.dm | 4 +- code/controllers/subsystem/vote.dm | 16 +- code/datums/action.dm | 2 +- code/datums/brain_damage/brain_trauma.dm | 4 +- code/datums/brain_damage/split_personality.dm | 4 +- code/datums/components/caltrop.dm | 14 +- code/datums/components/crafting/recipes.dm | 4 +- .../components/storage/concrete/pockets.dm | 8 +- code/datums/datacore.dm | 8 +- code/datums/dna.dm | 6 +- code/datums/emotes.dm | 2 +- code/datums/mind.dm | 4 +- .../mood_events/generic_positive_events.dm | 4 +- code/datums/outfit.dm | 4 +- code/datums/radiation_wave.dm | 4 +- code/datums/saymode.dm | 4 +- code/datums/shuttles.dm | 6 +- code/datums/traits/negative.dm | 4 +- code/game/area/areas.dm | 2 +- code/game/area/areas/shuttles.dm | 4 +- code/game/atoms.dm | 2 +- code/game/atoms_movable.dm | 4 +- code/game/communications.dm | 8 +- code/game/data_huds.dm | 6 +- code/game/gamemodes/changeling/changeling.dm | 2 +- code/game/gamemodes/cult/cult.dm | 2 +- code/game/gamemodes/nuclear/nuclear.dm | 4 +- code/game/gamemodes/revolution/revolution.dm | 2 +- code/game/gamemodes/traitor/traitor.dm | 2 +- code/game/machinery/airlock_cycle_control.dm | 4 +- code/game/machinery/autolathe.dm | 4 +- code/game/machinery/computer/card.dm | 2 +- .../game/machinery/computer/communications.dm | 12 +- code/game/machinery/computer/crew.dm | 4 +- code/game/machinery/dance_machine.dm | 20 +- code/game/machinery/doors/airlock.dm | 20 +- code/game/machinery/doors/airlock_types.dm | 8 +- code/game/machinery/requests_console.dm | 2 +- code/game/machinery/shieldgen.dm | 6 +- code/game/machinery/telecomms/broadcasting.dm | 4 +- .../telecomms/machine_interactions.dm | 4 +- code/game/mecha/equipment/tools/work_tools.dm | 4 +- code/game/mecha/mecha.dm | 6 +- code/game/mecha/mecha_construction_paths.dm | 2 +- code/game/mecha/working/clarke.dm | 4 +- code/game/objects/effects/anomalies.dm | 6 +- code/game/objects/effects/contraband.dm | 4 +- code/game/objects/effects/landmarks.dm | 4 +- code/game/objects/items.dm | 2 +- code/game/objects/items/RPD.dm | 4 +- code/game/objects/items/airlock_painter.dm | 8 +- code/game/objects/items/cards_ids.dm | 2 +- code/game/objects/items/cigs_lighters.dm | 40 +- .../circuitboards/machine_circuitboards.dm | 4 +- code/game/objects/items/cosmetics.dm | 4 +- code/game/objects/items/devices/PDA/PDA.dm | 18 +- .../objects/items/devices/geiger_counter.dm | 6 +- code/game/objects/items/devices/multitool.dm | 6 +- .../items/devices/radio/encryptionkey.dm | 4 +- .../objects/items/devices/radio/headset.dm | 2 +- .../objects/items/devices/radio/intercom.dm | 4 +- .../game/objects/items/devices/radio/radio.dm | 10 +- code/game/objects/items/devices/scanners.dm | 22 +- code/game/objects/items/handcuffs.dm | 2 +- code/game/objects/items/manuals.dm | 4 +- code/game/objects/items/plushes.dm | 12 +- code/game/objects/items/stacks/medical.dm | 12 +- code/game/objects/items/stacks/rods.dm | 4 +- .../objects/items/stacks/sheets/mineral.dm | 12 +- .../items/stacks/sheets/sheet_types.dm | 2 +- code/game/objects/items/storage/backpack.dm | 4 +- code/game/objects/items/storage/bags.dm | 36 +- code/game/objects/items/storage/belt.dm | 6 +- code/game/objects/items/storage/boxes.dm | 4 +- code/game/objects/items/storage/briefcase.dm | 2 +- code/game/objects/items/storage/firstaid.dm | 4 +- code/game/objects/items/storage/holsters.dm | 4 +- code/game/objects/items/storage/lockbox.dm | 6 +- code/game/objects/items/storage/secure.dm | 2 +- code/game/objects/items/storage/toolbox.dm | 10 +- code/game/objects/items/tanks/tanks.dm | 6 +- code/game/objects/items/theft_tools.dm | 2 +- code/game/objects/items/tools/crowbar.dm | 6 +- code/game/objects/items/tools/screwdriver.dm | 12 +- code/game/objects/items/tools/weldingtool.dm | 6 +- code/game/objects/items/tools/wirecutters.dm | 8 +- code/game/objects/items/tools/wrench.dm | 6 +- code/game/objects/items/weaponry.dm | 4 +- code/game/objects/structures/barsigns.dm | 4 +- .../objects/structures/beds_chairs/chair.dm | 8 +- .../crates_lockers/closets/job_closets.dm | 14 +- .../crates_lockers/closets/secure/cargo.dm | 4 +- .../closets/secure/engineering.dm | 14 +- .../crates_lockers/closets/secure/medical.dm | 12 +- .../closets/secure/scientist.dm | 6 +- .../crates_lockers/closets/secure/security.dm | 44 +- .../crates_lockers/closets/syndicate.dm | 2 +- .../crates_lockers/closets/utility_closets.dm | 6 +- .../objects/structures/door_assembly_types.dm | 4 +- code/game/objects/structures/extinguisher.dm | 2 +- code/game/objects/structures/false_walls.dm | 2 +- .../objects/structures/ghost_role_spawners.dm | 4 +- code/game/objects/structures/grille.dm | 2 +- .../structures/lavaland/necropolis_tendril.dm | 4 +- code/game/objects/structures/window.dm | 10 +- code/game/say.dm | 6 +- code/game/sound.dm | 6 +- code/game/turfs/closed/wall/mineral_walls.dm | 4 +- code/game/turfs/open/floor/mineral_floor.dm | 4 +- code/game/turfs/turf.dm | 8 +- code/game/world.dm | 6 +- code/modules/admin/admin.dm | 14 +- code/modules/admin/verbs/randomverbs.dm | 10 +- .../antagonists/changeling/powers/panacea.dm | 4 +- code/modules/antagonists/nukeop/nukeop.dm | 4 +- code/modules/antagonists/revenant/revenant.dm | 2 +- .../antagonists/traitor/datum_traitor.dm | 12 +- code/modules/assembly/mousetrap.dm | 2 +- .../atmospherics/gasmixtures/gas_mixture.dm | 4 +- .../atmospherics/machinery/atmosmachinery.dm | 4 +- .../components/unary_devices/thermomachine.dm | 2 +- .../atmospherics/machinery/datum_pipeline.dm | 4 +- .../machinery/portable/canister.dm | 4 +- code/modules/cargo/bounties/reagent.dm | 4 +- code/modules/cargo/exports/large_objects.dm | 4 +- code/modules/cargo/packs.dm | 2 +- code/modules/client/client_procs.dm | 2 +- code/modules/client/preferences.dm | 6 +- code/modules/client/preferences_savefile.dm | 12 +- code/modules/client/preferences_toggles.dm | 4 +- code/modules/client/verbs/looc.dm | 4 +- code/modules/client/verbs/ooc.dm | 8 +- code/modules/client/verbs/suicide.dm | 4 +- code/modules/clothing/chameleon.dm | 2 +- code/modules/clothing/clothing.dm | 8 +- code/modules/clothing/gloves/color.dm | 12 +- code/modules/clothing/head/jobs.dm | 20 +- code/modules/clothing/head/misc.dm | 4 +- code/modules/clothing/masks/breath.dm | 2 +- code/modules/clothing/shoes/_shoes.dm | 8 +- .../clothing/spacesuits/_spacesuits.dm | 4 +- code/modules/clothing/spacesuits/hardsuit.dm | 8 +- code/modules/clothing/suits/_suits.dm | 2 +- code/modules/clothing/suits/armor.dm | 10 +- code/modules/clothing/suits/cloaks.dm | 2 +- code/modules/clothing/suits/jobs.dm | 4 +- .../modules/clothing/suits/reactive_armour.dm | 2 +- code/modules/clothing/suits/toggles.dm | 2 +- code/modules/clothing/under/jobs/centcom.dm | 4 +- .../clothing/under/jobs/civilian/civilian.dm | 4 +- code/modules/clothing/under/jobs/command.dm | 4 +- code/modules/clothing/under/jobs/medical.dm | 4 +- code/modules/clothing/under/jobs/security.dm | 8 +- code/modules/events/anomaly_pyro.dm | 2 +- code/modules/events/brain_trauma.dm | 2 +- code/modules/events/bureaucratic_error.dm | 8 +- code/modules/flufftext/Hallucination.dm | 12 +- code/modules/food_and_drinks/drinks/drinks.dm | 10 +- .../food_and_drinks/drinks/drinks/bottle.dm | 6 +- code/modules/hydroponics/grown/ambrosia.dm | 2 +- code/modules/hydroponics/grown/apple.dm | 2 +- code/modules/hydroponics/grown/beans.dm | 2 +- code/modules/hydroponics/grown/berries.dm | 4 +- code/modules/hydroponics/grown/cannabis.dm | 4 +- code/modules/hydroponics/grown/chili.dm | 6 +- code/modules/hydroponics/grown/citrus.dm | 4 +- .../hydroponics/grown/cocoa_vanilla.dm | 2 +- code/modules/hydroponics/grown/flowers.dm | 2 +- code/modules/hydroponics/grown/garlic.dm | 2 +- .../modules/hydroponics/grown/grass_carpet.dm | 6 +- code/modules/hydroponics/grown/kudzu.dm | 2 +- code/modules/hydroponics/grown/misc.dm | 6 +- code/modules/hydroponics/grown/mushrooms.dm | 12 +- code/modules/hydroponics/grown/nettle.dm | 4 +- code/modules/hydroponics/grown/peas.dm | 2 +- code/modules/hydroponics/grown/random.dm | 2 +- code/modules/hydroponics/hydroitemdefines.dm | 2 +- code/modules/hydroponics/hydroponics.dm | 2 +- code/modules/jobs/access.dm | 12 +- code/modules/jobs/job_types/_job.dm | 16 +- code/modules/jobs/job_types/ai.dm | 4 +- code/modules/jobs/job_types/assistant.dm | 2 +- .../jobs/job_types/atmospheric_technician.dm | 10 +- code/modules/jobs/job_types/bartender.dm | 4 +- code/modules/jobs/job_types/botanist.dm | 6 +- code/modules/jobs/job_types/captain.dm | 8 +- .../jobs/job_types/cargo_technician.dm | 6 +- code/modules/jobs/job_types/chaplain.dm | 4 +- code/modules/jobs/job_types/chemist.dm | 8 +- code/modules/jobs/job_types/chief_engineer.dm | 6 +- .../jobs/job_types/chief_medical_officer.dm | 10 +- code/modules/jobs/job_types/clown.dm | 6 +- code/modules/jobs/job_types/cook.dm | 8 +- code/modules/jobs/job_types/curator.dm | 2 +- code/modules/jobs/job_types/cyborg.dm | 4 +- code/modules/jobs/job_types/detective.dm | 6 +- code/modules/jobs/job_types/geneticist.dm | 16 +- .../jobs/job_types/head_of_personnel.dm | 6 +- .../jobs/job_types/head_of_security.dm | 8 +- code/modules/jobs/job_types/janitor.dm | 4 +- code/modules/jobs/job_types/lawyer.dm | 6 +- code/modules/jobs/job_types/medical_doctor.dm | 10 +- code/modules/jobs/job_types/mime.dm | 4 +- code/modules/jobs/job_types/paramedic.dm | 10 +- code/modules/jobs/job_types/prisoner.dm | 2 +- code/modules/jobs/job_types/psychologist.dm | 2 +- code/modules/jobs/job_types/quartermaster.dm | 8 +- .../jobs/job_types/research_director.dm | 10 +- code/modules/jobs/job_types/roboticist.dm | 8 +- code/modules/jobs/job_types/scientist.dm | 8 +- .../jobs/job_types/security_officer.dm | 8 +- code/modules/jobs/job_types/shaft_miner.dm | 6 +- .../jobs/job_types/station_engineer.dm | 10 +- code/modules/jobs/job_types/virologist.dm | 10 +- code/modules/jobs/job_types/warden.dm | 8 +- code/modules/jobs/jobs.dm | 6 +- code/modules/language/beachbum.dm | 2 +- code/modules/language/buzzwords.dm | 2 +- code/modules/language/calcic.dm | 2 +- code/modules/language/draconic.dm | 2 +- code/modules/language/language_holder.dm | 4 +- code/modules/language/moffic.dm | 2 +- code/modules/language/narsian.dm | 2 +- code/modules/language/piratespeak.dm | 2 +- code/modules/language/rylethian.dm | 2 +- code/modules/language/shadowtongue.dm | 2 +- code/modules/language/slime.dm | 2 +- code/modules/language/sylvan.dm | 2 +- code/modules/language/terrum.dm | 2 +- code/modules/language/voltaic.dm | 2 +- code/modules/language/xenocommon.dm | 2 +- code/modules/mapping/mapping_helpers.dm | 4 +- code/modules/mining/equipment/survival_pod.dm | 2 +- code/modules/mining/machine_bluespaceminer.dm | 2 +- code/modules/mining/mine_items.dm | 2 +- code/modules/mining/ores_coins.dm | 2 +- .../modules/mob/dead/new_player/new_player.dm | 8 +- .../mob/dead/new_player/sprite_accessories.dm | 14 +- code/modules/mob/dead/observer/observer.dm | 4 +- code/modules/mob/dead/observer/say.dm | 2 +- code/modules/mob/living/brain/brain_item.dm | 4 +- code/modules/mob/living/carbon/carbon.dm | 10 +- .../mob/living/carbon/carbon_defense.dm | 4 +- .../modules/mob/living/carbon/damage_procs.dm | 2 +- .../mob/living/carbon/human/damage_procs.dm | 2 +- code/modules/mob/living/carbon/human/emote.dm | 4 +- .../mob/living/carbon/human/examine.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 12 +- .../mob/living/carbon/human/human_defense.dm | 6 +- code/modules/mob/living/carbon/human/life.dm | 4 +- .../mob/living/carbon/human/species.dm | 6 +- .../carbon/human/species_types/ethereal.dm | 40 +- .../human/species_types/lizardpeople.dm | 4 +- .../carbon/human/species_types/mothmen.dm | 4 +- .../carbon/human/species_types/plasmamen.dm | 4 +- code/modules/mob/living/carbon/life.dm | 6 +- .../modules/mob/living/carbon/status_procs.dm | 2 +- code/modules/mob/living/damage_procs.dm | 2 +- code/modules/mob/living/living.dm | 4 +- code/modules/mob/living/living_defines.dm | 2 +- code/modules/mob/living/say.dm | 4 +- .../mob/living/silicon/pai/software.dm | 6 +- .../modules/mob/living/silicon/robot/robot.dm | 2 +- .../mob/living/silicon/robot/robot_modules.dm | 304 ++++----- .../living/simple_animal/bot/construction.dm | 4 +- .../friendly/drone/drones_as_items.dm | 4 +- .../living/simple_animal/friendly/mouse.dm | 26 +- .../living/simple_animal/guardian/guardian.dm | 2 +- .../living/simple_animal/hostile/hostile.dm | 4 +- .../hostile/mining_mobs/basilisk.dm | 2 +- .../hostile/mining_mobs/goliath.dm | 2 +- .../hostile/mining_mobs/hivelord.dm | 6 +- .../hostile/mining_mobs/mining_mobs.dm | 20 +- .../hostile/retaliate/retaliate.dm | 4 +- .../mob/living/simple_animal/simple_animal.dm | 4 +- code/modules/mob/mob_defines.dm | 4 +- code/modules/mob/mob_movement.dm | 12 +- code/modules/mob/say.dm | 8 +- .../modules/ninja/suit/suit_initialisation.dm | 4 +- code/modules/paperwork/faxmachine.dm | 2 +- code/modules/power/apc.dm | 38 +- code/modules/power/cell.dm | 22 +- code/modules/power/generator.dm | 2 +- code/modules/power/lighting.dm | 16 +- code/modules/power/port_gen.dm | 2 +- code/modules/power/singularity/collector.dm | 2 +- code/modules/power/singularity/emitter.dm | 8 +- code/modules/power/smes.dm | 8 +- code/modules/power/solar.dm | 2 +- code/modules/power/terminal.dm | 2 +- code/modules/power/tesla/coil.dm | 4 +- .../boxes_magazines/external/pistol.dm | 4 +- .../boxes_magazines/external/smg.dm | 4 +- code/modules/projectiles/gun.dm | 8 +- .../projectiles/guns/ballistic/automatic.dm | 4 +- .../projectiles/guns/ballistic/pistol.dm | 2 +- .../modules/projectiles/guns/ballistic/toy.dm | 2 +- code/modules/projectiles/guns/energy.dm | 8 +- .../projectiles/guns/energy/energy_gun.dm | 2 +- .../guns/energy/kinetic_accelerator.dm | 2 +- code/modules/projectiles/guns/energy/pulse.dm | 4 +- .../projectiles/guns/energy/special.dm | 6 +- .../projectiles/guns/misc/beam_rifle.dm | 2 +- .../projectiles/guns/misc/syringe_gun.dm | 4 +- code/modules/projectiles/projectile.dm | 12 +- code/modules/projectiles/projectile/beams.dm | 2 +- .../projectiles/projectile/bullets/shotgun.dm | 24 +- .../projectiles/projectile/energy/stun.dm | 8 +- code/modules/reagents/chemistry/holder.dm | 4 +- code/modules/reagents/chemistry/reagents.dm | 4 +- .../reagents/cat2_medicine_reagents.dm | 12 +- .../chemistry/reagents/food_reagents.dm | 2 +- .../chemistry/reagents/medicine_reagents.dm | 20 +- .../chemistry/reagents/other_reagents.dm | 62 +- .../reagents/pyrotechnic_reagents.dm | 14 +- .../chemistry/reagents/toxin_reagents.dm | 14 +- .../chemistry/recipes/cat2_medicines.dm | 14 +- .../reagents/chemistry/recipes/medicine.dm | 12 +- .../reagents/chemistry/recipes/others.dm | 22 +- .../chemistry/recipes/pyrotechnics.dm | 6 +- .../reagents/reagent_containers/pill.dm | 4 +- .../reagents/reagent_containers/spray.dm | 4 +- code/modules/recycling/conveyor2.dm | 2 +- code/modules/religion/religion_sects.dm | 2 +- .../research/designs/autolathe_designs.dm | 4 +- .../designs/mechfabricator_designs.dm | 6 +- .../research/designs/weapon_designs.dm | 6 +- code/modules/research/machinery/protolathe.dm | 2 +- code/modules/research/machinery/techfab.dm | 2 +- .../nanites/nanite_programs/buffing.dm | 20 +- code/modules/research/techweb/all_nodes.dm | 4 +- .../ruins/lavalandruin_code/kinggoat.dm | 2 +- .../ruins/lavalandruin_code/syndicate_base.dm | 2 +- .../ruins/objects_and_mobs/ash_walker_den.dm | 4 +- code/modules/shuttle/shuttle_rotate.dm | 4 +- code/modules/surgery/healing.dm | 2 +- code/modules/surgery/organ_manipulation.dm | 12 +- code/modules/surgery/organs/ears.dm | 2 +- code/modules/surgery/organs/organ_internal.dm | 4 +- code/modules/surgery/organs/stomach.dm | 8 +- code/modules/surgery/organs/tongue.dm | 2 +- code/modules/surgery/tools.dm | 8 +- code/modules/unit_tests/plantgrowth_tests.dm | 2 +- code/modules/uplink/uplink_items.dm | 12 +- code/modules/vending/_vending.dm | 2 +- code/modules/vending/autodrobe.dm | 2 +- code/modules/vending/cigarette.dm | 2 +- code/modules/vending/clothesmate.dm | 2 +- code/modules/vending/wardrobes.dm | 32 +- code/modules/vending/youtool.dm | 2 +- config/config.txt | 2 +- config/game_options.txt | 2 +- goon/README.md | 4 +- html/changelog.html | 8 +- html/changelogs/.all_changelog.yml | 4 +- html/templates/header.html | 8 +- tgstation.dme | 612 +++++++++--------- tools/ci/check_grep.sh | 4 +- waspstation/README.md | 42 -- waspstation/code/_globalvars/lists/mapping.dm | 1 - .../code/modules/clothing/neck/ties.dm | 29 - whitesands/README.md | 42 ++ .../code/__DEFINES/DCM.dm | 0 .../code/__DEFINES/DNA.dm | 0 .../code/__DEFINES/keybinding.dm | 0 .../code/__DEFINES/language.dm | 0 .../code/__HELPERS/text.dm | 0 .../code/_globalvars/game_modes.dm | 0 whitesands/code/_globalvars/lists/mapping.dm | 1 + .../code/_onclick/adjacent.dm | 0 .../code/_onclick/hud/ghost.dm | 4 +- .../configuration/entries/game_options.dm | 0 .../configuration/entries/general.dm | 0 .../controllers/subsystem/autotransfer.dm | 2 +- .../code/controllers/subsystem/job.dm | 0 .../code/controllers/subsystem/jukeboxes.dm | 0 .../code/controllers/subsystem/minimaps.dm | 0 .../code/controllers/subsystem/overmap.dm | 0 .../code/controllers/subsystem/textobfs.dm | 2 +- .../code/datums/achievements/scores.dm | 0 .../code/datums/ai_laws.dm | 0 .../code/datums/brain_damage/brain_trauma.dm | 0 .../code/datums/brain_damage/phobia.dm | 0 .../datums/components/crafting/recipes.dm | 0 .../code/datums/components/outline.dm | 0 .../components/storage/concrete/pockets.dm | 0 .../code/datums/components/taped.dm | 2 +- .../code/datums/dcmnet.dm | 0 .../code/datums/diseases/coronavirus.dm | 0 .../code/datums/diseases/legionvirus.dm | 0 .../code/datums/ert.dm | 0 .../code/datums/keybinding/movement.dm | 0 .../code/datums/mood_events/drug_events.dm | 0 .../mood_events/generic_negative_events.dm | 0 .../code/datums/mutations/dorfism.dm | 0 .../code/datums/quixotejump.dm | 0 .../code/datums/ruins/jungle.dm | 0 .../code/datums/ruins/space.dm | 0 .../code/datums/ruins/station.dm | 0 .../code/datums/ruins/whitesands.dm | 0 .../code/datums/shuttles.dm | 0 .../code/datums/status_effects/debuffs.dm | 0 .../code/datums/traits/_quirk.dm | 0 .../code/datums/world_topic.dm | 0 .../code/game/area/Space_Station_13_areas.dm | 0 .../code/game/area/areas/ruins/space.dm | 0 .../code/game/area/areas/shuttles.dm | 0 .../game/gamemodes/changeling/changeling.dm | 0 .../code/game/gamemodes/objectives.dm | 0 .../code/game/machinery/Sleeper.dm | 0 .../code/game/machinery/cloning.dm | 2 +- .../code/game/machinery/computer/cloning.dm | 0 .../code/game/machinery/cryopod.dm | 0 .../code/game/machinery/doors/poddoor.dm | 12 +- .../code/game/machinery/doors/spacepod.dm | 2 +- .../code/game/machinery/exp_cloner.dm | 0 .../machinery/porta_turret/portable_turret.dm | 0 .../game/machinery/shuttle/custom_shuttle.dm | 2 +- .../game/machinery/shuttle/shuttle_engine.dm | 0 .../machinery/shuttle/shuttle_engine_types.dm | 2 +- .../game/machinery/shuttle/shuttle_heater.dm | 2 +- .../code/game/machinery/suit_storage_unit.dm | 0 .../code/game/objects/effects/countdown.dm | 0 .../objects/effects/decals/cleanable/food.dm | 0 .../objects/effects/decals/cleanable/misc.dm | 0 .../effects/decals/turfdecal/markings.dm | 56 +- .../effects/decals/turfdecal/prefabdecals.dm | 2 +- .../code/game/objects/effects/landmarks.dm | 2 +- .../game/objects/effects/spawners/lootdrop.dm | 0 .../objects/effects/spawners/structure.dm | 14 +- .../game/objects/effects/spiderperson_web.dm | 0 .../temporary_visuals/projectiles/impact.dm | 0 .../temporary_visuals/projectiles/muzzle.dm | 0 .../temporary_visuals/projectiles/tracer.dm | 0 .../game/objects/items/airlock_painter.dm | 4 +- .../code/game/objects/items/cards_ids.dm | 0 .../circuitboards/computer_circuitboards.dm | 0 .../objects/items/circuitboards/deepcore.dm | 0 .../circuitboards/machine_circuitboards.dm | 0 .../code/game/objects/items/cosmetics.dm | 0 .../code/game/objects/items/desk_flags.dm | 2 +- .../game/objects/items/devices/PDA_types.dm | 0 .../game/objects/items/devices/crowbar.dm | 0 .../game/objects/items/devices/multitool.dm | 0 .../items/devices/radio/encryptionkey.dm | 6 +- .../objects/items/devices/radio/headset.dm | 6 +- .../objects/items/devices/radio/intercom.dm | 0 .../game/objects/items/devices/screwdriver.dm | 0 .../game/objects/items/devices/weldingtool.dm | 0 .../game/objects/items/devices/wirecutters.dm | 0 .../code/game/objects/items/devices/wrench.dm | 0 .../code/game/objects/items/ecigar.dm | 0 .../code/game/objects/items/manuals.dm | 0 .../code/game/objects/items/melee/energy.dm | 8 +- .../code/game/objects/items/melee/misc.dm | 4 +- .../code/game/objects/items/pinpointer.dm | 2 +- .../game/objects/items/shuttle_creator.dm | 0 .../code/game/objects/items/stacks/medical.dm | 2 +- .../code/game/objects/items/stacks/tape.dm | 4 +- .../game/objects/items/storage/backpack.dm | 4 +- .../code/game/objects/items/storage/bags.dm | 2 +- .../code/game/objects/items/storage/boxes.dm | 2 +- .../code/game/objects/items/storage/fancy.dm | 0 .../game/objects/items/storage/firstaid.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 0 .../code/game/objects/structures/curtains.dm | 0 .../code/game/turf/_whitesands.dm | 0 .../code/game/turf/closed/wall/whitesands.dm | 40 +- .../code/game/turf/open/floor/whitesands.dm | 2 +- .../code/game/turfs/closed/_closed.dm | 0 .../code/game/turfs/open/floor/hull.dm | 0 .../code/game/turfs/open/floor/medians.dm | 2 +- .../code/modules/admin/topic.dm | 0 .../code/modules/admin/verbs/mapping.dm | 0 .../code/modules/admin/verbs/mentors_edit.dm | 0 .../admin/verbs/modify_antag_tokens.dm | 0 .../antagonists/_common/antag_spawner.dm | 2 +- .../code/modules/antagonists/borer/borer.dm | 4 +- .../modules/antagonists/borer/borer_chems.dm | 0 .../modules/antagonists/borer/borer_html.dm | 0 .../modules/antagonists/borer/borer_say.dm | 0 .../modules/antagonists/borer/syndiborer.dm | 0 .../code/modules/antagonists/ert/ert.dm | 0 .../gasmixtures/immutable_mixtures.dm | 0 .../components/binary_devices/relief_valve.dm | 2 +- .../components/unary_devices/relief_valve.dm | 2 +- .../machinery/portable/canister.dm | 2 +- .../code/modules/awaymissions/corpse.dm | 0 .../awaymissions/mission_code/speedway.dm | 0 .../modules/buildmode/submodes/map_export.dm | 0 .../blackmarket/blackmarket_items/weapons.dm | 0 .../modules/cargo/bounties/engineering.dm | 0 .../modules/cargo/exports/large_objects.dm | 0 .../code/modules/cargo/packs.dm | 0 .../code/modules/client/antag_tokens.dm | 0 .../code/modules/client/loadout/loadout.dm | 0 .../client/loadout/loadout_accessories.dm | 0 .../modules/client/loadout/loadout_eyewear.dm | 0 .../modules/client/loadout/loadout_general.dm | 0 .../modules/client/loadout/loadout_hat.dm | 0 .../modules/client/loadout/loadout_ooc.dm | 0 .../modules/client/loadout/loadout_suit.dm | 0 .../modules/client/loadout/loadout_uniform.dm | 0 .../code/modules/client/verbs/minimap.dm | 0 .../code/modules/clothing/glasses/_glasses.dm | 0 .../code/modules/clothing/glasses/hud.dm | 20 +- .../modules/clothing/gloves/tapegloves.dm | 2 +- .../code/modules/clothing/head/berets.dm | 4 +- .../code/modules/clothing/head/cargo.dm | 8 +- .../code/modules/clothing/head/cowboy.dm | 4 +- .../code/modules/clothing/head/helmet.dm | 8 +- .../modules/clothing/head/misc_special.dm | 0 whitesands/code/modules/clothing/neck/ties.dm | 29 + .../code/modules/clothing/outfits/SolGov.dm | 0 .../code/modules/clothing/shoes/_shoes.dm | 4 +- .../code/modules/clothing/shoes/magboots.dm | 4 +- .../modules/clothing/spacesuits/hardsuits.dm | 16 +- .../code/modules/clothing/spacesuits/syndi.dm | 0 .../code/modules/clothing/suits/armor.dm | 8 +- .../code/modules/clothing/suits/coats.dm | 32 +- .../code/modules/clothing/suits/jobs.dm | 8 +- .../code/modules/clothing/suits/labcoat.dm | 4 +- .../code/modules/clothing/under/SolGov.dm | 4 +- .../modules/clothing/under/accessories.dm | 2 +- .../code/modules/clothing/under/jobs/cargo.dm | 12 +- .../modules/clothing/under/jobs/centcom.dm | 2 +- .../modules/clothing/under/jobs/command.dm | 8 +- .../clothing/under/jobs/engineering.dm | 36 +- .../modules/clothing/under/jobs/medical.dm | 44 +- .../code/modules/clothing/under/jobs/rnd.dm | 28 +- .../modules/clothing/under/jobs/security.dm | 8 +- .../modules/clothing/under/jobs/service.dm | 4 +- .../code/modules/clothing/under/syndicate.dm | 4 +- .../code/modules/events/borers.dm | 0 .../food_and_drinks/food/snacks_meat.dm | 0 .../food_and_drinks/food/snacks_pastry.dm | 0 .../food_and_drinks/food/snacks_salad.dm | 0 .../food_and_drinks/food/snacks_soup.dm | 0 .../kitchen_machinery/catgrill.dm | 2 +- .../kitchen_machinery/smartfridge.dm | 2 +- .../food_and_drinks/recipes/drinks_recipes.dm | 0 .../recipes/tablecraft/recipes_meat.dm | 0 .../recipes/tablecraft/recipes_pastry.dm | 0 .../recipes/tablecraft/recipes_salad.dm | 0 .../recipes/tablecraft/recipes_soup.dm | 0 .../code/modules/jobs/job.dm | 0 .../modules/jobs/job_types/_alt_titles.dm | 0 .../code/modules/jobs/job_types/brigphys.dm | 4 +- .../code/modules/jobs/job_types/solgov_rep.dm | 0 .../code/modules/language/dwarven.dm | 0 .../code/modules/language/language_holder.dm | 0 .../code/modules/language/mouse.dm | 0 .../code/modules/language/spider.dm | 0 .../code/modules/library/lib_items.dm | 0 .../code/modules/mapping/map_template.dm | 0 .../code/modules/mapping/minimaps.dm | 0 .../code/modules/mapping/writer.dm | 0 .../code/modules/metacoin/metacoin.dm | 0 .../code/modules/mining/deepcore/_deepcore.dm | 2 +- .../code/modules/mining/deepcore/drill.dm | 2 +- .../code/modules/mining/deepcore/equipment.dm | 2 +- .../code/modules/mining/deepcore/hopper.dm | 0 .../code/modules/mining/deepcore/hub.dm | 0 .../code/modules/mining/deepcore/ore_vein.dm | 0 .../modules/mining/equipment/explorer_gear.dm | 12 +- .../code/modules/mining/lavaland/ash_flora.dm | 8 +- .../code/modules/mining/ores_coins.dm | 2 +- .../code/modules/mob/emote.dm | 6 +- .../modules/mob/living/brain/posibrain.dm | 0 .../modules/mob/living/carbon/human/human.dm | 0 .../modules/mob/living/carbon/human/life.dm | 0 .../carbon/human/species_types/dwarves.dm | 0 .../carbon/human/species_types/spider.dm | 2 +- .../carbon/human/species_types/squidpeople.dm | 2 +- .../code/modules/mob/living/silicon/ai/ai.dm | 0 .../mob/living/silicon/robot/update_icons.dm | 4 +- .../mob/living/simple_animal/corpse.dm | 0 .../living/simple_animal/friendly/gator.dm | 2 +- .../living/simple_animal/friendly/snake.dm | 4 +- .../living/simple_animal/hostile/hostile.dm | 0 .../hostile/mining_mobs/basilisk.dm | 0 .../hostile/mining_mobs/goliath.dm | 0 .../hostile/whitesands/survivors.dm | 2 +- .../living/simple_animal/hostile/zombie.dm | 2 +- .../code/modules/mob/say_vr.dm | 4 +- .../code/modules/movespeed/modifiers/mobs.dm | 0 .../modules/movespeed/modifiers/reagents.dm | 0 .../code/modules/overmap/_overmap.dm | 6 +- .../code/modules/overmap/events.dm | 0 .../code/modules/overmap/helm.dm | 0 .../code/modules/overmap/nav.dm | 0 .../code/modules/overmap/ships/_ships.dm | 2 +- .../code/modules/overmap/ships/simulated.dm | 0 .../code/modules/paperwork/pen.dm | 0 .../power/antimatter/containment_jar.dm | 0 .../code/modules/power/antimatter/control.dm | 0 .../modules/power/antimatter/shielding.dm | 0 .../code/modules/power/cell.dm | 6 +- .../projectiles/ammunition/ballistic/rifle.dm | 0 .../projectiles/ammunition/ballistic/smg.dm | 4 +- .../projectiles/boxes_magazines/containers.dm | 0 .../boxes_magazines/external/rifle.dm | 4 +- .../boxes_magazines/external/smg.dm | 2 +- .../boxes_magazines/internal/_derringer.dm | 0 .../boxes_magazines/internal/rifle.dm | 0 .../boxes_magazines/internal/shotgun.dm | 0 .../projectiles/boxes_magazines/pistol.dm | 0 .../projectiles/guns/ballistic/automatic.dm | 8 +- .../projectiles/guns/ballistic/derringer.dm | 2 +- .../projectiles/guns/ballistic/rifle.dm | 6 +- .../projectiles/guns/ballistic/shotgun.dm | 16 +- .../projectiles/guns/energy/energy_gun.dm | 2 +- .../modules/projectiles/guns/energy/laser.dm | 0 .../modules/projectiles/guns/energy/pulse.dm | 4 +- .../modules/projectiles/projectile/beams.dm | 0 .../projectiles/projectile/bullets/rifle.dm | 0 .../projectiles/projectile/bullets/smg.dm | 0 .../chemistry/reagents/alcohol_reagents.dm | 0 .../chemistry/reagents/food_reagents.dm | 0 .../chemistry/reagents/medicine_reagents.dm | 0 .../chemistry/reagents/other_reagents.dm | 2 +- .../chemistry/reagents/toxin_reagents.dm | 0 .../reagents/chemistry/recipes/medicine.dm | 2 +- .../reagents/chemistry/recipes/others.dm | 0 .../chemistry/recipes/pyrotechnics.dm | 0 .../reagents/reagent_containers/bottle.dm | 0 .../reagents/reagent_containers/hypospray.dm | 2 +- .../reagents/reagent_containers/hypovial.dm | 4 +- .../reagents/reagent_containers/pill.dm | 0 .../reagents/reagent_containers/syringes.dm | 0 .../research/designs/autolathe_designs.dm | 0 .../research/designs/comp_board_designs.dm | 0 .../research/designs/machine_designs.dm | 0 .../designs/mechfabricator_designs.dm | 0 .../research/designs/spacepod_designs.dm | 0 .../modules/research/designs/tool_designs.dm | 0 .../modules/research/techweb/all_nodes.dm | 0 .../code/modules/shuttle/emergency.dm | 0 .../code/modules/shuttle/shuttle.dm | 0 .../code/modules/spacepods/construction.dm | 0 .../code/modules/spacepods/equipment.dm | 22 +- .../code/modules/spacepods/parts.dm | 4 +- .../code/modules/spacepods/physics.dm | 0 .../code/modules/spacepods/prebuilt.dm | 2 +- .../code/modules/spacepods/spacepod.dm | 18 +- .../code/modules/surgery/ipc_revive.dm | 0 .../code/modules/surgery/mechanical.dm | 0 .../code/modules/surgery/organs/eyes.dm | 2 +- .../code/modules/surgery/organs/liver.dm | 2 +- .../code/modules/surgery/organs/moth_wings.dm | 0 .../code/modules/surgery/organs/tongue.dm | 0 .../code/modules/uplink/uplink_items.dm | 0 .../code/modules/vehicles/pimpin_ride.dm | 6 +- {waspstation => whitesands}/goon/License.md | 0 {waspstation => whitesands}/goon/README.md | 0 .../goon/icons/obj/spacepods/2x2.dmi | Bin .../icons/obj/spacepods/construction_2x2.dmi | Bin .../goon/icons/obj/spacepods/parts.dmi | Bin .../icons/effects/beam.dmi | Bin .../icons/effects/numbers.dmi | Bin .../icons/effects/overmap.dmi | Bin .../icons/effects/prefabdecals.dmi | Bin .../icons/mob/actions/actions_borer.dmi | Bin .../icons/mob/borer.dmi | Bin .../icons/mob/clothing/back.dmi | Bin .../icons/mob/clothing/digialt.dmi | Bin .../icons/mob/clothing/eyes.dmi | Bin .../icons/mob/clothing/feet.dmi | Bin .../icons/mob/clothing/hands.dmi | Bin .../icons/mob/clothing/head.dmi | Bin .../icons/mob/clothing/neck.dmi | Bin .../icons/mob/clothing/suits.dmi | Bin .../icons/mob/clothing/under/SolGov.dmi | Bin .../icons/mob/clothing/under/cargo.dmi | Bin .../icons/mob/clothing/under/centcom.dmi | Bin .../icons/mob/clothing/under/command.dmi | Bin .../icons/mob/clothing/under/engineering.dmi | Bin .../icons/mob/clothing/under/medical.dmi | Bin .../icons/mob/clothing/under/rnd.dmi | Bin .../icons/mob/clothing/under/security.dmi | Bin .../icons/mob/clothing/under/service.dmi | Bin .../icons/mob/clothing/under/syndicate.dmi | Bin .../icons/mob/inhands/clothing/lefthand.dmi | Bin .../icons/mob/inhands/clothing/righthand.dmi | Bin .../mob/inhands/equipment/tools_lefthand.dmi | Bin .../mob/inhands/equipment/tools_righthand.dmi | Bin .../mob/inhands/weapons/64x_guns_left.dmi | Bin .../mob/inhands/weapons/64x_guns_right.dmi | Bin .../mob/inhands/weapons/swords_lefthand.dmi | Bin .../mob/inhands/weapons/swords_righthand.dmi | Bin .../icons/mob/moth_wings.dmi | Bin .../icons/mob/pets.dmi | Bin .../icons/mob/robots.dmi | Bin .../icons/mob/screen_ghost.dmi | Bin .../icons/mob/simple_human.dmi | Bin .../icons/mob/spider.dmi | Bin .../icons/mob/spider_legs.dmi | Bin .../icons/mob/spider_mandibles.dmi | Bin .../icons/mob/spider_parts.dmi | Bin .../icons/mob/spider_spinneret.dmi | Bin .../icons/obj/ammo.dmi | Bin .../icons/obj/atmos.dmi | Bin .../atmospherics/components/relief_valve.dmi | Bin .../obj/atmospherics/pipes/pipe_item.dmi | Bin .../icons/obj/bags.dmi | Bin .../icons/obj/card.dmi | Bin .../icons/obj/chairs.dmi | Bin .../icons/obj/chemical.dmi | Bin .../icons/obj/cigarettes.dmi | Bin .../icons/obj/clothing/accessories.dmi | Bin .../icons/obj/clothing/belt_overlays.dmi | Bin .../icons/obj/clothing/glasses.dmi | Bin .../icons/obj/clothing/gloves.dmi | Bin .../icons/obj/clothing/hats.dmi | Bin .../icons/obj/clothing/neck.dmi | Bin .../icons/obj/clothing/shoes.dmi | Bin .../icons/obj/clothing/suits.dmi | Bin .../icons/obj/clothing/under/SolGov.dmi | Bin .../icons/obj/clothing/under/cargo.dmi | Bin .../icons/obj/clothing/under/centcom.dmi | Bin .../icons/obj/clothing/under/command.dmi | Bin .../icons/obj/clothing/under/engineering.dmi | Bin .../icons/obj/clothing/under/medical.dmi | Bin .../icons/obj/clothing/under/rnd.dmi | Bin .../icons/obj/clothing/under/security.dmi | Bin .../icons/obj/clothing/under/service.dmi | Bin .../icons/obj/clothing/under/syndicate.dmi | Bin .../icons/obj/device.dmi | Bin .../icons/obj/doors/1x2blast_hor.dmi | Bin .../icons/obj/doors/1x2blast_vert.dmi | Bin .../icons/obj/doors/1x3blast_hor.dmi | Bin .../icons/obj/doors/1x3blast_vert.dmi | Bin .../icons/obj/doors/1x4blast_hor.dmi | Bin .../icons/obj/doors/1x4blast_vert.dmi | Bin .../obj/doors/airlocks/shuttle/overlays.dmi | Bin .../obj/doors/airlocks/shuttle/shuttle.dmi | Bin .../icons/obj/drinks.dmi | Bin .../icons/obj/flags.dmi | Bin .../icons/obj/guns/energy.dmi | Bin .../icons/obj/guns/projectile.dmi | Bin .../icons/obj/items_and_weapons.dmi | Bin .../icons/obj/kitchen.dmi | Bin .../icons/obj/lavaland/newlavalandplants.dmi | Bin .../icons/obj/library.dmi | Bin .../icons/obj/machines/bsm.dmi | Bin .../icons/obj/machines/cloning.dmi | Bin .../icons/obj/machines/deepcore.dmi | Bin .../icons/obj/machines/drill.dmi | Bin .../icons/obj/machines/sleeper.dmi | Bin .../icons/obj/mining.dmi | Bin .../icons/obj/monitors.dmi | Bin {waspstation => whitesands}/icons/obj/pda.dmi | Bin .../icons/obj/plushes.dmi | Bin .../icons/obj/power.dmi | Bin .../icons/obj/radio.dmi | Bin .../icons/obj/shuttle.dmi | Bin .../obj/smooth_structures/shuttle_window.dmi | Bin .../icons/obj/spacepods/2x2.dmi | Bin .../icons/obj/spacepods/parts.dmi | Bin .../icons/obj/storage.dmi | Bin .../icons/obj/structures_spawners.dmi | Bin .../icons/obj/surgery.dmi | Bin .../icons/obj/syringe.dmi | Bin .../icons/obj/tapes.dmi | Bin .../icons/obj/terminals.dmi | Bin .../icons/obj/tools.dmi | Bin .../icons/obj/vehicles.dmi | Bin .../icons/obj/vending.dmi | Bin .../icons/obj/wallmounts.dmi | Bin .../icons/rooms/box/engine.dmi | Bin .../icons/turf/decals.dmi | Bin .../icons/turf/floors/medians.dmi | Bin .../icons/turf/floors/shuttle_floors.dmi | Bin .../turf/floors/whitesands/ws_floors.dmi | Bin .../icons/turf/overmap.dmi | Bin .../icons/turf/walls.dmi | Bin .../icons/turf/walls/shuttle_wall.dmi | Bin .../icons/turf/walls/whitesands/ws_walls.dmi | Bin .../sound/effects/footstep/squid1.ogg | Bin .../sound/effects/footstep/squid2.ogg | Bin .../sound/effects/footstep/squid3.ogg | Bin .../sound/effects/mowermove1.ogg | Bin .../sound/effects/mowermove2.ogg | Bin .../sound/effects/mowermovesquish.ogg | Bin .../hornetnoises/Hornet_Fight_Death_01.ogg | Bin .../sound/hornetnoises/hornet_SHAW.ogg | Bin .../sound/hornetnoises/hornet_gitgud.ogg | Bin .../sound/items/tape.ogg | Bin .../sound/voice/speen.ogg | Bin .../sound/voice/squid/squidscream.ogg | Bin .../sound/weapons/SolGov_sword_arm.ogg | Bin .../sound/weapons/gun/shotgun/quadfire.ogg | Bin .../sound/weapons/gun/shotgun/quadinsert.ogg | Bin .../sound/weapons/gun/shotgun/quadrack.ogg | Bin .../tools/generate-spider-names.sh | 0 .../tools/merge-upstream-pull-request.sh | 0 .../tools/spidernames.js | 0 871 files changed, 2149 insertions(+), 2155 deletions(-) rename code/__DEFINES/{wasp_after_defines => whitesands_after_defines}/icon_smoothing.dm (100%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/_defines.dm (87%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/atmospherics.dm (100%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/bone_flags.dm (100%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/jobs.dm (100%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/machines.dm (100%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/maths.dm (100%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/metacoin.dm (100%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/movespeed_modification.dm (62%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/obj_flags.dm (100%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/overmap.dm (100%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/shuttles.dm (100%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/spacepods.dm (100%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/status_effects.dm (100%) rename code/__DEFINES/{~wasp_defines => ~whitesands_defines}/traits.dm (100%) delete mode 100644 waspstation/README.md delete mode 100644 waspstation/code/_globalvars/lists/mapping.dm delete mode 100644 waspstation/code/modules/clothing/neck/ties.dm create mode 100644 whitesands/README.md rename {waspstation => whitesands}/code/__DEFINES/DCM.dm (100%) rename {waspstation => whitesands}/code/__DEFINES/DNA.dm (100%) rename {waspstation => whitesands}/code/__DEFINES/keybinding.dm (100%) rename {waspstation => whitesands}/code/__DEFINES/language.dm (100%) rename {waspstation => whitesands}/code/__HELPERS/text.dm (100%) rename {waspstation => whitesands}/code/_globalvars/game_modes.dm (100%) create mode 100644 whitesands/code/_globalvars/lists/mapping.dm rename {waspstation => whitesands}/code/_onclick/adjacent.dm (100%) rename {waspstation => whitesands}/code/_onclick/hud/ghost.dm (87%) rename {waspstation => whitesands}/code/controllers/configuration/entries/game_options.dm (100%) rename {waspstation => whitesands}/code/controllers/configuration/entries/general.dm (100%) rename {waspstation => whitesands}/code/controllers/subsystem/autotransfer.dm (84%) rename {waspstation => whitesands}/code/controllers/subsystem/job.dm (100%) rename {waspstation => whitesands}/code/controllers/subsystem/jukeboxes.dm (100%) rename {waspstation => whitesands}/code/controllers/subsystem/minimaps.dm (100%) rename {waspstation => whitesands}/code/controllers/subsystem/overmap.dm (100%) rename {waspstation => whitesands}/code/controllers/subsystem/textobfs.dm (95%) rename {waspstation => whitesands}/code/datums/achievements/scores.dm (100%) rename {waspstation => whitesands}/code/datums/ai_laws.dm (100%) rename {waspstation => whitesands}/code/datums/brain_damage/brain_trauma.dm (100%) rename {waspstation => whitesands}/code/datums/brain_damage/phobia.dm (100%) rename {waspstation => whitesands}/code/datums/components/crafting/recipes.dm (100%) rename {waspstation => whitesands}/code/datums/components/outline.dm (100%) rename {waspstation => whitesands}/code/datums/components/storage/concrete/pockets.dm (100%) rename {waspstation => whitesands}/code/datums/components/taped.dm (95%) rename {waspstation => whitesands}/code/datums/dcmnet.dm (100%) rename {waspstation => whitesands}/code/datums/diseases/coronavirus.dm (100%) rename {waspstation => whitesands}/code/datums/diseases/legionvirus.dm (100%) rename {waspstation => whitesands}/code/datums/ert.dm (100%) rename {waspstation => whitesands}/code/datums/keybinding/movement.dm (100%) rename {waspstation => whitesands}/code/datums/mood_events/drug_events.dm (100%) rename {waspstation => whitesands}/code/datums/mood_events/generic_negative_events.dm (100%) rename {waspstation => whitesands}/code/datums/mutations/dorfism.dm (100%) rename {waspstation => whitesands}/code/datums/quixotejump.dm (100%) rename {waspstation => whitesands}/code/datums/ruins/jungle.dm (100%) rename {waspstation => whitesands}/code/datums/ruins/space.dm (100%) rename {waspstation => whitesands}/code/datums/ruins/station.dm (100%) rename {waspstation => whitesands}/code/datums/ruins/whitesands.dm (100%) rename {waspstation => whitesands}/code/datums/shuttles.dm (100%) rename {waspstation => whitesands}/code/datums/status_effects/debuffs.dm (100%) rename {waspstation => whitesands}/code/datums/traits/_quirk.dm (100%) rename {waspstation => whitesands}/code/datums/world_topic.dm (100%) rename {waspstation => whitesands}/code/game/area/Space_Station_13_areas.dm (100%) rename {waspstation => whitesands}/code/game/area/areas/ruins/space.dm (100%) rename {waspstation => whitesands}/code/game/area/areas/shuttles.dm (100%) rename {waspstation => whitesands}/code/game/gamemodes/changeling/changeling.dm (100%) rename {waspstation => whitesands}/code/game/gamemodes/objectives.dm (100%) rename {waspstation => whitesands}/code/game/machinery/Sleeper.dm (100%) rename {waspstation => whitesands}/code/game/machinery/cloning.dm (99%) rename {waspstation => whitesands}/code/game/machinery/computer/cloning.dm (100%) rename {waspstation => whitesands}/code/game/machinery/cryopod.dm (100%) rename {waspstation => whitesands}/code/game/machinery/doors/poddoor.dm (80%) rename {waspstation => whitesands}/code/game/machinery/doors/spacepod.dm (90%) rename {waspstation => whitesands}/code/game/machinery/exp_cloner.dm (100%) rename {waspstation => whitesands}/code/game/machinery/porta_turret/portable_turret.dm (100%) rename {waspstation => whitesands}/code/game/machinery/shuttle/custom_shuttle.dm (95%) rename {waspstation => whitesands}/code/game/machinery/shuttle/shuttle_engine.dm (100%) rename {waspstation => whitesands}/code/game/machinery/shuttle/shuttle_engine_types.dm (99%) rename {waspstation => whitesands}/code/game/machinery/shuttle/shuttle_heater.dm (99%) rename {waspstation => whitesands}/code/game/machinery/suit_storage_unit.dm (100%) rename {waspstation => whitesands}/code/game/objects/effects/countdown.dm (100%) rename {waspstation => whitesands}/code/game/objects/effects/decals/cleanable/food.dm (100%) rename {waspstation => whitesands}/code/game/objects/effects/decals/cleanable/misc.dm (100%) rename {waspstation => whitesands}/code/game/objects/effects/decals/turfdecal/markings.dm (56%) rename {waspstation => whitesands}/code/game/objects/effects/decals/turfdecal/prefabdecals.dm (99%) rename {waspstation => whitesands}/code/game/objects/effects/landmarks.dm (96%) rename {waspstation => whitesands}/code/game/objects/effects/spawners/lootdrop.dm (100%) rename {waspstation => whitesands}/code/game/objects/effects/spawners/structure.dm (73%) rename {waspstation => whitesands}/code/game/objects/effects/spiderperson_web.dm (100%) rename {waspstation => whitesands}/code/game/objects/effects/temporary_visuals/projectiles/impact.dm (100%) rename {waspstation => whitesands}/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm (100%) rename {waspstation => whitesands}/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/airlock_painter.dm (98%) rename {waspstation => whitesands}/code/game/objects/items/cards_ids.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/circuitboards/computer_circuitboards.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/circuitboards/deepcore.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/circuitboards/machine_circuitboards.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/cosmetics.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/desk_flags.dm (89%) rename {waspstation => whitesands}/code/game/objects/items/devices/PDA_types.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/devices/crowbar.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/devices/multitool.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/devices/radio/encryptionkey.dm (80%) rename {waspstation => whitesands}/code/game/objects/items/devices/radio/headset.dm (90%) rename {waspstation => whitesands}/code/game/objects/items/devices/radio/intercom.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/devices/screwdriver.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/devices/weldingtool.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/devices/wirecutters.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/devices/wrench.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/ecigar.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/manuals.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/melee/energy.dm (73%) rename {waspstation => whitesands}/code/game/objects/items/melee/misc.dm (96%) rename {waspstation => whitesands}/code/game/objects/items/pinpointer.dm (98%) rename {waspstation => whitesands}/code/game/objects/items/shuttle_creator.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/stacks/medical.dm (95%) rename {waspstation => whitesands}/code/game/objects/items/stacks/tape.dm (99%) rename {waspstation => whitesands}/code/game/objects/items/storage/backpack.dm (95%) rename {waspstation => whitesands}/code/game/objects/items/storage/bags.dm (94%) rename {waspstation => whitesands}/code/game/objects/items/storage/boxes.dm (87%) rename {waspstation => whitesands}/code/game/objects/items/storage/fancy.dm (100%) rename {waspstation => whitesands}/code/game/objects/items/storage/firstaid.dm (99%) rename {waspstation => whitesands}/code/game/objects/structures/crates_lockers/closets/secure/security.dm (100%) rename {waspstation => whitesands}/code/game/objects/structures/curtains.dm (100%) rename {waspstation => whitesands}/code/game/turf/_whitesands.dm (100%) rename {waspstation => whitesands}/code/game/turf/closed/wall/whitesands.dm (70%) rename {waspstation => whitesands}/code/game/turf/open/floor/whitesands.dm (95%) rename {waspstation => whitesands}/code/game/turfs/closed/_closed.dm (100%) rename {waspstation => whitesands}/code/game/turfs/open/floor/hull.dm (100%) rename {waspstation => whitesands}/code/game/turfs/open/floor/medians.dm (95%) rename {waspstation => whitesands}/code/modules/admin/topic.dm (100%) rename {waspstation => whitesands}/code/modules/admin/verbs/mapping.dm (100%) rename {waspstation => whitesands}/code/modules/admin/verbs/mentors_edit.dm (100%) rename {waspstation => whitesands}/code/modules/admin/verbs/modify_antag_tokens.dm (100%) rename {waspstation => whitesands}/code/modules/antagonists/_common/antag_spawner.dm (94%) rename {waspstation => whitesands}/code/modules/antagonists/borer/borer.dm (99%) rename {waspstation => whitesands}/code/modules/antagonists/borer/borer_chems.dm (100%) rename {waspstation => whitesands}/code/modules/antagonists/borer/borer_html.dm (100%) rename {waspstation => whitesands}/code/modules/antagonists/borer/borer_say.dm (100%) rename {waspstation => whitesands}/code/modules/antagonists/borer/syndiborer.dm (100%) rename {waspstation => whitesands}/code/modules/antagonists/ert/ert.dm (100%) rename {waspstation => whitesands}/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm (100%) rename {waspstation => whitesands}/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm (98%) rename {waspstation => whitesands}/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm (98%) rename {waspstation => whitesands}/code/modules/atmospherics/machinery/portable/canister.dm (89%) rename {waspstation => whitesands}/code/modules/awaymissions/corpse.dm (100%) rename {waspstation => whitesands}/code/modules/awaymissions/mission_code/speedway.dm (100%) rename {waspstation => whitesands}/code/modules/buildmode/submodes/map_export.dm (100%) rename {waspstation => whitesands}/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm (100%) rename {waspstation => whitesands}/code/modules/cargo/bounties/engineering.dm (100%) rename {waspstation => whitesands}/code/modules/cargo/exports/large_objects.dm (100%) rename {waspstation => whitesands}/code/modules/cargo/packs.dm (100%) rename {waspstation => whitesands}/code/modules/client/antag_tokens.dm (100%) rename {waspstation => whitesands}/code/modules/client/loadout/loadout.dm (100%) rename {waspstation => whitesands}/code/modules/client/loadout/loadout_accessories.dm (100%) rename {waspstation => whitesands}/code/modules/client/loadout/loadout_eyewear.dm (100%) rename {waspstation => whitesands}/code/modules/client/loadout/loadout_general.dm (100%) rename {waspstation => whitesands}/code/modules/client/loadout/loadout_hat.dm (100%) rename {waspstation => whitesands}/code/modules/client/loadout/loadout_ooc.dm (100%) rename {waspstation => whitesands}/code/modules/client/loadout/loadout_suit.dm (100%) rename {waspstation => whitesands}/code/modules/client/loadout/loadout_uniform.dm (100%) rename {waspstation => whitesands}/code/modules/client/verbs/minimap.dm (100%) rename {waspstation => whitesands}/code/modules/clothing/glasses/_glasses.dm (100%) rename {waspstation => whitesands}/code/modules/clothing/glasses/hud.dm (73%) rename {waspstation => whitesands}/code/modules/clothing/gloves/tapegloves.dm (93%) rename {waspstation => whitesands}/code/modules/clothing/head/berets.dm (98%) rename {waspstation => whitesands}/code/modules/clothing/head/cargo.dm (67%) rename {waspstation => whitesands}/code/modules/clothing/head/cowboy.dm (59%) rename {waspstation => whitesands}/code/modules/clothing/head/helmet.dm (84%) rename {waspstation => whitesands}/code/modules/clothing/head/misc_special.dm (100%) create mode 100644 whitesands/code/modules/clothing/neck/ties.dm rename {waspstation => whitesands}/code/modules/clothing/outfits/SolGov.dm (100%) rename {waspstation => whitesands}/code/modules/clothing/shoes/_shoes.dm (73%) rename {waspstation => whitesands}/code/modules/clothing/shoes/magboots.dm (97%) rename {waspstation => whitesands}/code/modules/clothing/spacesuits/hardsuits.dm (86%) rename {waspstation => whitesands}/code/modules/clothing/spacesuits/syndi.dm (100%) rename {waspstation => whitesands}/code/modules/clothing/suits/armor.dm (77%) rename {waspstation => whitesands}/code/modules/clothing/suits/coats.dm (66%) rename {waspstation => whitesands}/code/modules/clothing/suits/jobs.dm (90%) rename {waspstation => whitesands}/code/modules/clothing/suits/labcoat.dm (76%) rename {waspstation => whitesands}/code/modules/clothing/under/SolGov.dm (91%) rename {waspstation => whitesands}/code/modules/clothing/under/accessories.dm (97%) rename {waspstation => whitesands}/code/modules/clothing/under/jobs/cargo.dm (78%) rename {waspstation => whitesands}/code/modules/clothing/under/jobs/centcom.dm (91%) rename {waspstation => whitesands}/code/modules/clothing/under/jobs/command.dm (90%) rename {waspstation => whitesands}/code/modules/clothing/under/jobs/engineering.dm (82%) rename {waspstation => whitesands}/code/modules/clothing/under/jobs/medical.dm (83%) rename {waspstation => whitesands}/code/modules/clothing/under/jobs/rnd.dm (80%) rename {waspstation => whitesands}/code/modules/clothing/under/jobs/security.dm (97%) rename {waspstation => whitesands}/code/modules/clothing/under/jobs/service.dm (92%) rename {waspstation => whitesands}/code/modules/clothing/under/syndicate.dm (89%) rename {waspstation => whitesands}/code/modules/events/borers.dm (100%) rename {waspstation => whitesands}/code/modules/food_and_drinks/food/snacks_meat.dm (100%) rename {waspstation => whitesands}/code/modules/food_and_drinks/food/snacks_pastry.dm (100%) rename {waspstation => whitesands}/code/modules/food_and_drinks/food/snacks_salad.dm (100%) rename {waspstation => whitesands}/code/modules/food_and_drinks/food/snacks_soup.dm (100%) rename {waspstation => whitesands}/code/modules/food_and_drinks/kitchen_machinery/catgrill.dm (94%) rename {waspstation => whitesands}/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm (96%) rename {waspstation => whitesands}/code/modules/food_and_drinks/recipes/drinks_recipes.dm (100%) rename {waspstation => whitesands}/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm (100%) rename {waspstation => whitesands}/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm (100%) rename {waspstation => whitesands}/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm (100%) rename {waspstation => whitesands}/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm (100%) rename {waspstation => whitesands}/code/modules/jobs/job.dm (100%) rename {waspstation => whitesands}/code/modules/jobs/job_types/_alt_titles.dm (100%) rename {waspstation => whitesands}/code/modules/jobs/job_types/brigphys.dm (94%) rename {waspstation => whitesands}/code/modules/jobs/job_types/solgov_rep.dm (100%) rename {waspstation => whitesands}/code/modules/language/dwarven.dm (100%) rename {waspstation => whitesands}/code/modules/language/language_holder.dm (100%) rename {waspstation => whitesands}/code/modules/language/mouse.dm (100%) rename {waspstation => whitesands}/code/modules/language/spider.dm (100%) rename {waspstation => whitesands}/code/modules/library/lib_items.dm (100%) rename {waspstation => whitesands}/code/modules/mapping/map_template.dm (100%) rename {waspstation => whitesands}/code/modules/mapping/minimaps.dm (100%) rename {waspstation => whitesands}/code/modules/mapping/writer.dm (100%) rename {waspstation => whitesands}/code/modules/metacoin/metacoin.dm (100%) rename {waspstation => whitesands}/code/modules/mining/deepcore/_deepcore.dm (98%) rename {waspstation => whitesands}/code/modules/mining/deepcore/drill.dm (98%) rename {waspstation => whitesands}/code/modules/mining/deepcore/equipment.dm (94%) rename {waspstation => whitesands}/code/modules/mining/deepcore/hopper.dm (100%) rename {waspstation => whitesands}/code/modules/mining/deepcore/hub.dm (100%) rename {waspstation => whitesands}/code/modules/mining/deepcore/ore_vein.dm (100%) rename {waspstation => whitesands}/code/modules/mining/equipment/explorer_gear.dm (81%) rename {waspstation => whitesands}/code/modules/mining/lavaland/ash_flora.dm (95%) rename {waspstation => whitesands}/code/modules/mining/ores_coins.dm (83%) rename {waspstation => whitesands}/code/modules/mob/emote.dm (82%) rename {waspstation => whitesands}/code/modules/mob/living/brain/posibrain.dm (100%) rename {waspstation => whitesands}/code/modules/mob/living/carbon/human/human.dm (100%) rename {waspstation => whitesands}/code/modules/mob/living/carbon/human/life.dm (100%) rename {waspstation => whitesands}/code/modules/mob/living/carbon/human/species_types/dwarves.dm (100%) rename {waspstation => whitesands}/code/modules/mob/living/carbon/human/species_types/spider.dm (99%) rename {waspstation => whitesands}/code/modules/mob/living/carbon/human/species_types/squidpeople.dm (95%) rename {waspstation => whitesands}/code/modules/mob/living/silicon/ai/ai.dm (100%) rename {waspstation => whitesands}/code/modules/mob/living/silicon/robot/update_icons.dm (91%) rename {waspstation => whitesands}/code/modules/mob/living/simple_animal/corpse.dm (100%) rename {waspstation => whitesands}/code/modules/mob/living/simple_animal/friendly/gator.dm (94%) rename {waspstation => whitesands}/code/modules/mob/living/simple_animal/friendly/snake.dm (98%) rename {waspstation => whitesands}/code/modules/mob/living/simple_animal/hostile/hostile.dm (100%) rename {waspstation => whitesands}/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm (100%) rename {waspstation => whitesands}/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm (100%) rename {waspstation => whitesands}/code/modules/mob/living/simple_animal/hostile/whitesands/survivors.dm (98%) rename {waspstation => whitesands}/code/modules/mob/living/simple_animal/hostile/zombie.dm (82%) rename {waspstation => whitesands}/code/modules/mob/say_vr.dm (97%) rename {waspstation => whitesands}/code/modules/movespeed/modifiers/mobs.dm (100%) rename {waspstation => whitesands}/code/modules/movespeed/modifiers/reagents.dm (100%) rename {waspstation => whitesands}/code/modules/overmap/_overmap.dm (98%) rename {waspstation => whitesands}/code/modules/overmap/events.dm (100%) rename {waspstation => whitesands}/code/modules/overmap/helm.dm (100%) rename {waspstation => whitesands}/code/modules/overmap/nav.dm (100%) rename {waspstation => whitesands}/code/modules/overmap/ships/_ships.dm (99%) rename {waspstation => whitesands}/code/modules/overmap/ships/simulated.dm (100%) rename {waspstation => whitesands}/code/modules/paperwork/pen.dm (100%) rename {waspstation => whitesands}/code/modules/power/antimatter/containment_jar.dm (100%) rename {waspstation => whitesands}/code/modules/power/antimatter/control.dm (100%) rename {waspstation => whitesands}/code/modules/power/antimatter/shielding.dm (100%) rename {waspstation => whitesands}/code/modules/power/cell.dm (91%) rename {waspstation => whitesands}/code/modules/projectiles/ammunition/ballistic/rifle.dm (100%) rename {waspstation => whitesands}/code/modules/projectiles/ammunition/ballistic/smg.dm (84%) rename {waspstation => whitesands}/code/modules/projectiles/boxes_magazines/containers.dm (100%) rename {waspstation => whitesands}/code/modules/projectiles/boxes_magazines/external/rifle.dm (87%) rename {waspstation => whitesands}/code/modules/projectiles/boxes_magazines/external/smg.dm (89%) rename {waspstation => whitesands}/code/modules/projectiles/boxes_magazines/internal/_derringer.dm (100%) rename {waspstation => whitesands}/code/modules/projectiles/boxes_magazines/internal/rifle.dm (100%) rename {waspstation => whitesands}/code/modules/projectiles/boxes_magazines/internal/shotgun.dm (100%) rename {waspstation => whitesands}/code/modules/projectiles/boxes_magazines/pistol.dm (100%) rename {waspstation => whitesands}/code/modules/projectiles/guns/ballistic/automatic.dm (88%) rename {waspstation => whitesands}/code/modules/projectiles/guns/ballistic/derringer.dm (96%) rename {waspstation => whitesands}/code/modules/projectiles/guns/ballistic/rifle.dm (71%) rename {waspstation => whitesands}/code/modules/projectiles/guns/ballistic/shotgun.dm (88%) rename {waspstation => whitesands}/code/modules/projectiles/guns/energy/energy_gun.dm (89%) rename {waspstation => whitesands}/code/modules/projectiles/guns/energy/laser.dm (100%) rename {waspstation => whitesands}/code/modules/projectiles/guns/energy/pulse.dm (88%) rename {waspstation => whitesands}/code/modules/projectiles/projectile/beams.dm (100%) rename {waspstation => whitesands}/code/modules/projectiles/projectile/bullets/rifle.dm (100%) rename {waspstation => whitesands}/code/modules/projectiles/projectile/bullets/smg.dm (100%) rename {waspstation => whitesands}/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm (100%) rename {waspstation => whitesands}/code/modules/reagents/chemistry/reagents/food_reagents.dm (100%) rename {waspstation => whitesands}/code/modules/reagents/chemistry/reagents/medicine_reagents.dm (100%) rename {waspstation => whitesands}/code/modules/reagents/chemistry/reagents/other_reagents.dm (92%) rename {waspstation => whitesands}/code/modules/reagents/chemistry/reagents/toxin_reagents.dm (100%) rename {waspstation => whitesands}/code/modules/reagents/chemistry/recipes/medicine.dm (98%) rename {waspstation => whitesands}/code/modules/reagents/chemistry/recipes/others.dm (100%) rename {waspstation => whitesands}/code/modules/reagents/chemistry/recipes/pyrotechnics.dm (100%) rename {waspstation => whitesands}/code/modules/reagents/reagent_containers/bottle.dm (100%) rename {waspstation => whitesands}/code/modules/reagents/reagent_containers/hypospray.dm (99%) rename {waspstation => whitesands}/code/modules/reagents/reagent_containers/hypovial.dm (98%) rename {waspstation => whitesands}/code/modules/reagents/reagent_containers/pill.dm (100%) rename {waspstation => whitesands}/code/modules/reagents/reagent_containers/syringes.dm (100%) rename {waspstation => whitesands}/code/modules/research/designs/autolathe_designs.dm (100%) rename {waspstation => whitesands}/code/modules/research/designs/comp_board_designs.dm (100%) rename {waspstation => whitesands}/code/modules/research/designs/machine_designs.dm (100%) rename {waspstation => whitesands}/code/modules/research/designs/mechfabricator_designs.dm (100%) rename {waspstation => whitesands}/code/modules/research/designs/spacepod_designs.dm (100%) rename {waspstation => whitesands}/code/modules/research/designs/tool_designs.dm (100%) rename {waspstation => whitesands}/code/modules/research/techweb/all_nodes.dm (100%) rename {waspstation => whitesands}/code/modules/shuttle/emergency.dm (100%) rename {waspstation => whitesands}/code/modules/shuttle/shuttle.dm (100%) rename {waspstation => whitesands}/code/modules/spacepods/construction.dm (100%) rename {waspstation => whitesands}/code/modules/spacepods/equipment.dm (95%) rename {waspstation => whitesands}/code/modules/spacepods/parts.dm (98%) rename {waspstation => whitesands}/code/modules/spacepods/physics.dm (100%) rename {waspstation => whitesands}/code/modules/spacepods/prebuilt.dm (96%) rename {waspstation => whitesands}/code/modules/spacepods/spacepod.dm (96%) rename {waspstation => whitesands}/code/modules/surgery/ipc_revive.dm (100%) rename {waspstation => whitesands}/code/modules/surgery/mechanical.dm (100%) rename {waspstation => whitesands}/code/modules/surgery/organs/eyes.dm (94%) rename {waspstation => whitesands}/code/modules/surgery/organs/liver.dm (89%) rename {waspstation => whitesands}/code/modules/surgery/organs/moth_wings.dm (100%) rename {waspstation => whitesands}/code/modules/surgery/organs/tongue.dm (100%) rename {waspstation => whitesands}/code/modules/uplink/uplink_items.dm (100%) rename {waspstation => whitesands}/code/modules/vehicles/pimpin_ride.dm (88%) rename {waspstation => whitesands}/goon/License.md (100%) rename {waspstation => whitesands}/goon/README.md (100%) rename {waspstation => whitesands}/goon/icons/obj/spacepods/2x2.dmi (100%) rename {waspstation => whitesands}/goon/icons/obj/spacepods/construction_2x2.dmi (100%) rename {waspstation => whitesands}/goon/icons/obj/spacepods/parts.dmi (100%) rename {waspstation => whitesands}/icons/effects/beam.dmi (100%) rename {waspstation => whitesands}/icons/effects/numbers.dmi (100%) rename {waspstation => whitesands}/icons/effects/overmap.dmi (100%) rename {waspstation => whitesands}/icons/effects/prefabdecals.dmi (100%) rename {waspstation => whitesands}/icons/mob/actions/actions_borer.dmi (100%) rename {waspstation => whitesands}/icons/mob/borer.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/back.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/digialt.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/eyes.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/feet.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/hands.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/head.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/neck.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/suits.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/under/SolGov.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/under/cargo.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/under/centcom.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/under/command.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/under/engineering.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/under/medical.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/under/rnd.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/under/security.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/under/service.dmi (100%) rename {waspstation => whitesands}/icons/mob/clothing/under/syndicate.dmi (100%) rename {waspstation => whitesands}/icons/mob/inhands/clothing/lefthand.dmi (100%) rename {waspstation => whitesands}/icons/mob/inhands/clothing/righthand.dmi (100%) rename {waspstation => whitesands}/icons/mob/inhands/equipment/tools_lefthand.dmi (100%) rename {waspstation => whitesands}/icons/mob/inhands/equipment/tools_righthand.dmi (100%) rename {waspstation => whitesands}/icons/mob/inhands/weapons/64x_guns_left.dmi (100%) rename {waspstation => whitesands}/icons/mob/inhands/weapons/64x_guns_right.dmi (100%) rename {waspstation => whitesands}/icons/mob/inhands/weapons/swords_lefthand.dmi (100%) rename {waspstation => whitesands}/icons/mob/inhands/weapons/swords_righthand.dmi (100%) rename {waspstation => whitesands}/icons/mob/moth_wings.dmi (100%) rename {waspstation => whitesands}/icons/mob/pets.dmi (100%) rename {waspstation => whitesands}/icons/mob/robots.dmi (100%) rename {waspstation => whitesands}/icons/mob/screen_ghost.dmi (100%) rename {waspstation => whitesands}/icons/mob/simple_human.dmi (100%) rename {waspstation => whitesands}/icons/mob/spider.dmi (100%) rename {waspstation => whitesands}/icons/mob/spider_legs.dmi (100%) rename {waspstation => whitesands}/icons/mob/spider_mandibles.dmi (100%) rename {waspstation => whitesands}/icons/mob/spider_parts.dmi (100%) rename {waspstation => whitesands}/icons/mob/spider_spinneret.dmi (100%) rename {waspstation => whitesands}/icons/obj/ammo.dmi (100%) rename {waspstation => whitesands}/icons/obj/atmos.dmi (100%) rename {waspstation => whitesands}/icons/obj/atmospherics/components/relief_valve.dmi (100%) rename {waspstation => whitesands}/icons/obj/atmospherics/pipes/pipe_item.dmi (100%) rename {waspstation => whitesands}/icons/obj/bags.dmi (100%) rename {waspstation => whitesands}/icons/obj/card.dmi (100%) rename {waspstation => whitesands}/icons/obj/chairs.dmi (100%) rename {waspstation => whitesands}/icons/obj/chemical.dmi (100%) rename {waspstation => whitesands}/icons/obj/cigarettes.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/accessories.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/belt_overlays.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/glasses.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/gloves.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/hats.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/neck.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/shoes.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/suits.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/under/SolGov.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/under/cargo.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/under/centcom.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/under/command.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/under/engineering.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/under/medical.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/under/rnd.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/under/security.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/under/service.dmi (100%) rename {waspstation => whitesands}/icons/obj/clothing/under/syndicate.dmi (100%) rename {waspstation => whitesands}/icons/obj/device.dmi (100%) rename {waspstation => whitesands}/icons/obj/doors/1x2blast_hor.dmi (100%) rename {waspstation => whitesands}/icons/obj/doors/1x2blast_vert.dmi (100%) rename {waspstation => whitesands}/icons/obj/doors/1x3blast_hor.dmi (100%) rename {waspstation => whitesands}/icons/obj/doors/1x3blast_vert.dmi (100%) rename {waspstation => whitesands}/icons/obj/doors/1x4blast_hor.dmi (100%) rename {waspstation => whitesands}/icons/obj/doors/1x4blast_vert.dmi (100%) rename {waspstation => whitesands}/icons/obj/doors/airlocks/shuttle/overlays.dmi (100%) rename {waspstation => whitesands}/icons/obj/doors/airlocks/shuttle/shuttle.dmi (100%) rename {waspstation => whitesands}/icons/obj/drinks.dmi (100%) rename {waspstation => whitesands}/icons/obj/flags.dmi (100%) rename {waspstation => whitesands}/icons/obj/guns/energy.dmi (100%) rename {waspstation => whitesands}/icons/obj/guns/projectile.dmi (100%) rename {waspstation => whitesands}/icons/obj/items_and_weapons.dmi (100%) rename {waspstation => whitesands}/icons/obj/kitchen.dmi (100%) rename {waspstation => whitesands}/icons/obj/lavaland/newlavalandplants.dmi (100%) rename {waspstation => whitesands}/icons/obj/library.dmi (100%) rename {waspstation => whitesands}/icons/obj/machines/bsm.dmi (100%) rename {waspstation => whitesands}/icons/obj/machines/cloning.dmi (100%) rename {waspstation => whitesands}/icons/obj/machines/deepcore.dmi (100%) rename {waspstation => whitesands}/icons/obj/machines/drill.dmi (100%) rename {waspstation => whitesands}/icons/obj/machines/sleeper.dmi (100%) rename {waspstation => whitesands}/icons/obj/mining.dmi (100%) rename {waspstation => whitesands}/icons/obj/monitors.dmi (100%) rename {waspstation => whitesands}/icons/obj/pda.dmi (100%) rename {waspstation => whitesands}/icons/obj/plushes.dmi (100%) rename {waspstation => whitesands}/icons/obj/power.dmi (100%) rename {waspstation => whitesands}/icons/obj/radio.dmi (100%) rename {waspstation => whitesands}/icons/obj/shuttle.dmi (100%) rename {waspstation => whitesands}/icons/obj/smooth_structures/shuttle_window.dmi (100%) rename {waspstation => whitesands}/icons/obj/spacepods/2x2.dmi (100%) rename {waspstation => whitesands}/icons/obj/spacepods/parts.dmi (100%) rename {waspstation => whitesands}/icons/obj/storage.dmi (100%) rename {waspstation => whitesands}/icons/obj/structures_spawners.dmi (100%) rename {waspstation => whitesands}/icons/obj/surgery.dmi (100%) rename {waspstation => whitesands}/icons/obj/syringe.dmi (100%) rename {waspstation => whitesands}/icons/obj/tapes.dmi (100%) rename {waspstation => whitesands}/icons/obj/terminals.dmi (100%) rename {waspstation => whitesands}/icons/obj/tools.dmi (100%) rename {waspstation => whitesands}/icons/obj/vehicles.dmi (100%) rename {waspstation => whitesands}/icons/obj/vending.dmi (100%) rename {waspstation => whitesands}/icons/obj/wallmounts.dmi (100%) rename {waspstation => whitesands}/icons/rooms/box/engine.dmi (100%) rename {waspstation => whitesands}/icons/turf/decals.dmi (100%) rename {waspstation => whitesands}/icons/turf/floors/medians.dmi (100%) rename {waspstation => whitesands}/icons/turf/floors/shuttle_floors.dmi (100%) rename {waspstation => whitesands}/icons/turf/floors/whitesands/ws_floors.dmi (100%) rename {waspstation => whitesands}/icons/turf/overmap.dmi (100%) rename {waspstation => whitesands}/icons/turf/walls.dmi (100%) rename {waspstation => whitesands}/icons/turf/walls/shuttle_wall.dmi (100%) rename {waspstation => whitesands}/icons/turf/walls/whitesands/ws_walls.dmi (100%) rename {waspstation => whitesands}/sound/effects/footstep/squid1.ogg (100%) rename {waspstation => whitesands}/sound/effects/footstep/squid2.ogg (100%) rename {waspstation => whitesands}/sound/effects/footstep/squid3.ogg (100%) rename {waspstation => whitesands}/sound/effects/mowermove1.ogg (100%) rename {waspstation => whitesands}/sound/effects/mowermove2.ogg (100%) rename {waspstation => whitesands}/sound/effects/mowermovesquish.ogg (100%) rename {waspstation => whitesands}/sound/hornetnoises/Hornet_Fight_Death_01.ogg (100%) rename {waspstation => whitesands}/sound/hornetnoises/hornet_SHAW.ogg (100%) rename {waspstation => whitesands}/sound/hornetnoises/hornet_gitgud.ogg (100%) rename {waspstation => whitesands}/sound/items/tape.ogg (100%) rename {waspstation => whitesands}/sound/voice/speen.ogg (100%) rename {waspstation => whitesands}/sound/voice/squid/squidscream.ogg (100%) rename {waspstation => whitesands}/sound/weapons/SolGov_sword_arm.ogg (100%) rename {waspstation => whitesands}/sound/weapons/gun/shotgun/quadfire.ogg (100%) rename {waspstation => whitesands}/sound/weapons/gun/shotgun/quadinsert.ogg (100%) rename {waspstation => whitesands}/sound/weapons/gun/shotgun/quadrack.ogg (100%) rename {waspstation => whitesands}/tools/generate-spider-names.sh (100%) rename {waspstation => whitesands}/tools/merge-upstream-pull-request.sh (100%) rename {waspstation => whitesands}/tools/spidernames.js (100%) diff --git a/.github/AUTODOC_GUIDE.md b/.github/AUTODOC_GUIDE.md index fb46b95c069..d6d12b22d61 100644 --- a/.github/AUTODOC_GUIDE.md +++ b/.github/AUTODOC_GUIDE.md @@ -1,5 +1,5 @@ # dmdoc -[DOCUMENTATION]: https://waspstation.github.io/WaspStation-1.0/ +[DOCUMENTATION]: https://whitesands13.github.io/Whitesands/ [BYOND]: https://secure.byond.com/ @@ -89,7 +89,7 @@ that will also be rendered and added to the modules tree. The structure for these is deliberately not defined, so you can be as freeform and as wheeling as you would like. -[Here is a representative example of what you might write](https://waspstation.github.io/WaspStation-1.0/code/modules/keybindings/readme.html) +[Here is a representative example of what you might write](https://whitesands13.github.io/Whitesands/code/modules/keybindings/readme.html) ## Special variables You can use certain special template variables in DM DOC comments and they will be expanded diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 84e6f1ced74..3a5409fee2f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -5,25 +5,22 @@ # to the same file or dir, add them to the end under Multiple Owners # BFAT -/code/modules/power/generator.dm @SynnGraffkin -/waspstation/code/modules/mapping/minimaps.dm @SynnGraffkin +/whitesands/code/modules/mapping/minimaps.dm @SynnGraffkin +/whitesands/code/modules/spacepods/ @SynnGraffkin # Marksuckerberg -/waspstation/code/modules/admin/ @MarkSuckerberg -/waspstation/code/modules/antagonists/borer/ @MarkSuckerberg -/waspstation/code/modules/jobs/ @MarkSuckerberg -/waspstation/code/modules/reagents/ @MarkSuckerberg -/waspstation/code/modules/surgery/ @MarkSuckerberg -/waspstation/code/modules/overmap @MarkSuckerberg +/whitesands/code/modules/antagonists/borer/ @MarkSuckerberg +/whitesands/code/modules/jobs/ @MarkSuckerberg +/whitesands/code/modules/overmap/ @MarkSuckerberg # Maldaris -/waspstation/code/modules/mob/living/carbon/human/species_types/spider.dm @Maldaris +/whitesands/code/modules/mob/living/carbon/human/species_types/spider.dm @Maldaris # Superyodeler /code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @Superyodeler # triplezeta -/waspstation/icons/ @triplezeta +/whitesands/icons/ @triplezeta ##### /TG BEGIN ##### diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 629366c6f9b..e7443ea1a3f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -10,20 +10,20 @@ If you have difficulty, ask for help in the #coding-general channel on our disco ## Introduction -Hello and welcome to WaspStation's contributing page. You are here because you are curious or interested in contributing - thank you! Everyone is free to contribute to this project as long as they follow the simple guidelines and specifications below; at wasp, we strive to maintain code stability and maintainability, and to do that, we need all pull requests to hold up to those specifications. It's in everyone's best interests - including yours! - if the same bug doesn't have to be fixed twice because of duplicated code. +Hello and welcome to White Sands' contributing page. You are here because you are curious or interested in contributing - thank you! Everyone is free to contribute to this project as long as they follow the simple guidelines and specifications below; at WS, we strive to maintain code stability and maintainability, and to do that, we need all pull requests to hold up to those specifications. It's in everyone's best interests - including yours! - if the same bug doesn't have to be fixed twice because of duplicated code. First things first, we want to make it clear how you can contribute (if you've never contributed before), as well as the kinds of powers the team has over your additions, to avoid any unpleasant surprises if your pull request is closed for a reason you didn't foresee. ## Getting Started -WaspStation doesn't have a list of goals and features to add; we instead allow freedom for contributors to suggest and create their ideas for the game. That doesn't mean we aren't determined to squash bugs, which unfortunately pop up a lot due to the deep complexity of the game. Here are some useful starting guides, if you want to contribute or if you want to know what challenges you can tackle with zero knowledge about the game's code structure. +White Sands doesn't usually have a list of goals and features to add; we instead allow freedom for contributors to suggest and create their ideas for the game. That doesn't mean we aren't determined to squash bugs, which unfortunately pop up a lot due to the deep complexity of the game. Here are some useful starting guides, if you want to contribute or if you want to know what challenges you can tackle with zero knowledge about the game's code structure. -If you want to contribute the first thing you'll need to do is [set up Git](https://wiki.boomerstation.space/Setting_up_git) so you can download the source code. +If you want to contribute the first thing you'll need to do is [set up Git](https://wiki.white-sands.space/Setting_up_git) so you can download the source code. After setting it up, optionally navigate your git commandline to the project folder and run the command: 'git config blame.ignoreRevsFile .git-blame-ignore-revs' -We have a [list of guides on the wiki](https://wiki.boomerstation.space/index.php/Guides#Development_and_Contribution_Guides) that will help you get started contributing to WaspStation with Git and Dream Maker. For beginners, it is recommended you work on small projects like bugfixes at first. If you need help learning to program in BYOND, check out this [repository of resources](http://www.byond.com/developer/articles/resources). +We have a [list of guides on the wiki](https://wiki.white-sands.space/index.php/Guides#Development_and_Contribution_Guides) that will help you get started contributing to White Sands with Git and Dream Maker. For beginners, it is recommended you work on small projects like bugfixes at first. If you need help learning to program in BYOND, check out this [repository of resources](http://www.byond.com/developer/articles/resources). -There is an open list of approachable issues for [your inspiration here](https://github.com/waspstation/waspstation-1.0/issues?q=is%3Aopen+is%3Aissue+label%3A%22Good+First+Issue%22).e +There is an open list of approachable issues for [your inspiration here](https://github.com/Whitesands13/Whitesands/issues?q=is%3Aopen+is%3Aissue+label%3A%22Good+First+Issue%22).e You can of course, as always, ask for help on the discord channels, or the forums, We're just here to have fun and help out, so please don't expect professional support. @@ -393,7 +393,7 @@ There is no strict process when it comes to merging pull requests. Pull requests * You are going to be expected to document all your changes in the pull request. Failing to do so will mean delaying it as we will have to question why you made the change. On the other hand, you can speed up the process by making the pull request readable and easy to understand, with diagrams or before/after data. -* We ask that you use the changelog system to document your change, which prevents our players from being caught unaware by changes - you can find more information about this [on this wiki page](https://wiki.boomerstation.space/Guide_to_Changelogs). +* We ask that you use the changelog system to document your change, which prevents our players from being caught unaware by changes - you can find more information about this [on this wiki page](https://wiki.white-sands.space/Guide_to_Changelogs). * If you are proposing multiple changes, which change many different aspects of the code, you are expected to section them off into different pull requests in order to make it easier to review them and to deny/accept the changes that are deemed acceptable. (This is called atomization, if someone asks you to do it.) diff --git a/.github/DOWNLOADING.md b/.github/DOWNLOADING.md index 035af9ca45c..cb2e0200a9d 100644 --- a/.github/DOWNLOADING.md +++ b/.github/DOWNLOADING.md @@ -1,9 +1,9 @@ # DOWNLOADING -There are a number of ways to download the source code. Some are described here, an alternative all-inclusive guide is also located at https://wiki.boomerstation.space/Downloading_the_source_code +There are a number of ways to download the source code. Some are described here, an alternative all-inclusive guide is also located at https://wiki.white-sands.space/Downloading_the_source_code ## Option 1 -Follow this: https://wiki.boomerstation.space/Setting_up_git +Follow this: https://wiki.white-sands.space/Setting_up_git ## Option 2 @@ -12,19 +12,16 @@ code tab of https://github.com/tgstation/tgstation (note: this will use a lot of bandwidth if you wish to update and is a lot of hassle if you want to make any changes at all, so it's not recommended.) -**WARNING: OPTIONS 3 AND 4 ARE NOT AVAILABLE FOR WASPCODE, THESE ARE FOR /TG/ ONLY AS OF NOW** +**WARNING: OPTIONS 3 IS NOT AVAILABLE FOR WSCODE, THIS IS FOR /TG/ ONLY AS OF NOW** ## Option 3 Download a pre-compiled nightly at https://tgstation13.download/nightlies/ (same caveats as option 2) -*Warning: option 4 is out of date, and not maintained, use at your own risk* - ## Option 4 Use our docker image that tracks the master branch (See commits for build status. Again, same caveats as option 2) ``` -docker run -d -p :1337 -v /path/to/your/config:/tgstation/config -v /path/to/your/data:/tgstation/data tgstation/tgstation +docker run -d -p :1337 -v /path/to/your/config:/tgstation/config -v /path/to/your/data:/tgstation/data whitesands13/whitesands ``` - diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index a479f77e049..d5d027bf289 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,9 +1,9 @@ # These are supported funding model platforms github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: waspstation +patreon: whitesands open_collective: # Replace with a single Open Collective username -ko_fi: mantisstation +ko_fi: # mantisstation tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry liberapay: # Replace with a single Liberapay username diff --git a/.github/MAPS_AND_AWAY_MISSIONS.md b/.github/MAPS_AND_AWAY_MISSIONS.md index 4681b59f960..6ac3bd04548 100644 --- a/.github/MAPS_AND_AWAY_MISSIONS.md +++ b/.github/MAPS_AND_AWAY_MISSIONS.md @@ -1,12 +1,12 @@ # MAPS -Waspstation currently comes equipped with five maps. +White Sands currently comes equipped with five maps. -* [BoxStation (default)](https://wiki.boomerstation.space/Boxstation) -* [MetaStation](https://wiki.boomerstation.space/MetaStation) -* [DeltaStation](https://wiki.boomerstation.space/DeltaStation) -* [PubbyStation](https://wiki.boomerstation.space/PubbyStation) -* [Kilostation](https://wiki.boomerstation.space/KiloStation) +* [BoxStation (default)](https://wiki.white-sands.space/Boxstation) +* [MetaStation](https://wiki.white-sands.space/MetaStation) +* [DeltaStation](https://wiki.white-sands.space/DeltaStation) +* [PubbyStation](https://wiki.white-sands.space/PubbyStation) +* [Kilostation](https://wiki.white-sands.space/KiloStation) All maps have their own code file that is in the base of the _maps directory. Maps are loaded dynamically when the game starts. Follow this guideline when adding your own map, to your fork, for easy compatibility. @@ -18,7 +18,7 @@ Anytime you want to make changes to a map it's imperative you use the [Map Mergi ## AWAY MISSIONS -Waspstation supports loading away missions however they are disabled by default. +White Sands supports loading away missions however they are disabled by default. Map files for away missions are located in the _maps/RandomZLevels directory. Each away mission includes it's own code definitions located in /code/modules/awaymissions/mission_code. These files must be included and compiled with the server beforehand otherwise the server will crash upon trying to load away missions that lack their code. diff --git a/.github/RUNNING_A_SERVER.md b/.github/RUNNING_A_SERVER.md index 8400a41c0e3..bdcd00556fa 100644 --- a/.github/RUNNING_A_SERVER.md +++ b/.github/RUNNING_A_SERVER.md @@ -67,7 +67,7 @@ https://github.com/tgstation/tgstation-server ## SQL SETUP -The SQL backend requires a Mariadb server running 10.2 or later. Mysql is not supported but Mariadb is a drop in replacement for mysql. SQL is required for the library, stats tracking, admin notes, and job-only bans, among other features, mostly related to server administration. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql and /SQL/tgstation_schema_prefix.sql depending on if you want table prefixes. More detailed setup instructions are located here: https://wiki.boomerstation.space/Downloading_the_source_code#Setting_up_the_database +The SQL backend requires a Mariadb server running 10.2 or later. Mysql is not supported but Mariadb is a drop in replacement for mysql. SQL is required for the library, stats tracking, admin notes, and job-only bans, among other features, mostly related to server administration. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql and /SQL/tgstation_schema_prefix.sql depending on if you want table prefixes. More detailed setup instructions are located here: https://wiki.white-sands.space/Downloading_the_source_code#Setting_up_the_database If you are hosting a testing server on windows you can use a standalone version of MariaDB pre load with a blank (but initialized) tgdb database. Find them here: https://tgstation13.download/database/ Just unzip and run for a working (but insecure) database server. Includes a zipped copy of the data folder for easy resetting back to square one. @@ -77,7 +77,7 @@ Web delivery of game resources makes it quicker for players to join and reduces 1. Edit compile_options.dm to set the `PRELOAD_RSC` define to `0` 1. Add a url to config/external_rsc_urls pointing to a .zip file containing the .rsc. - * If you keep up to date with Wasp you could reuse Wasp's rsc cdn at https://cdn.boomerstation.space/rsc/tgstation.rsc. Otherwise you can use cdn services like CDN77 or cloudflare (requires adding a page rule to enable caching of the zip), or roll your own cdn using route 53 and vps providers. + * If you keep up to date with White Sands you could reuse White Sands' rsc cdn at https://cdn.white-sands.space/rsc/tgstation.rsc. Otherwise you can use cdn services like CDN77 or cloudflare (requires adding a page rule to enable caching of the zip), or roll your own cdn using route 53 and vps providers. * Regardless even offloading the rsc to a website without a CDN will be a massive improvement over the in game system for transferring files. ## IRC BOT SETUP diff --git a/.github/labeler.yml b/.github/labeler.yml index 35fc0cf16fd..8af4fabfc41 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,6 +1,6 @@ Admin: - 'code/modules/admin/**' - - 'waspstation/code/modules/admin/**' + - 'whitesands/code/modules/admin/**' # Any file within the config subfolder Config: diff --git a/.github/workflows/compile_changelogs.yml b/.github/workflows/compile_changelogs.yml index 8c837f775da..e2887485662 100644 --- a/.github/workflows/compile_changelogs.yml +++ b/.github/workflows/compile_changelogs.yml @@ -45,8 +45,8 @@ jobs: - name: Commit if: steps.value_holder.outputs.CL_ENABLED run: | - git config --local user.email "60119942+WaspStation-Bot@users.noreply.github.com" - git config --local user.name "WaspStation-Bot" + git config --local user.email "60119942+Whitesands-Bot@users.noreply.github.com" + git config --local user.name "Whitesands-Bot" git pull origin master git commit -m "Automatic changelog compile [ci skip]" -a || true - name: "Push" diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index 5524b95139f..1eddbc53519 100644 --- a/.github/workflows/docker_publish.yml +++ b/.github/workflows/docker_publish.yml @@ -15,7 +15,7 @@ jobs: - name: Build and Publish Docker Image to Registry uses: elgohr/Publish-Docker-Github-Action@master with: - name: waspstation/waspstation + name: whitesands13/whitesands username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} dockerfile: Dockerfile diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml index fa3b94677a9..06f66736572 100644 --- a/.github/workflows/generate_documentation.yml +++ b/.github/workflows/generate_documentation.yml @@ -19,7 +19,7 @@ jobs: run: | ~/dmdoc touch dmdoc/.nojekyll - echo waspstation.github.io > dmdoc/CNAME + echo whitesands.github.io > dmdoc/CNAME - name: Deploy uses: JamesIves/github-pages-deploy-action@3.7.1 with: diff --git a/.github/workflows/make_changelogs.yml b/.github/workflows/make_changelogs.yml index a9691487e4d..10bd5ec9d52 100644 --- a/.github/workflows/make_changelogs.yml +++ b/.github/workflows/make_changelogs.yml @@ -26,6 +26,6 @@ jobs: env: #GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} Use this instead if you have unprotected branches GITHUB_TOKEN: ${{ secrets.CHANGELOG_TOKEN }} - GIT_EMAIL: "60119942+WaspStation-Bot@users.noreply.github.com" - GIT_NAME: "WaspStation-Bot" + GIT_EMAIL: "60119942+Whitesands-Bot@users.noreply.github.com" + GIT_NAME: "Whitesands-Bot" run: python tools/changelog/generate_cl.py diff --git a/.github/workflows/update_tgs_dmapi.yml b/.github/workflows/update_tgs_dmapi.yml index beb8e44dfff..e80bff996fb 100644 --- a/.github/workflows/update_tgs_dmapi.yml +++ b/.github/workflows/update_tgs_dmapi.yml @@ -27,8 +27,8 @@ jobs: - name: Commit and Push run: | - git config user.name WaspStation-Bot - git config user.email 60119942+WaspStation-Bot@users.noreply.github.com + git config user.name Whitesands-Bot + git config user.email 60119942+Whitesands-Bot@users.noreply.github.com git add . git commit -m 'Update TGS DMAPI' git push -f -u origin tgs-dmapi-update diff --git a/README.md b/README.md index 180949507b9..423f79db2e1 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# WaspStation 13 Codebase +# White Sands 13 Codebase -![Checks](https://github.com/WaspStation/WaspStation-1.0/workflows/Checks/badge.svg) [![Percentage of issues still open](http://isitmaintained.com/badge/open/waspstation/waspstation-1.0.svg)](https://isitmaintained.com/project/waspstation/waspstation-1.0 "Percentage of issues still open") [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/waspstation/waspstation-1.0.svg)](https://isitmaintained.com/project/waspstation/waspstation-1.0 "Average time to resolve an issue") [![GitHub issues](https://img.shields.io/github/issues/waspstation/waspstation-1.0)](https://github.com/waspstation/waspstation-1.0/issues) ![GitHub top language](https://img.shields.io/github/languages/top/waspstation/waspstation-1.0) +![Checks](https://github.com/Whitesands13/Whitesands/workflows/Checks/badge.svg) [![Percentage of issues still open](http://isitmaintained.com/badge/open/whitesands13/whitesands.svg)](https://isitmaintained.com/project/whitesands13/whitesands "Percentage of issues still open") [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/whitesands13/whitesands.svg)](https://isitmaintained.com/project/whitesands13/whitesands "Average time to resolve an issue") [![GitHub issues](https://img.shields.io/github/issues/whitesands13/whitesands)](https://github.com/Whitesands13/Whitesands/issues) ![GitHub top language](https://img.shields.io/github/languages/top/whitesands13/whitesands) [![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) * **Website:** TBA -* **Code:** +* **Code:** * **Mantis Discord:** * **Boomer Discord:** * **Coderbus Discord:** @@ -57,4 +57,4 @@ See the footer of [code/__DEFINES/tgs.dm](./code/__DEFINES/tgs.dm) and [code/mod All assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated. -All assets located in the `goon` and `waspstation/goon` directory are under a [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0/). Assets created by Goonstation. +All assets located in the `goon` and `whitesands/goon` directory are under a [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0/). Assets created by Goonstation. diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index db8a4872e0a..5a36bfffc12 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -131,7 +131,7 @@ #define NOHUSK 22 // Can't be husked. #define ROBOTIC_LIMBS 23 //limbs start out as robotic; but also use organic icons. If you want to use the default ones, you'll have to use on_species_gain #define NOMOUTH 24 -#define NO_BONES 25 //WaspStation Edit - Breakable Bones +#define NO_BONES 25 //WS Edit - Breakable Bones //organ slots #define ORGAN_SLOT_BRAIN "brain" diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index a9480424187..d984f724372 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -81,12 +81,12 @@ #define ACCESS_PHARMACY 69 ///Nice. #define ACCESS_PSYCHOLOGY 70 -//WaspStation Begin +//WS Begin /// Cloning room and clone pod ejection #define ACCESS_CLONING 68 /// SGR Office #define ACCESS_SOLGOV 90 //Let's give em plenty of room, now -//WaspStation End +//WS End //BEGIN CENTCOM ACCESS diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index d5eea87a9cf..019540eb6c6 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -80,7 +80,7 @@ #define ADMIN_PUNISHMENT_SUPPLYPOD "Supply Pod" #define ADMIN_PUNISHMENT_MAZING "Puzzle" #define ADMIN_PUNISHMENT_IMMERSE "Fully Immerse" -#define ADMIN_PUNISHMENT_NYA "Neko"//WaspStation Edit - Admin Punishment: Cat Tongue +#define ADMIN_PUNISHMENT_NYA "Neko"//WS Edit - Admin Punishment: Cat Tongue #define AHELP_ACTIVE 1 #define AHELP_CLOSED 2 diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 5d5da1dffa1..3e59a4379ec 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -3,12 +3,12 @@ #define COLOR_INPUT_DISABLED "#F0F0F0" #define COLOR_INPUT_ENABLED "#D3B5B5" -//Begin WaspStation +//BeginWS #define COLOR_DARKMODE_DARKBACKGROUND "#383838" #define COLOR_DARKMODE_BACKGROUND "#272727" #define COLOR_DARKMODE_HEADER "#ffffff" #define COLOR_DARKMODE_TEXT "#000000" -//End WaspStation +//EndWS #define COLOR_WHITE "#FFFFFF" #define COLOR_VERY_LIGHT_GRAY "#EEEEEE" diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index f43b0a33a47..edddc1dd92c 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -332,7 +332,7 @@ #define SPEECH_MESSAGE 1 // #define SPEECH_BUBBLE_TYPE 2 #define SPEECH_SPANS 3 - // #define SPEECH_SANITIZE 4 - Wasp edit - lizard tongues don't hiss when speaking Draconic + // #define SPEECH_SANITIZE 4 - WS edit - lizard tongues don't hiss when speaking Draconic #define SPEECH_LANGUAGE 5 /* #define SPEECH_IGNORE_SPAM 6 #define SPEECH_FORCED 7 */ diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 3ae473ea205..d4b1a2f947f 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -186,5 +186,5 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list( /obj/item/tank/internals/plasmaman, /obj/item/toy))) -//Wasp Port - Internals checker +//WS Port - Internals checker #define GET_INTERNAL_SLOTS(C) list(C.head, C.wear_mask) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 4681d529cd7..be79c4f1920 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -72,11 +72,11 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define isvampire(A) (is_species(A,/datum/species/vampire)) #define isdullahan(A) (is_species(A, /datum/species/dullahan)) -//WaspStation Begin - Custom Species +//WS Begin - Custom Species #define issquidperson(A) (is_species(A, /datum/species/squid)) #define isipc(A) (is_species(A, /datum/species/ipc)) #define isspiderperson(A) (is_species(A, /datum/species/spider)) -//WaspStation End +//WS End //more carbon mobs #define ismonkey(A) (istype(A, /mob/living/carbon/monkey)) @@ -143,11 +143,11 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define isclown(A) (istype(A, /mob/living/simple_animal/hostile/retaliate/clown)) -//Waspstation Begin - Custom Simplemobs +//WS Begin - Custom Simplemobs #define isborer(A) (istype(A, /mob/living/simple_animal/borer)) -//Wasp end +//WS end //Misc mobs #define isobserver(A) (istype(A, /mob/dead/observer)) @@ -228,9 +228,9 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list( #define isshuttleturf(T) (length(T.baseturfs) && (/turf/baseturf_skipover/shuttle in T.baseturfs)) -//Wasp Begin +//WS Begin #define isspacepod(A) (istype(A, /obj/spacepod)) -//Wasp End +//WS End #define isbook(O) (is_type_in_typecache(O, GLOB.book_types)) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index f3582277387..efbe64737ca 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -35,7 +35,7 @@ #define DISPOSAL_PIPE_LAYER 2.3 #define GAS_PIPE_HIDDEN_LAYER 2.35 #define WIRE_LAYER 2.4 -//#define WIRE_BRIDGE_LAYER 2.44 // Wasp - Smartwire Revert - I went slightly insane adding all these comments +//#define WIRE_BRIDGE_LAYER 2.44 //WS - Smartwire Revert - I went slightly insane adding all these comments #define WIRE_TERMINAL_LAYER 2.45 #define GAS_SCRUBBER_LAYER 2.46 #define GAS_PIPE_VISIBLE_LAYER 2.47 @@ -68,7 +68,7 @@ #define BELOW_MOB_LAYER 3.7 #define LYING_MOB_LAYER 3.8 -#define SPACEPOD_LAYER 3.9 // Wasp - Spess pods +#define SPACEPOD_LAYER 3.9 //WS - Spess pods //#define MOB_LAYER 4 //For easy recordkeeping; this is a byond define #define ABOVE_MOB_LAYER 4.1 #define WALL_OBJ_LAYER 4.25 diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm index 9369f2b929e..c8e426ff5e5 100644 --- a/code/__DEFINES/logging.dm +++ b/code/__DEFINES/logging.dm @@ -39,17 +39,17 @@ #define LOG_SHUTTLE (1 << 18) #define LOG_ECON (1 << 19) -#define LOG_MSAY (1 << 25) //Wasp Edit -#define LOG_LOOC (1 << 26) //Wasp Edit -#define LOG_SUBTLER (1 << 27) //Wasp Edit +#define LOG_MSAY (1 << 25) //WS Edit +#define LOG_LOOC (1 << 26) //WS Edit +#define LOG_SUBTLER (1 << 27) //WS Edit //Individual logging panel pages #define INDIVIDUAL_ATTACK_LOG (LOG_ATTACK) #define INDIVIDUAL_SAY_LOG (LOG_SAY | LOG_WHISPER | LOG_DSAY) -#define INDIVIDUAL_EMOTE_LOG (LOG_EMOTE | LOG_SUBTLER) //Wasp Edit +#define INDIVIDUAL_EMOTE_LOG (LOG_EMOTE | LOG_SUBTLER) //WS Edit #define INDIVIDUAL_COMMS_LOG (LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS) -#define INDIVIDUAL_OOC_LOG (LOG_OOC | LOG_ADMIN | LOG_MSAY) //Wasp Edit - Mentors -#define INDIVIDUAL_LOOC_LOG (LOG_LOOC | LOG_ADMIN) //Wasp Edit +#define INDIVIDUAL_OOC_LOG (LOG_OOC | LOG_ADMIN | LOG_MSAY) //WS Edit - Mentors +#define INDIVIDUAL_LOOC_LOG (LOG_LOOC | LOG_ADMIN) //WS Edit #define INDIVIDUAL_OWNERSHIP_LOG (LOG_OWNERSHIP) #define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME | LOG_ADMIN_PRIVATE | LOG_ASAY | LOG_MSAY | LOG_MECHA | LOG_VIRUS | LOG_CLONING | LOG_SHUTTLE | LOG_ECON | LOG_LOOC) diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index 5f8d4f8f3fd..a9c714156b2 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -38,7 +38,7 @@ require only minor tweaks. #define ZTRAIT_LAVA_RUINS "Lava Ruins" #define ZTRAIT_ICE_RUINS "Ice Ruins" #define ZTRAIT_ICE_RUINS_UNDERGROUND "Ice Ruins Underground" -#define ZTRAIT_SAND_RUINS "Sand Ruins" //Wasp edit - Whitesands +#define ZTRAIT_SAND_RUINS "Sand Ruins" //WS edit - Whitesands #define ZTRAIT_ISOLATED_RUINS "Isolated Ruins" //Placing ruins on z levels with this trait will use turf reservation instead of usual placement. // boolean - weather types that occur on the level @@ -46,7 +46,7 @@ require only minor tweaks. #define ZTRAIT_SNOWSTORM "Weather_Snowstorm" #define ZTRAIT_ASHSTORM "Weather_Ashstorm" #define ZTRAIT_ACIDRAIN "Weather_Acidrain" -#define ZTRAIT_TEMPERATURE_GRADIENT "Weather_Gradient" //Wasp edit - Whitesands +#define ZTRAIT_TEMPERATURE_GRADIENT "Weather_Gradient" //WS edit - Whitesands // number - bombcap is multiplied by this before being applied to bombs #define ZTRAIT_BOMBCAP_MULTIPLIER "Bombcap Multiplier" diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index f66504b47d9..3599c227b2f 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -26,7 +26,7 @@ #define GLOVES_LAYER 19 #define SHOES_LAYER 18 #define EARS_LAYER 17 -#define SPLINT_LAYER 16 //WaspStation Edit - breakable bones +#define SPLINT_LAYER 16 //WS Edit - breakable bones #define SUIT_LAYER 15 #define GLASSES_LAYER 14 #define BELT_LAYER 13 //Possible make this an overlay of somethign required to wear a belt? diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 55c0385f1fe..9c29f94fb70 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -190,7 +190,7 @@ #define NUTRITION_LEVEL_ALMOST_FULL 535 //Charge levels for Ethereals -// Waspstation Begin -- Ethereal Charge Scaling +//WS Begin -- Ethereal Charge Scaling #define ETHEREAL_CHARGE_SCALING_MULTIPLIER 1 #define ETHEREAL_CHARGE_NONE ( 0 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) #define ETHEREAL_CHARGE_LOWPOWER ( 20 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) @@ -199,7 +199,7 @@ #define ETHEREAL_CHARGE_FULL (100 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) #define ETHEREAL_CHARGE_OVERLOAD (125 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) #define ETHEREAL_CHARGE_DANGEROUS (150 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) -// Waspstation End +//WS End //Slime evolution threshold. Controls how fast slimes can split/grow #define SLIME_EVOLUTION_THRESHOLD 10 @@ -308,7 +308,7 @@ #define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you #define HUNGER_FACTOR 0.1 //factor at which mob nutrition decreases -#define ETHEREAL_CHARGE_FACTOR (0.05 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) //factor at which ethereal's charge decreases // Waspstation Edit -- Ethereal Charge Scaling +#define ETHEREAL_CHARGE_FACTOR (0.05 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) //factor at which ethereal's charge decreases //WS Edit -- Ethereal Charge Scaling #define REAGENTS_METABOLISM 0.4 //How many units of reagent are consumed per tick, by default. #define REAGENTS_EFFECT_MULTIPLIER (REAGENTS_METABOLISM / 0.4) // By defining the effect multiplier this way, it'll exactly adjust all effects according to how they originally were with the 0.4 metabolism diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm index c3574e9a8ec..46e628847b3 100644 --- a/code/__DEFINES/obj_flags.dm +++ b/code/__DEFINES/obj_flags.dm @@ -38,7 +38,7 @@ #define LAVAPROTECT (1<<0) #define STOPSPRESSUREDAMAGE (1<<1) //SUIT and HEAD items which stop pressure damage. To stop you taking all pressure damage you must have both a suit and head item with this flag. #define BLOCK_GAS_SMOKE_EFFECT (1<<2) // blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! -#define ALLOWINTERNALS (1<<3) // mask allows internals // Wasp Port - Changed Maskinternals to allowinternals +#define ALLOWINTERNALS (1<<3) // mask allows internals //WS Port - Changed Maskinternals to allowinternals #define NOSLIP (1<<4) //prevents from slipping on wet floors, in space etc #define NOSLIP_ICE (1<<5) //prevents from slipping on frozen floors #define THICKMATERIAL (1<<6) //prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. diff --git a/code/__DEFINES/power.dm b/code/__DEFINES/power.dm index 4a7f640c640..d0111862957 100644 --- a/code/__DEFINES/power.dm +++ b/code/__DEFINES/power.dm @@ -1,4 +1,4 @@ -/* Wasp - Smartwire Revertie Boys +/*WS - Smartwire Revertie Boys #define CABLE_LAYER_1 1 #define CABLE_LAYER_2 2 #define CABLE_LAYER_3 4 diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 76da9318ef2..58f0293df9b 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -38,10 +38,10 @@ #define CHAT_GHOSTRADIO (1<<9) #define CHAT_BANKCARD (1<<10) #define CHAT_GHOSTLAWS (1<<11) -#define CHAT_LOOC (1<<12) //Wasp Edit +#define CHAT_LOOC (1<<12) //WS Edit #define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_BANKCARD|CHAT_GHOSTLAWS|CHAT_LOOC) -//Wasp Edit +//WS Edit #define PARALLAX_INSANE -1 //for show offs #define PARALLAX_HIGH 0 //default. diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm index cf1f0ac989f..a658bb5af41 100644 --- a/code/__DEFINES/radio.dm +++ b/code/__DEFINES/radio.dm @@ -46,13 +46,13 @@ #define RADIO_KEY_CENTCOM "y" #define RADIO_TOKEN_CENTCOM ":y" -//Wasp Begin - SGR, Overmaps +//WS Begin - SGR, Overmaps #define RADIO_CHANNEL_SOLGOV "SolGov" #define RADIO_KEY_SOLGOV "z" #define RADIO_TOKEN_SOLGOV ":z" #define RADIO_CHANNEL_WIDEBAND "Wideband" -//Wasp End +//WS End #define RADIO_CHANNEL_CTF_RED "Red Team" #define RADIO_CHANNEL_CTF_BLUE "Blue Team" @@ -65,7 +65,7 @@ #define FREQ_CTF_RED 1215 // CTF red team comms frequency, red #define FREQ_CTF_BLUE 1217 // CTF blue team comms frequency, blue #define FREQ_CENTCOM 1337 // CentCom comms frequency, gray -#define FREQ_SOLGOV 1345 // SolGov comms frequency, dark blue WASP ADDITION +#define FREQ_SOLGOV 1345 // SolGov comms frequency, dark blue WS ADDITION #define FREQ_SUPPLY 1347 // Supply comms frequency, light brown #define FREQ_SERVICE 1349 // Service comms frequency, green #define FREQ_SCIENCE 1351 // Science comms frequency, plum @@ -96,7 +96,7 @@ #define MAX_FREQ 1489 // ------------------------------------------------------ -#define FREQ_WIDEBAND 1501 // Subspace/shuttle comms frequency, dark blue WASP ADDITION +#define FREQ_WIDEBAND 1501 // Subspace/shuttle comms frequency, dark blue WS ADDITION #define MAX_FREE_FREQ 1599 // ------------------------------------------------- diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index e8d8ae1c0c2..1071789d7ea 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -41,7 +41,7 @@ #define ROLE_SYNDICATE_CYBERSUN "Cybersun Space Syndicate" //Ghost role syndi from Forgottenship ruin #define ROLE_SYNDICATE_CYBERSUN_CAPTAIN "Cybersun Space Syndicate Captain" //Forgottenship captain syndie -#define ROLE_BORER "borer" //Wasp Edit - Boreres +#define ROLE_BORER "borer" //WS Edit - Boreres //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR. //The gamemode specific ones are just so the gamemodes can query whether a player is old enough @@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(special_roles, list( ROLE_SENTIENCE, ROLE_FAMILIES = /datum/game_mode/gang, ROLE_BORER -)) //Wasp Edit - Borers +)) //WS Edit - Borers //Job defines for what happens when you fail to qualify for any job during job selection #define BEOVERFLOW 1 diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index d29cd41584f..1f2eec8f856 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -45,11 +45,11 @@ #define MODE_KEY_CHANGELING "g" #define MODE_TOKEN_CHANGELING ":g" -//Wasp begin - Borers +//WS begin - Borers #define MODE_BORER "borer" #define MODE_KEY_BORER "j" #define MODE_TOKEN_BORER ":j" -//Wasp end +//WS end #define MODE_VOCALCORDS "cords" #define MODE_KEY_VOCALCORDS "x" @@ -69,9 +69,9 @@ #define SPAN_CLOWN "clown" #define SPAN_SINGING "singing" -//WaspStation Spans - Begin +//WS Spans - Begin #define SPAN_SGA "sga" -//WaspStation Spans - End +//WS Spans - End //bitflag #defines for return value of the radio() proc. #define ITALICS (1<<0) diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 5cebc75359a..2e60988cbba 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -3,7 +3,7 @@ #define CHANNEL_ADMIN 1023 #define CHANNEL_VOX 1022 #define CHANNEL_JUKEBOX 1021 -#define CHANNEL_JUKEBOX_START 1016 //The gap between this and CHANNEL_JUKEBOX determines the amount of free jukebox channels. This currently allows 6 jukebox channels to exist. Wasp Edit Cit #7367 +#define CHANNEL_JUKEBOX_START 1016 //The gap between this and CHANNEL_JUKEBOX determines the amount of free jukebox channels. This currently allows 6 jukebox channels to exist. WS Edit Cit #7367 #define CHANNEL_JUSTICAR_ARK 1015 #define CHANNEL_HEARTBEAT 1014 //sound channel for heartbeats #define CHANNEL_AMBIENCE 1013 diff --git a/code/__DEFINES/wasp_after_defines/icon_smoothing.dm b/code/__DEFINES/whitesands_after_defines/icon_smoothing.dm similarity index 100% rename from code/__DEFINES/wasp_after_defines/icon_smoothing.dm rename to code/__DEFINES/whitesands_after_defines/icon_smoothing.dm diff --git a/code/__DEFINES/~wasp_defines/_defines.dm b/code/__DEFINES/~whitesands_defines/_defines.dm similarity index 87% rename from code/__DEFINES/~wasp_defines/_defines.dm rename to code/__DEFINES/~whitesands_defines/_defines.dm index ceb4dd21b6b..97d6f1b4f60 100644 --- a/code/__DEFINES/~wasp_defines/_defines.dm +++ b/code/__DEFINES/~whitesands_defines/_defines.dm @@ -1,4 +1,4 @@ -//Ghosts WASPSTATION EDIT - SPAWNERS MENU +//Ghosts WS EDIT - SPAWNERS MENU #define ui_ghost_jumptomob "SOUTH:6,CENTER-3:24" #define ui_ghost_orbit "SOUTH:6,CENTER-2:24" #define ui_ghost_reenter_corpse "SOUTH:6,CENTER-1:24" diff --git a/code/__DEFINES/~wasp_defines/atmospherics.dm b/code/__DEFINES/~whitesands_defines/atmospherics.dm similarity index 100% rename from code/__DEFINES/~wasp_defines/atmospherics.dm rename to code/__DEFINES/~whitesands_defines/atmospherics.dm diff --git a/code/__DEFINES/~wasp_defines/bone_flags.dm b/code/__DEFINES/~whitesands_defines/bone_flags.dm similarity index 100% rename from code/__DEFINES/~wasp_defines/bone_flags.dm rename to code/__DEFINES/~whitesands_defines/bone_flags.dm diff --git a/code/__DEFINES/~wasp_defines/jobs.dm b/code/__DEFINES/~whitesands_defines/jobs.dm similarity index 100% rename from code/__DEFINES/~wasp_defines/jobs.dm rename to code/__DEFINES/~whitesands_defines/jobs.dm diff --git a/code/__DEFINES/~wasp_defines/machines.dm b/code/__DEFINES/~whitesands_defines/machines.dm similarity index 100% rename from code/__DEFINES/~wasp_defines/machines.dm rename to code/__DEFINES/~whitesands_defines/machines.dm diff --git a/code/__DEFINES/~wasp_defines/maths.dm b/code/__DEFINES/~whitesands_defines/maths.dm similarity index 100% rename from code/__DEFINES/~wasp_defines/maths.dm rename to code/__DEFINES/~whitesands_defines/maths.dm diff --git a/code/__DEFINES/~wasp_defines/metacoin.dm b/code/__DEFINES/~whitesands_defines/metacoin.dm similarity index 100% rename from code/__DEFINES/~wasp_defines/metacoin.dm rename to code/__DEFINES/~whitesands_defines/metacoin.dm diff --git a/code/__DEFINES/~wasp_defines/movespeed_modification.dm b/code/__DEFINES/~whitesands_defines/movespeed_modification.dm similarity index 62% rename from code/__DEFINES/~wasp_defines/movespeed_modification.dm rename to code/__DEFINES/~whitesands_defines/movespeed_modification.dm index 1fb34a55997..c180a7299ec 100644 --- a/code/__DEFINES/~wasp_defines/movespeed_modification.dm +++ b/code/__DEFINES/~whitesands_defines/movespeed_modification.dm @@ -1 +1 @@ -#define MOVESPEED_ID_LIVING_BROKEN_BONES "LIVING_BROKEN_BONES" //Waspstation Edit - Breakable Bones +#define MOVESPEED_ID_LIVING_BROKEN_BONES "LIVING_BROKEN_BONES" //WS Edit - Breakable Bones diff --git a/code/__DEFINES/~wasp_defines/obj_flags.dm b/code/__DEFINES/~whitesands_defines/obj_flags.dm similarity index 100% rename from code/__DEFINES/~wasp_defines/obj_flags.dm rename to code/__DEFINES/~whitesands_defines/obj_flags.dm diff --git a/code/__DEFINES/~wasp_defines/overmap.dm b/code/__DEFINES/~whitesands_defines/overmap.dm similarity index 100% rename from code/__DEFINES/~wasp_defines/overmap.dm rename to code/__DEFINES/~whitesands_defines/overmap.dm diff --git a/code/__DEFINES/~wasp_defines/shuttles.dm b/code/__DEFINES/~whitesands_defines/shuttles.dm similarity index 100% rename from code/__DEFINES/~wasp_defines/shuttles.dm rename to code/__DEFINES/~whitesands_defines/shuttles.dm diff --git a/code/__DEFINES/~wasp_defines/spacepods.dm b/code/__DEFINES/~whitesands_defines/spacepods.dm similarity index 100% rename from code/__DEFINES/~wasp_defines/spacepods.dm rename to code/__DEFINES/~whitesands_defines/spacepods.dm diff --git a/code/__DEFINES/~wasp_defines/status_effects.dm b/code/__DEFINES/~whitesands_defines/status_effects.dm similarity index 100% rename from code/__DEFINES/~wasp_defines/status_effects.dm rename to code/__DEFINES/~whitesands_defines/status_effects.dm diff --git a/code/__DEFINES/~wasp_defines/traits.dm b/code/__DEFINES/~whitesands_defines/traits.dm similarity index 100% rename from code/__DEFINES/~wasp_defines/traits.dm rename to code/__DEFINES/~whitesands_defines/traits.dm diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 6c383048c83..4f642c5304e 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -126,11 +126,11 @@ if (CONFIG_GET(flag/log_ooc)) WRITE_LOG(GLOB.world_game_log, "OOC: [text]") -//Begin Wasp Edit +//BeginWS Edit /proc/log_looc(text) if (CONFIG_GET(flag/log_ooc)) WRITE_LOG(GLOB.world_game_log, "LOOC: [text]") -//End Wasp Edit +//EndWS Edit /proc/log_whisper(text) if (CONFIG_GET(flag/log_whisper)) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index e7039c7fb0e..524625bd819 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -525,13 +525,13 @@ if((character.mind.assigned_role == "Cyborg") || (character.mind.assigned_role == character.mind.special_role)) return - //Wasp begin - Alternate job titles + //WS begin - Alternate job titles var/displayed_rank = rank if(character.client && character.client.prefs && character.client.prefs.alt_titles_preferences[rank]) displayed_rank = character.client.prefs.alt_titles_preferences[rank] var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems) announcer.announce("ARRIVAL", character.real_name, displayed_rank, list()) //make the list empty to make it announce it in common - //Wasp end + //WS end /proc/lavaland_equipment_pressure_check(turf/T) . = FALSE diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index b2ab61f8184..1aed740e197 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -34,7 +34,7 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, GLOB.moth_markings_list) - //WaspStation Begin + //WS Begin init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_fluff, GLOB.moth_fluff_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/squid_face, GLOB.squid_face_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_screens, GLOB.ipc_screens_list) @@ -44,7 +44,7 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/spider_legs, GLOB.spider_legs_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/spider_spinneret, GLOB.spider_spinneret_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/spider_mandibles, GLOB.spider_mandibles_list) - //WaspStation End + //WS End //Species for(var/spath in subtypesof(/datum/species)) diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index 5d1581c90b2..25afa0f6a96 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -1,4 +1,4 @@ -/proc/priority_announce(text, title = "", sound = 'sound/ai/attention.ogg', type, sender_override, auth_id) // Waspstation Edit - Make cap's announcement use logged-in name +/proc/priority_announce(text, title = "", sound = 'sound/ai/attention.ogg', type, sender_override, auth_id) //WS Edit - Make cap's announcement use logged-in name if(!text) return @@ -28,8 +28,8 @@ announcement += "
[html_encode(text)]
" announcement += "
" - if(auth_id) // Waspstation Edit - Make cap's announcement use logged-in name - announcement += "-[auth_id]
" // Waspstation Edit - Make cap's announcement use logged-in name + if(auth_id) //WS Edit - Make cap's announcement use logged-in name + announcement += "-[auth_id]
" //WS Edit - Make cap's announcement use logged-in name var/s = sound(sound) for(var/mob/M in GLOB.player_list) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index d19a42eea34..3caf79a9ac8 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -309,14 +309,14 @@ //Medals parts += medal_report() - //Wasp Begin + //WS Begin CHECK_TICK //Mouse parts += mouse_report() CHECK_TICK - //Wasp End + //WS End //Station Goals parts += goal_report() @@ -478,7 +478,7 @@ parts += com return "
[parts.Join("
")]
" return "" -//Wasp Begin +//WS Begin /datum/controller/subsystem/ticker/proc/mouse_report() if(GLOB.mouse_food_eaten) var/list/parts = list() @@ -488,7 +488,7 @@ parts += "Trash Eaten: [GLOB.mouse_food_eaten]" return "
[parts.Join("
")]
" return "" -//Wasp End +//WS End /datum/controller/subsystem/ticker/proc/antag_report() var/list/result = list() var/list/all_teams = list() diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 979ae91f0f2..6ee5e2f16d1 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -67,7 +67,7 @@ /proc/adminscrub(t,limit=MAX_MESSAGE_LEN) return copytext((html_encode(strip_html_simple(t))),1,limit) -//Begin Waspstation edit - Chat markup +//BeginWS edit - Chat markup //Credit to Aurorastation for the regex and idea for the proc //Should be in the form of "tag to be replaced" = list("replacement for beginning", "replacement for end") GLOBAL_LIST_INIT(markup_tags, list("/" = list("", ""), @@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(markup_regex, list("/" = new /regex("((\\W|^)_)(\[^_\]*)(_(\\W message = markup.Replace_char(message, "$2[GLOB.markup_tags[tag][1]]$3[GLOB.markup_tags[tag][2]]$5") return message -//End Waspstation edit - Chat markup +//EndWS edit - Chat markup //Returns null if there is any bad text in the string /proc/reject_bad_text(text, max_length = 512, ascii_only = TRUE) diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm index 730604aff80..3d7d73200bd 100644 --- a/code/_globalvars/configuration.dm +++ b/code/_globalvars/configuration.dm @@ -9,7 +9,7 @@ GLOBAL_VAR_INIT(changelog_hash, "") GLOBAL_VAR_INIT(hub_visibility, FALSE) GLOBAL_VAR_INIT(ooc_allowed, TRUE) // used with admin verbs to disable ooc - not a config option apparently -GLOBAL_VAR_INIT(looc_allowed, TRUE) // Wasp Edit +GLOBAL_VAR_INIT(looc_allowed, TRUE) //WS Edit GLOBAL_VAR_INIT(dooc_allowed, TRUE) GLOBAL_VAR_INIT(enter_allowed, TRUE) GLOBAL_VAR_INIT(shuttle_frozen, FALSE) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index de7d912da8e..4879efa5e93 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -101,7 +101,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items ) = 1, list(//construction and crafting - /obj/item/stack/cable_coil/random = 1, //Random from Wasp Smartwire Revert + /obj/item/stack/cable_coil/random = 1, //Random from WS Smartwire Revert /obj/item/stock_parts/cell = 1, /obj/item/stack/rods/twentyfive = 1, /obj/item/stack/sheet/metal/twenty = 1, @@ -167,7 +167,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/grenade/iedcasing/spawned = 1, /obj/item/melee/baton/cattleprod = 1, /obj/item/throwing_star = 1, - /obj/item/gun/ballistic/derringer = 1, //Waspstation - Derringer + /obj/item/gun/ballistic/derringer = 1, //WS - Derringer ) = 8, list(//equipment @@ -250,7 +250,7 @@ GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items /obj/item/clothing/shoes/jackboots/fast = 1, /obj/item/clothing/suit/armor/reactive/table = 1, /obj/item/storage/box/donkpockets/donkpocketgondola = 1, - /obj/item/melee/greykingsword = 1 //Waspstation - Meth Sword + /obj/item/melee/greykingsword = 1 //WS - Meth Sword )) //Maintenance loot spawner pools diff --git a/code/_globalvars/lists/poll_ignore.dm b/code/_globalvars/lists/poll_ignore.dm index 97d4c9c0493..674b15ceae2 100644 --- a/code/_globalvars/lists/poll_ignore.dm +++ b/code/_globalvars/lists/poll_ignore.dm @@ -15,7 +15,7 @@ #define POLL_IGNORE_SWARMER "swarmer" #define POLL_IGNORE_DRONE "drone" #define POLL_IGNORE_FUGITIVE "fugitive" -#define POLL_IGNORE_DEFECTIVECLONE "defective_clone" //WaspStation Edit - Cloning +#define POLL_IGNORE_DEFECTIVECLONE "defective_clone" //WS Edit - Cloning #define POLL_IGNORE_PYROSLIME "slime" #define POLL_IGNORE_SHADE "shade" #define POLL_IGNORE_IMAGINARYFRIEND "imaginary_friend" @@ -40,7 +40,7 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list( POLL_IGNORE_SWARMER = "Swarmer shells", POLL_IGNORE_DRONE = "Drone shells", POLL_IGNORE_FUGITIVE = "Fugitive Hunter", - POLL_IGNORE_DEFECTIVECLONE = "Defective clone", //WaspStation Edit - Cloning + POLL_IGNORE_DEFECTIVECLONE = "Defective clone", //WS Edit - Cloning POLL_IGNORE_PYROSLIME = "Slime", POLL_IGNORE_SHADE = "Shade", POLL_IGNORE_IMAGINARYFRIEND = "Imaginary Friend", diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index 6682174a844..5bc71798b7a 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -143,8 +143,8 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_GRABWEAKNESS" = TRAIT_GRABWEAKNESS, "TRAIT_SNOB" = TRAIT_SNOB, "TRAIT_BALD" = TRAIT_BALD, - "TRAIT_NOBREAK" = TRAIT_NOBREAK, // Wasp edit - Whitesands - "TRAIT_ALLBREAK" = TRAIT_ALLBREAK // Wasp edit - Whitesands + "TRAIT_NOBREAK" = TRAIT_NOBREAK, //WS edit - Whitesands + "TRAIT_ALLBREAK" = TRAIT_ALLBREAK //WS edit - Whitesands ), /obj/item/bodypart = list( "TRAIT_PARALYSIS" = TRAIT_PARALYSIS diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm index 2912bc5c453..75cf8e2f8b7 100644 --- a/code/_onclick/drag_drop.dm +++ b/code/_onclick/drag_drop.dm @@ -89,7 +89,7 @@ /obj/screen/click_catcher/IsAutoclickable() . = 1 -//Wasp Begin - Please fucking work for spacepod code +//WS Begin - Please fucking work for spacepod code /client/MouseMove(object,location,control,params) mouseParams = params mouseLocation = location @@ -101,7 +101,7 @@ ..() /datum/proc/onMouseMove(object, location, control, params) return -//Wasp End +//WS End /client/MouseDrag(src_object,atom/over_object,src_location,over_location,src_control,over_control,params) var/list/L = params2list(params) diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 689f3cdfad8..8350b4f2614 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -161,12 +161,12 @@ #define ui_pai_take_picture "SOUTH:6,WEST+12" #define ui_pai_view_images "SOUTH:6,WEST+13" -/* Ghosts - REPLACED BY WASPSTATION _defines.dm +/* Ghosts - REPLACED BY WS _defines.dm #define ui_ghost_jumptomob "SOUTH:6,CENTER-2:24" #define ui_ghost_orbit "SOUTH:6,CENTER-1:24" #define ui_ghost_reenter_corpse "SOUTH:6,CENTER:24" #define ui_ghost_teleport "SOUTH:6,CENTER+1:24" #define ui_ghost_pai "SOUTH: 6, CENTER+2:24" -End Waspstation*/ +EndWS*/ #define ui_wanted_lvl "NORTH,11" diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 833aa694bdd..ce94ddee123 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -59,9 +59,9 @@ GLOBAL_LIST_INIT(available_ui_styles, list( var/obj/screen/healthdoll var/obj/screen/internals var/obj/screen/wanted/wanted_lvl - /* Wasp begin + /*WS begin var/obj/screen/spacesuit - Wasp End - Fuckin' spacesuits. */ + WS End - Fuckin' spacesuits. */ // subtypes can override this to force a specific UI style var/ui_style diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 03a231846e1..fff64dfbe0b 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -300,7 +300,7 @@ icon_state = "internal0" else if(!C.getorganslot(ORGAN_SLOT_BREATHING_TUBE)) - //Wasp Port Begin - Citadel Internals + //WS Port Begin - Citadel Internals var/obj/item/clothing/check var/internals = FALSE @@ -315,7 +315,7 @@ if(!internals) to_chat(C, "You are not wearing an internals mask!") return - //Wasp Port End - Citadel Internals + //WS Port End - Citadel Internals var/obj/item/I = C.is_holding_item_of_type(/obj/item/tank) if(I) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index fe11eddf883..17f7467cd51 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -128,7 +128,7 @@ take_damage(I.force, I.damtype, "melee", 1) /mob/living/attacked_by(obj/item/I, mob/living/user) - var/armor_value = run_armor_check(armour_penetration = I.armour_penetration) // Wasp Edit - Simplemobs can have armor + var/armor_value = run_armor_check(armour_penetration = I.armour_penetration) //WS Edit - Simplemobs can have armor send_item_attack_message(I, user) if(I.force) apply_damage(I.force, I.damtype, break_modifier = I.force, blocked = armor_value) //Bone break modifier = item force diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index cbc88ddcbdf..22c19f7cf62 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -159,7 +159,7 @@ var/key_mode var/value_mode var/splitter = " " - var/lowercase = TRUE //Wasp - Random Engine Framework + var/lowercase = TRUE //WS - Random Engine Framework /datum/config_entry/keyed_list/New() . = ..() diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 74182ddb7ff..ce61a95396b 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -206,7 +206,7 @@ /datum/config_entry/flag/emojis -/datum/config_entry/flag/chat_markup // Waspstation edit - Chat markup +/datum/config_entry/flag/chat_markup //WS edit - Chat markup /datum/config_entry/keyed_list/multiplicative_movespeed key_mode = KEY_MODE_TYPE diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index d324e34bb0f..d408a024984 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -116,7 +116,7 @@ integer = FALSE min_val = 0 -//Waspstation Begin - Autotranfer vote +//WS Begin - Autotranfer vote /datum/config_entry/number/vote_autotransfer_initial //length of time before the first autotransfer vote is called (deciseconds, default 2 hours) config_entry_value = 72000 @@ -128,7 +128,7 @@ integer = FALSE min_val = 0 -//Waspstation End +//WS End /datum/config_entry/flag/default_no_vote // vote does not default to nochange/norestart @@ -241,7 +241,7 @@ config_entry_value = "https://wiki.white-sands.space/Rules" /datum/config_entry/string/githuburl - config_entry_value = "https://github.com/WaspStation/WaspStation-1.0" + config_entry_value = "https://github.com/Whitesands13/Whitesands" /datum/config_entry/string/discordurl config_entry_value = "https://discord.gg/BUM8uRc" @@ -526,9 +526,9 @@ /datum/config_entry/flag/auto_profile -//Begin Wasp Edit +//BeginWS Edit /datum/config_entry/flag/minimaps_enabled config_entry_value = TRUE -//End Wasp Edit +//EndWS Edit /datum/config_entry/string/centcom_source_whitelist diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 87140333038..91e359a8306 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -372,7 +372,7 @@ SUBSYSTEM_DEF(air) CHECK_TICK /datum/controller/subsystem/air/proc/setup_template_machinery(list/atmos_machines) - if(!initialized) //Wasp - Random Engine Framework + if(!initialized) //WS - Random Engine Framework return for(var/A in atmos_machines) diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index f3eca06a25d..750a23b29e7 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -148,8 +148,8 @@ SUBSYSTEM_DEF(blackbox) record_feedback("tally", "radio_usage", 1, "supply") if(FREQ_CENTCOM) record_feedback("tally", "radio_usage", 1, "centcom") - if(FREQ_SOLGOV) // Wasp Edit - SolGov Rep - record_feedback("tally", "radio_usage", 1, "solgov") // Wasp Edit - SolGov Rep + if(FREQ_SOLGOV) //WS Edit - SolGov Rep + record_feedback("tally", "radio_usage", 1, "solgov") //WS Edit - SolGov Rep if(FREQ_AI_PRIVATE) record_feedback("tally", "radio_usage", 1, "ai private") if(FREQ_CTF_RED) diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index ba8754c92f6..6bf5c54e204 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -16,14 +16,14 @@ SUBSYSTEM_DEF(communications) else . = TRUE -/datum/controller/subsystem/communications/proc/make_announcement(mob/living/user, is_silicon, input, auth_id) // Waspstation Edit - Make cap's announcement use logged-in name +/datum/controller/subsystem/communications/proc/make_announcement(mob/living/user, is_silicon, input, auth_id) //WS Edit - Make cap's announcement use logged-in name if(!can_announce(user, is_silicon)) return FALSE if(is_silicon) minor_announce(html_decode(input),"[user.name] Announces:") silicon_message_cooldown = world.time + COMMUNICATION_COOLDOWN_AI else - priority_announce(html_decode(user.treat_message(input)), null, 'sound/misc/announce.ogg', "Captain", null, auth_id) //WaspStation Edit - Name on announcements & Make cap's announcement use logged-in name + priority_announce(html_decode(user.treat_message(input)), null, 'sound/misc/announce.ogg', "Captain", null, auth_id) //WS Edit - Name on announcements & Make cap's announcement use logged-in name nonsilicon_message_cooldown = world.time + COMMUNICATION_COOLDOWN user.log_talk(input, LOG_SAY, tag="priority announcement") message_admins("[ADMIN_LOOKUPFLW(user)] has made a priority announcement.") diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index cc73a255b3f..b2fa6137646 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -444,11 +444,11 @@ SUBSYSTEM_DEF(job) if(living_mob.mind) living_mob.mind.assigned_role = rank - //Wasp begin - Alt job titles + //WS begin - Alt job titles var/display_rank = rank if(M.client && M.client.prefs && M.client.prefs.alt_titles_preferences[rank]) display_rank = M.client.prefs.alt_titles_preferences[rank] - //Wasp end + //WS end to_chat(M, "You are the [display_rank].") if(job) @@ -475,12 +475,12 @@ SUBSYSTEM_DEF(job) if(CONFIG_GET(number/minimal_access_threshold)) to_chat(M, "As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.") - //WaspStation Begin - Wikilinks and Special notice + //WS Begin - Wikilinks and Special notice if(job.special_notice) to_chat(M, "[job.special_notice]") if(job.wiki_page) to_chat(M, "Wiki Page") - //WaspStation End + //WS End var/related_policy = get_policy(rank) if(related_policy) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 13a1b3cab74..48f51200d11 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -131,7 +131,7 @@ SUBSYSTEM_DEF(mapping) var/list/space_ruins = levels_by_trait(ZTRAIT_SPACE_RUINS) if (space_ruins.len) seedRuins(space_ruins, CONFIG_GET(number/space_budget), list(/area/space), space_ruins_templates) - SSmapping.seedStation() //Wasp - Random Engine Framework + SSmapping.seedStation() //WS - Random Engine Framework loading_ruins = FALSE #endif // Add the transit level @@ -411,7 +411,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) return if(SSvote.mode) //Theres already a vote running, default to rotation. maprotate() - SSvote.initiate_vote("map", "automatic map rotation", TRUE) // WaspStation Edit - Ghost Voting Rework + SSvote.initiate_vote("map", "automatic map rotation", TRUE) //WS Edit - Ghost Voting Rework /datum/controller/subsystem/mapping/proc/changemap(var/datum/map_config/VM) if(!VM.MakeNextMap()) @@ -466,7 +466,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) ice_ruins_templates[R.name] = R else if(istype(R, /datum/map_template/ruin/space)) space_ruins_templates[R.name] = R - else if(istype(R, /datum/map_template/ruin/station)) //Wasp - Random Engine Framework + else if(istype(R, /datum/map_template/ruin/station)) //WS - Random Engine Framework station_room_templates[R.name] = R /datum/controller/subsystem/mapping/proc/preloadShuttleTemplates() @@ -628,7 +628,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) initialize_reserved_level(isolated_ruins_z.z_value) return isolated_ruins_z.z_value - // Station Ruins - Wasp Port + // Station Ruins - WS Port /datum/controller/subsystem/mapping var/list/station_room_templates = list() diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index fd95fc178e7..09ddc1fd186 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -1,7 +1,7 @@ #define FILE_ANTAG_REP "data/AntagReputation.json" #define FILE_RECENT_MAPS "data/RecentMaps.json" -#define KEEP_ROUNDS_MAP 1 // Wasp Edit - Low pop means fewer map candidates +#define KEEP_ROUNDS_MAP 1 //WS Edit - Low pop means fewer map candidates SUBSYSTEM_DEF(persistence) name = "Persistence" diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index cee20f51f99..51829ffd7fb 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -175,7 +175,7 @@ SUBSYSTEM_DEF(shuttle) /// Returns TRUE if we can. Otherwise, returns a string detailing the problem. /datum/controller/subsystem/shuttle/proc/canEvac(mob/user) var/srd = CONFIG_GET(number/shuttle_refuel_delay) - if(world.time - SSticker.round_start_time < srd && user != null) //WaspStation Edit - Autotransfer + if(world.time - SSticker.round_start_time < srd && user != null) //WS Edit - Autotransfer return "The emergency shuttle is refueling. Please wait [DisplayTimeText(srd - (world.time - SSticker.round_start_time))] before attempting to call." switch(emergency.mode) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c7e4e961240..24c11771c93 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -36,7 +36,7 @@ SUBSYSTEM_DEF(ticker) var/selected_tip // What will be the tip of the day? var/timeLeft //pregame timer - //var/start_at Wasp Edit - Countdown after init + //var/start_at WS Edit - Countdown after init var/gametime_offset = 432000 //Deciseconds to add to world.time for station time. var/station_time_rate_multiplier = 12 //factor of station time progressal vs real time. @@ -142,7 +142,7 @@ SUBSYSTEM_DEF(ticker) GLOB.syndicate_code_response_regex = codeword_match - //start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) Wasp Edit - Countdown at init + //start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) WS Edit - Countdown at init if(CONFIG_GET(flag/randomize_shift_time)) gametime_offset = rand(0, 23) HOURS else if(CONFIG_GET(flag/shift_time_realtime)) @@ -160,8 +160,8 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/fire() switch(current_state) if(GAME_STATE_STARTUP) - /*if(Master.initializations_finished_with_no_players_logged_in) Wasp Edit - Countdown after init - timeLeft = (CONFIG_GET(number/lobby_countdown) * 10) Wasp Edit - Countdown after init */ + /*if(Master.initializations_finished_with_no_players_logged_in) WS Edit - Countdown after init + timeLeft = (CONFIG_GET(number/lobby_countdown) * 10) WS Edit - Countdown after init */ for(var/client/C in GLOB.clients) window_flash(C, ignorepref = TRUE) //let them know lobby has opened up. to_chat(world, "Welcome to [station_name()]!") @@ -174,7 +174,7 @@ SUBSYSTEM_DEF(ticker) if(GAME_STATE_PREGAME) //lobby stats for statpanels if(isnull(timeLeft)) - timeLeft = (CONFIG_GET(number/lobby_countdown) * 10) // Wasp Edit - Countdown after init + timeLeft = (CONFIG_GET(number/lobby_countdown) * 10) //WS Edit - Countdown after init totalPlayers = LAZYLEN(GLOB.new_player_list) totalPlayersReady = 0 for(var/i in GLOB.new_player_list) @@ -204,7 +204,7 @@ SUBSYSTEM_DEF(ticker) if(!setup()) //setup failed current_state = GAME_STATE_STARTUP - timeLeft = (CONFIG_GET(number/lobby_countdown)) * 10 // Wasp Edit - Countdown after init + timeLeft = (CONFIG_GET(number/lobby_countdown)) * 10 //WS Edit - Countdown after init timeLeft = null Master.SetRunLevel(RUNLEVEL_LOBBY) @@ -576,14 +576,14 @@ SUBSYSTEM_DEF(ticker) send2otherserver(news_source, news_message,"News_Report") /datum/controller/subsystem/ticker/proc/GetTimeLeft() - /*if(isnull(SSticker.timeLeft)) Wasp Edit - Countdown after init - return max(0, start_at - world.time)*/ //Wasp Edit - Countdown after init + /*if(isnull(SSticker.timeLeft)) WS Edit - Countdown after init + return max(0, start_at - world.time)*/ //WS Edit - Countdown after init return timeLeft /datum/controller/subsystem/ticker/proc/SetTimeLeft(newtime) - /*if(newtime >= 0 && isnull(timeLeft)) //remember, negative means delayed Wasp Edit Begin - Countdown after init + /*if(newtime >= 0 && isnull(timeLeft)) //remember, negative means delayed WS Edit Begin - Countdown after init start_at = world.time + newtime - else Wasp Edit - Countdown after init Wasp Edit End*/ + else WS Edit - Countdown after init WS Edit End*/ timeLeft = newtime //Everyone who wanted to be an observer gets made one now diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 86940ead1bb..73fa96b374d 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -81,9 +81,9 @@ SUBSYSTEM_DEF(traumas) "conspiracies" = typecacheof(list(/obj/item/clothing/under/rank/command/captain, /obj/item/clothing/under/rank/security/head_of_security, /obj/item/clothing/under/rank/engineering/chief_engineer, /obj/item/clothing/under/rank/medical/chief_medical_officer, /obj/item/clothing/under/rank/command/head_of_personnel, /obj/item/clothing/under/rank/rnd/research_director, - /obj/item/clothing/under/rank/security/head_of_security/alt,//WaspStation Edit - Better security jumpsuit sprites + /obj/item/clothing/under/rank/security/head_of_security/alt,//WS Edit - Better security jumpsuit sprites /obj/item/clothing/under/rank/rnd/research_director/alt, /obj/item/clothing/under/rank/rnd/research_director/turtleneck, - /obj/item/clothing/under/rank/command/captain/parade, /obj/item/clothing/under/rank/security/head_of_security/parade, /obj/item/clothing/under/rank/security/head_of_security/parade/female, //WaspStation Edit - Better Command Uniforms + /obj/item/clothing/under/rank/command/captain/parade, /obj/item/clothing/under/rank/security/head_of_security/parade, /obj/item/clothing/under/rank/security/head_of_security/parade/female, //WS Edit - Better Command Uniforms /obj/item/clothing/head/helmet/abductor, /obj/item/clothing/suit/armor/abductor/vest, /obj/item/melee/baton/abductor, /obj/item/storage/belt/military/abductor, /obj/item/gun/energy/alien, /obj/item/abductor/silencer, /obj/item/abductor/gizmo, /obj/item/clothing/under/rank/centcom/officer, diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 3b5fafb5b69..512fd3dc444 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -72,7 +72,7 @@ SUBSYSTEM_DEF(vote) if(choices[GLOB.master_mode] >= greatest_votes) greatest_votes = choices[GLOB.master_mode] - //WaspStation Begin - Autotransfer + //WS Begin - Autotransfer else if(mode == "transfer") var/factor = 1 switch(world.time / (1 MINUTES )) @@ -87,7 +87,7 @@ SUBSYSTEM_DEF(vote) else factor = 1.4 choices["Initiate Crew Transfer"] += round(non_voters.len * factor) - //WaspStation End + //WS End else if(mode == "map") for (var/non_voter_ckey in non_voters) @@ -264,7 +264,7 @@ SUBSYSTEM_DEF(vote) text += "\n[question]" log_vote(text) - // WaspStation Begin - Ghost Vote Rework + //WS Begin - Ghost Vote Rework var/vp = CONFIG_GET(number/vote_period) var/vote_message = "\n[text]\nType vote or click here to place your votes.\nYou have [DisplayTimeText(vp)] to vote." if(observer_vote_allowed) @@ -298,7 +298,7 @@ SUBSYSTEM_DEF(vote) generated_actions += V time_remaining = round(vp/10) return TRUE - // WaspStation End - Ghost Vote Rework + //WS End - Ghost Vote Rework return FALSE /datum/controller/subsystem/vote/proc/interface(client/C) @@ -393,16 +393,16 @@ SUBSYSTEM_DEF(vote) CONFIG_SET(flag/allow_vote_map, !CONFIG_GET(flag/allow_vote_map)) if("restart") if(CONFIG_GET(flag/allow_vote_restart) || usr.client.holder) - initiate_vote("restart",usr.key, TRUE) // WaspStation Edit - Ghost Vote Rework + initiate_vote("restart",usr.key, TRUE) //WS Edit - Ghost Vote Rework if("gamemode") if(CONFIG_GET(flag/allow_vote_mode) || usr.client.holder) - initiate_vote("gamemode",usr.key, TRUE) // WaspStation Edit - Ghost Vote Rework + initiate_vote("gamemode",usr.key, TRUE) //WS Edit - Ghost Vote Rework if("map") if(CONFIG_GET(flag/allow_vote_map) || usr.client.holder) - initiate_vote("map",usr.key, TRUE) // WaspStation Edit - Ghost Vote Rework + initiate_vote("map",usr.key, TRUE) //WS Edit - Ghost Vote Rework if("custom") if(usr.client.holder) - initiate_vote("custom",usr.key, TRUE) // WaspStation Edit - Ghost Vote Rework + initiate_vote("custom",usr.key, TRUE) //WS Edit - Ghost Vote Rework else submit_vote(round(text2num(href_list["vote"]))) usr.vote() diff --git a/code/datums/action.dm b/code/datums/action.dm index 4c96e9eda88..fc74af1d245 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -291,7 +291,7 @@ name = "Toggle Friendly Fire \[ON\]" ..() -/* Wasp revert +/*WS revert /// Toggle the action icon for the space suit thermal regulator /datum/action/item_action/toggle_spacesuit/proc/toggle(obj/item/clothing/suit/space/suit) SIGNAL_HANDLER diff --git a/code/datums/brain_damage/brain_trauma.dm b/code/datums/brain_damage/brain_trauma.dm index a96a0cc4ee9..b87beb08ab7 100644 --- a/code/datums/brain_damage/brain_trauma.dm +++ b/code/datums/brain_damage/brain_trauma.dm @@ -15,9 +15,9 @@ var/random_gain = TRUE //can this be gained through random traumas? var/resilience = TRAUMA_RESILIENCE_BASIC //how hard is this to cure? - //WaspStation Edit - Cloning + //WS Edit - Cloning var/clonable = TRUE // will this transfer if the brain is cloned? - //WaspStation End + //WS End /datum/brain_trauma/Destroy() if(brain && brain.traumas) diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index 0a73b5bc2e6..b9d2d4c79b3 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -75,7 +75,7 @@ to_chat(owner, "You feel your control being taken away... your other personality is in charge now!") to_chat(current_backseat, "You manage to take control of your body!") - //Wasp begin - Cortical Borers + //WS begin - Cortical Borers var/mob/to_swap = owner @@ -125,7 +125,7 @@ current_controller = !current_controller - //Wasp End + //WS End /mob/living/split_personality name = "split personality" real_name = "unknown conscience" diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index d1055e858bf..5a885241d4a 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -22,7 +22,7 @@ if(ishuman(AM)) var/mob/living/carbon/human/H = AM - var/atom/A = parent // Wasp Edit + var/atom/A = parent //WS Edit if(HAS_TRAIT(H, TRAIT_PIERCEIMMUNE)) return @@ -51,17 +51,17 @@ return var/damage = rand(min_damage, max_damage) - var/haslightstep = HAS_TRAIT(H, TRAIT_LIGHT_STEP) //Begin Waspstation edit - caltrops don't paralyze people with light step + var/haslightstep = HAS_TRAIT(H, TRAIT_LIGHT_STEP) //BeginWS edit - caltrops don't paralyze people with light step if(haslightstep && !H.incapacitated(ignore_restraints = TRUE)) damage *= 0.75 if(cooldown < world.time - 10) //cooldown to avoid message spam. - //var/atom/A = parent Wasp edit + //var/atom/A = parent WS edit if(!H.incapacitated(ignore_restraints = TRUE)) if(haslightstep) H.visible_message("[H] carefully steps on [A].", "You carefully step on [A], but it still hurts!") - else + else H.visible_message("[H] steps on [A].", \ "You step on [A]!") else @@ -71,8 +71,8 @@ cooldown = world.time H.apply_damage(damage, BRUTE, picked_def_zone) if(!haslightstep) - H.Paralyze(60) //End Waspstation edit - caltrops don't paralyze people with light step - if(H.pulledby) // Waspstation Edit Begin - Being pulled over caltrops is logged + H.Paralyze(60) //EndWS edit - caltrops don't paralyze people with light step + if(H.pulledby) //WS Edit Begin - Being pulled over caltrops is logged log_combat(H.pulledby, H, "pulled", A) else - H.log_message("has stepped on [A]", LOG_ATTACK, color="orange") // Waspstation Edit End + H.log_message("has stepped on [A]", LOG_ATTACK, color="orange") //WS Edit End diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 8465843492f..b5074c19044 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -818,8 +818,8 @@ /obj/item/stack/sticky_tape = 1) result = /obj/item/clothing/gloves/tackler/offbrand category = CAT_CLOTHING - -/* Wasp edit - Normal BoH + +/*WS edit - Normal BoH /datum/crafting_recipe/boh name = "Bag of Holding" reqs = list( diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index 85ae8fe4b60..cd06f769180 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -22,7 +22,7 @@ max_w_class = WEIGHT_CLASS_TINY attack_hand_interact = FALSE -//Waspstation Begin - Exowear Pockets +//WS Begin - Exowear Pockets /datum/component/storage/concrete/pockets/exo max_items = 2 max_w_class = WEIGHT_CLASS_SMALL @@ -37,7 +37,7 @@ /datum/component/storage/concrete/pockets/exo/large max_items = 3 -//WaspStation End +//WS End /datum/component/storage/concrete/pockets/small/fedora/Initialize() . = ..() @@ -50,14 +50,14 @@ /datum/component/storage/concrete/pockets/small/fedora/detective attack_hand_interact = TRUE // so the detectives would discover pockets in their hats -//WaspStation Begin - Any small item in shoes +//WS Begin - Any small item in shoes /datum/component/storage/concrete/pockets/shoes max_items = 2 attack_hand_interact = FALSE max_w_class = WEIGHT_CLASS_SMALL quickdraw = FALSE silent = TRUE -//WaspStation End +//WS End /datum/component/storage/concrete/pockets/shoes/Initialize() . = ..() diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 0f5121425a7..9c9e8b9c8a7 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -158,7 +158,7 @@ var/has_department = FALSE for(var/department in departments) var/list/jobs = departments[department] - if((rank in jobs) || (truerank in jobs)) //Wasp edit - alt titles + if((rank in jobs) || (truerank in jobs)) //WS edit - alt titles if(!manifest_out[department]) manifest_out[department] = list() manifest_out[department] += list(list( @@ -217,12 +217,12 @@ else assignment = "Unassigned" - //Wasp begin - Alt job titles + //WS begin - Alt job titles var/trueassignment = assignment if(C && C.prefs && C.prefs.alt_titles_preferences[assignment]) trueassignment = assignment assignment = C.prefs.alt_titles_preferences[assignment] - //Wasp end + //WS end var/static/record_id_num = 1001 var/id = num2hex(record_id_num++,6) @@ -246,7 +246,7 @@ G.fields["id"] = id G.fields["name"] = H.real_name G.fields["rank"] = assignment - G.fields["truerank"] = trueassignment //Wasp edit - This PR Keeps Me Up At Night (Alternate Job Titles) - Artist: Mark Suckerberg + G.fields["truerank"] = trueassignment //WS edit - This PR Keeps Me Up At Night (Alternate Job Titles) - Artist: Mark Suckerberg G.fields["age"] = H.age G.fields["species"] = H.dna.species.name G.fields["fingerprint"] = md5(H.dna.uni_identity) diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 6f091d8d2af..11e1433334a 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -17,7 +17,7 @@ var/scrambled = FALSE //Did we take something like mutagen? In that case we cant get our genes scanned to instantly cheese all the powers. - var/delete_species = TRUE //Set to FALSE when a body is scanned by a cloner to fix #38875. WaspStation Edit - Cloning + var/delete_species = TRUE //Set to FALSE when a body is scanned by a cloner to fix #38875. WS Edit - Cloning /datum/dna/New(mob/living/new_holder) if(istype(new_holder)) @@ -30,10 +30,10 @@ cholder.dna = null holder = null - //WaspStation Begin - Cloning + //WS Begin - Cloning if(delete_species) QDEL_NULL(species) - //WaspStation End + //WS End mutations.Cut() //This only references mutations, just dereference. temporary_mutations.Cut() //^ diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index d6c8362c870..ef504fa0d7d 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -26,7 +26,7 @@ var/vary = FALSE //used for the honk borg emote var/only_forced_audio = FALSE //can only code call this event instead of the player. var/cooldown = 0.8 SECONDS - var/static/regex/stop_bad_mime = regex(@"says|exclaims|yells|asks") //Wasp Edit + var/static/regex/stop_bad_mime = regex(@"says|exclaims|yells|asks") //WS Edit /datum/emote/New() if (ispath(mob_type_allowed_typecache)) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index c9d4809b3b4..1244564ae0d 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -41,7 +41,7 @@ var/assigned_role var/special_role var/list/restricted_roles = list() - var/list/datum/objective/objectives = list() // WaspStation Edit - Cryopods + var/list/datum/objective/objectives = list() //WS Edit - Cryopods var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button. @@ -73,7 +73,7 @@ ///Assoc list of skills. Use SKILL_LVL to access level, and SKILL_EXP to access skill's exp. var/list/known_skills = list() - ///Wasp edit - Crew objectives variable, stores crew objective datums + ///WS edit - Crew objectives variable, stores crew objective datums var/list/crew_objectives diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index e58fa77fecc..452e3c6a71a 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -193,7 +193,7 @@ /datum/mood_event/confident_mane description = "I'm feeling confident with a head full of hair.\n" mood_change = 2 -/datum/mood_event/dkickflip // Wasp Edit Begin - Skateboards can take you to the afterlife +/datum/mood_event/dkickflip //WS Edit Begin - Skateboards can take you to the afterlife description = "I just witnessed the most RAD thing ever.\n" mood_change = 5 - timeout = 2 MINUTES // Wasp Edit End + timeout = 2 MINUTES //WS Edit End diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 4d0ee038876..67f9e09958c 100755 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -151,7 +151,7 @@ * * If visualsOnly is true, you can omit any work that doesn't visually appear on the character sprite */ -/datum/outfit/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source = null) //WaspStation Edit - Alt-Job Titles +/datum/outfit/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source = null) //WS Edit - Alt-Job Titles pre_equip(H, visualsOnly, preference_source) //Start with uniform,suit,backpack for additional slots @@ -221,7 +221,7 @@ var/obj/item/clothing/suit/space/hardsuit/HS = H.wear_suit HS.ToggleHelmet() - post_equip(H, visualsOnly, preference_source) // Wasp Edit - Alt-Job Titles + post_equip(H, visualsOnly, preference_source) //WS Edit - Alt-Job Titles if(!visualsOnly) apply_fingerprints(H) diff --git a/code/datums/radiation_wave.dm b/code/datums/radiation_wave.dm index 776725f6699..0c3519e0997 100644 --- a/code/datums/radiation_wave.dm +++ b/code/datums/radiation_wave.dm @@ -138,11 +138,11 @@ contam_atoms += thing var/did_contam = 0 if(can_contam) - var/num_targets = contam_atoms.len // Waspstation Edit Begin - Fix radiation runtime + var/num_targets = contam_atoms.len //WS Edit Begin - Fix radiation runtime if(num_targets) // Check that theres something to contaminate var/rad_strength = ((strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT)/ num_targets for(var/k in 1 to num_targets) var/atom/thing = contam_atoms[k] thing.AddComponent(/datum/component/radioactive, rad_strength, source) - did_contam = 1 // Waspstation Edit End + did_contam = 1 //WS Edit End return did_contam diff --git a/code/datums/saymode.dm b/code/datums/saymode.dm index bad9399004b..1bcc9485345 100644 --- a/code/datums/saymode.dm +++ b/code/datums/saymode.dm @@ -70,7 +70,7 @@ if(user.hivecheck()) user.alien_talk(message) return FALSE -//Wasp begin - Borers +//WS begin - Borers /datum/saymode/borer key = MODE_KEY_BORER mode = MODE_BORER @@ -79,7 +79,7 @@ if(user.borercheck()) user.borer_talk(message) return FALSE -//Wasp end +//WS end /datum/saymode/vocalcords key = MODE_KEY_VOCALCORDS diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 83a56a7c182..78ed3624f79 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -452,7 +452,7 @@ suffix = "whiteship_pod" name = "Salvage Pod" -/datum/map_template/shuttle/whiteship/midway//waspstation edit +/datum/map_template/shuttle/whiteship/midway//WS edit suffix = "midway" name = "NT Atmospherics tanker" @@ -572,7 +572,7 @@ /datum/map_template/shuttle/arrival/omega suffix = "omega" name = "arrival shuttle (Omega)" -//Wasp Edit +//WS Edit /datum/map_template/shuttle/arrival/packed suffix = "packed" name = "arrival shuttle (Packedstation)" @@ -584,7 +584,7 @@ /datum/map_template/shuttle/mining/packed suffix = "packed" name = "mining shuttle (Packedstation)" -//Wasp End +//WS End /datum/map_template/shuttle/aux_base/default suffix = "default" name = "auxilliary base (Default)" diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index b651b3c0a8b..df4db1ce2ad 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -135,8 +135,8 @@ heirloom_type = /obj/item/reagent_containers/food/drinks/bottle/whiskey if("Lawyer") heirloom_type = pick(/obj/item/gavelhammer, /obj/item/book/manual/wiki/security_space_law) - if("Brig Physician") // Waspstation edit - Brig Physicians - heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/roller, /obj/item/book/manual/wiki/security_space_law) // Waspstation edit - Brig Physicians + if("Brig Physician") //WS edit - Brig Physicians + heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/roller, /obj/item/book/manual/wiki/security_space_law) //WS edit - Brig Physicians if("Prisoner") heirloom_type = /obj/item/pen/blue //RnD diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 03ababef6b5..72502bd2c01 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -64,7 +64,7 @@ ///Boolean to limit the areas (subtypes included) that atoms in this area can smooth with. Used for shuttles. var/area_limited_icon_smoothing = FALSE - /// Wasp Addition - Color on minimaps, if it's null (which is default) it makes one at random. + ///WS Addition - Color on minimaps, if it's null (which is default) it makes one at random. var/minimap_color var/list/power_usage diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index 6892d1afdc4..179003b4517 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -89,10 +89,10 @@ name = "Abandoned Ship Pod" /area/shuttle/abandoned/atmospherics - name = "Abandoned Ship atmospherics"//wasp station edit + name = "Abandoned Ship atmospherics"//WS station edit /area/shuttle/abandoned/coridor - name = "Abandoned Ship coridor"//wasp station edit + name = "Abandoned Ship coridor"//WS station edit ////////////////////////////Single-area shuttles//////////////////////////// /area/shuttle/transit diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 37bab1b0635..4d375f3a46e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1241,7 +1241,7 @@ log_whisper(log_text) if(LOG_EMOTE) log_emote(log_text) - if(LOG_SUBTLER) //Wasp Edit + if(LOG_SUBTLER) //WS Edit log_subtler(log_text) if(LOG_DSAY) log_dsay(log_text) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index c194ff15e03..23b4ac128df 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -326,7 +326,7 @@ direct = get_dir(src, newloc) setDir(direct) - // Wasp start - multi tile object handling + //WS 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) @@ -347,7 +347,7 @@ if(!newloc.Enter(src, src.loc)) return - // Wasp end + //WS end if (SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, newloc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE) return diff --git a/code/game/communications.dm b/code/game/communications.dm index f1ec9214d27..e1cdfaf11bb 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -98,8 +98,8 @@ GLOBAL_LIST_INIT(radiochannels, list( RADIO_CHANNEL_ENGINEERING = FREQ_ENGINEERING, RADIO_CHANNEL_SECURITY = FREQ_SECURITY, RADIO_CHANNEL_CENTCOM = FREQ_CENTCOM, - RADIO_CHANNEL_SOLGOV = FREQ_SOLGOV, // Wasp Edit - SolGov Rep - RADIO_CHANNEL_WIDEBAND = FREQ_WIDEBAND, // Wasp Edit - Overmap + RADIO_CHANNEL_SOLGOV = FREQ_SOLGOV, //WS Edit - SolGov Rep + RADIO_CHANNEL_WIDEBAND = FREQ_WIDEBAND, //WS Edit - Overmap RADIO_CHANNEL_SYNDICATE = FREQ_SYNDICATE, RADIO_CHANNEL_SUPPLY = FREQ_SUPPLY, RADIO_CHANNEL_SERVICE = FREQ_SERVICE, @@ -116,8 +116,8 @@ GLOBAL_LIST_INIT(reverseradiochannels, list( "[FREQ_ENGINEERING]" = RADIO_CHANNEL_ENGINEERING, "[FREQ_SECURITY]" = RADIO_CHANNEL_SECURITY, "[FREQ_CENTCOM]" = RADIO_CHANNEL_CENTCOM, - "[FREQ_SOLGOV]" = RADIO_CHANNEL_SOLGOV, // Wasp Edit - SolGov Rep - "[FREQ_WIDEBAND]" = RADIO_CHANNEL_WIDEBAND, // Wasp Edit - SolGov Rep + "[FREQ_SOLGOV]" = RADIO_CHANNEL_SOLGOV, //WS Edit - SolGov Rep + "[FREQ_WIDEBAND]" = RADIO_CHANNEL_WIDEBAND, //WS Edit - SolGov Rep "[FREQ_SYNDICATE]" = RADIO_CHANNEL_SYNDICATE, "[FREQ_SUPPLY]" = RADIO_CHANNEL_SUPPLY, "[FREQ_SERVICE]" = RADIO_CHANNEL_SERVICE, diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index eb8b6b48115..ffd5ecb4694 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -185,7 +185,7 @@ var/image/holder = hud_list[STATUS_HUD] var/icon/I = icon(icon, icon_state, dir) var/virus_threat = check_virus() - var/mob/living/simple_animal/borer/B = has_brain_worms() //Wasp edit - Borers + var/mob/living/simple_animal/borer/B = has_brain_worms() //WS edit - Borers holder.pixel_y = I.Height() - world.icon_size if(HAS_TRAIT(src, TRAIT_XENO_HOST)) holder.icon_state = "hudxeno" @@ -194,10 +194,10 @@ holder.icon_state = "huddefib" else holder.icon_state = "huddead" - //Wasp Begin - Borers + //WS Begin - Borers else if(has_brain_worms() && B != null && B.controlling) holder.icon_state = "hudbrainworm" - //Wasp end + //WS end else switch(virus_threat) if(DISEASE_SEVERITY_BIOHAZARD) diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 0271c6f1543..652d7e74b81 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -12,7 +12,7 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th antag_flag = ROLE_CHANGELING false_report_weight = 10 restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "SolGov Representative", "Prisoner") // Waspstation edit - Brig Physicians, SolGov Rep + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "SolGov Representative", "Prisoner") //WS edit - Brig Physicians, SolGov Rep required_players = 15 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index b95ae36befc..e6f4f882a40 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -36,7 +36,7 @@ report_type = "cult" antag_flag = ROLE_CULTIST false_report_weight = 10 - restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "SolGov Representative", "Prisoner") // Waspstation edit - Brig Physicians, SolGov Rep + restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "SolGov Representative", "Prisoner") //WS edit - Brig Physicians, SolGov Rep protected_jobs = list() required_players = 29 required_enemies = 4 diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index e81d2af21b7..7c4c4e99f6d 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -131,7 +131,7 @@ var/tc = 25 var/command_radio = FALSE var/uplink_type = /obj/item/uplink/nuclear - var/uplink_slot = ITEM_SLOT_BACKPACK //Wasp Edit - Syndicate Interns + var/uplink_slot = ITEM_SLOT_BACKPACK //WS Edit - Syndicate Interns /datum/outfit/syndicate/leader @@ -153,7 +153,7 @@ if(ispath(uplink_type, /obj/item/uplink/nuclear) || tc) // /obj/item/uplink/nuclear understands 0 tc var/obj/item/U = new uplink_type(H, H.key, tc) - H.equip_to_slot_or_del(U, uplink_slot) //Wasp Edit - Sydi Interns + H.equip_to_slot_or_del(U, uplink_slot) //WS Edit - Sydi Interns var/obj/item/implant/explosive/E = new/obj/item/implant/explosive(H) E.implant(H) diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index a51e86cebc5..ac8943768cb 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -13,7 +13,7 @@ report_type = "revolution" antag_flag = ROLE_REV false_report_weight = 10 - restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Brig Physician", "SolGov Representative", "Prisoner") // Waspstation edit - Brig Physicians, SolGov Rep + restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Brig Physician", "SolGov Representative", "Prisoner") //WS edit - Brig Physicians, SolGov Rep required_jobs = list(list("Captain"=1),list("Head of Personnel"=1),list("Head of Security"=1),list("Chief Engineer"=1),list("Research Director"=1),list("Chief Medical Officer"=1)) //Any head present required_players = 20 required_enemies = 1 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 6a9ef60e396..402c131be6d 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -12,7 +12,7 @@ antag_flag = ROLE_TRAITOR false_report_weight = 20 //Reports of traitors are pretty common. restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "Prisoner") // Waspstation edit - Brig Physicians, SolGov Rep + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "Prisoner") //WS edit - Brig Physicians, SolGov Rep required_players = 0 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/machinery/airlock_cycle_control.dm b/code/game/machinery/airlock_cycle_control.dm index 3fde0641a1b..832d212986e 100644 --- a/code/game/machinery/airlock_cycle_control.dm +++ b/code/game/machinery/airlock_cycle_control.dm @@ -56,14 +56,14 @@ /obj/item/wallframe/advanced_airlock_controller name = "airlock controller frame" desc = "Used for building advanced airlock controllers." - icon = 'waspstation/icons/obj/monitors.dmi' + icon = 'whitesands/icons/obj/monitors.dmi' icon_state = "aac_bitem" result_path = /obj/machinery/advanced_airlock_controller /obj/machinery/advanced_airlock_controller name = "advanced airlock controller" desc = "A machine designed to control the operation of cycling airlocks" - icon = 'waspstation/icons/obj/monitors.dmi' + icon = 'whitesands/icons/obj/monitors.dmi' icon_state = "aac" use_power = IDLE_POWER_USE idle_power_usage = 4 diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 3bbd6592b27..030735823c6 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -419,14 +419,14 @@ var/datum/design/D = SSresearch.techweb_design_by_id(id) if(D.build_type & AUTOLATHE) if("hacked" in D.category) - if(hacked || obj_flags & EMAGGED) // Waspstation - Emag the lathe + if(hacked || obj_flags & EMAGGED) //WS - Emag the lathe stored_research.add_design(D) else stored_research.remove_design(D) if(("emagged" in D.category) && (obj_flags & EMAGGED)) stored_research.add_design(D) -/obj/machinery/autolathe/emag_act(mob/user) // Waspstation - Emag the lathe +/obj/machinery/autolathe/emag_act(mob/user) //WS - Emag the lathe if(obj_flags & EMAGGED) return obj_flags |= EMAGGED diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 689430386b0..e4488893308 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -37,7 +37,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) "Research Director", "Chief Medical Officer", "Brig Physician", - "SolGov Representative", // Wasp Edit - SolGov Rep + "SolGov Representative", //WS Edit - SolGov Rep "Prisoner") //The scaling factor of max total positions in relation to the total amount of people on board the station in % diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 1a0af072e6e..589be6b55b5 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -73,7 +73,7 @@ if (obj_flags & EMAGGED) return obj_flags |= EMAGGED - SSshuttle.shuttle_purchase_requirements_met |= SHUTTLE_UNLOCK_EMAGGED //Wasp Edit - Makes shuttles from Emag list purchaseable + SSshuttle.shuttle_purchase_requirements_met |= SHUTTLE_UNLOCK_EMAGGED //WS Edit - Makes shuttles from Emag list purchaseable if (authenticated) authorize_access = get_all_accesses() to_chat(user, "You scramble the communication routing circuits!") @@ -318,7 +318,7 @@ log_game("[key_name(usr)] enabled emergency maintenance access.") message_admins("[ADMIN_LOOKUPFLW(usr)] enabled emergency maintenance access.") deadchat_broadcast(" enabled emergency maintenance access at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr, message_type = DEADCHAT_ANNOUNCEMENT) - //Wasp Begin - Nightshift Toggling + //WS Begin - Nightshift Toggling if ("toggleNightshift") if(!SSnightshift.can_fire) SSnightshift.can_fire = TRUE @@ -330,7 +330,7 @@ SSnightshift.update_nightshift(FALSE, TRUE) log_game("[key_name(usr)] has overridden the night shift to be off.") message_admins("[ADMIN_LOOKUPFLW(usr)] has overridden the night shift to be off.") - //Wasp End + //WS End /obj/machinery/computer/communications/ui_data(mob/user) var/list/data = list( @@ -362,9 +362,9 @@ data["shuttleCalled"] = FALSE data["shuttleLastCalled"] = FALSE - //Wasp Begin - Allows Toggling Nightshift Lighting + //WS Begin - Allows Toggling Nightshift Lighting data["nightShiftActive"] = SSnightshift.can_fire - //Wasp End + //WS End data["alertLevel"] = get_security_level() data["authorizeName"] = authorize_name @@ -491,7 +491,7 @@ to_chat(user, "You find yourself unable to speak.") else input = user.treat_message(input) //Adds slurs and so on. Someone should make this use languages too. - SScommunications.make_announcement(user, is_ai, input, authorize_name) // Waspstation Edit - Make cap's announcement use logged-in name + SScommunications.make_announcement(user, is_ai, input, authorize_name) //WS Edit - Make cap's announcement use logged-in name deadchat_broadcast(" made a priority announcement from [get_area_name(usr, TRUE)].", "[user.real_name]", user, message_type=DEADCHAT_ANNOUNCEMENT) /obj/machinery/computer/communications/proc/post_status(command, data1, data2) diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index b39bf1cc0ee..02718c0b602 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -32,7 +32,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) var/list/jobs = new/list() jobs["Captain"] = 00 jobs["Head of Personnel"] = 02 - jobs["SolGov Representative"] = 05 // Wasp Edit - SolGov Rep + jobs["SolGov Representative"] = 05 //WS Edit - SolGov Rep jobs["Head of Security"] = 10 jobs["Warden"] = 11 jobs["Security Officer"] = 12 @@ -146,7 +146,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) if (I) name = I.registered_name assignment = I.assignment - ijob = jobs[I.GetJobName()] //Why didn't it do this already - Wasp Edit - Alt Titles + ijob = jobs[I.GetJobName()] //Why didn't it do this already - WS Edit - Alt Titles else name = "Unknown" assignment = "" diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 003ccde0382..c75c703d528 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -5,7 +5,7 @@ icon_state = "jukebox" verb_say = "states" density = TRUE - // WaspStation Edit - Removed Jukebox Access Requirements + //WS Edit - Removed Jukebox Access Requirements var/active = FALSE var/list/rangers = list() var/stop = 0 @@ -64,7 +64,7 @@ to_chat(user,"Error: Access Denied.") user.playsound_local(src, 'sound/misc/compiler-failure.ogg', 25, TRUE) return UI_CLOSE - if(!SSjukeboxes.songs.len && !isobserver(user)) //Wasp Edit Cit #7367 + if(!SSjukeboxes.songs.len && !isobserver(user)) //WS Edit Cit #7367 to_chat(user,"Error: No music tracks have been authorized for your station. Petition Central Command to resolve this issue.") playsound(src, 'sound/misc/compiler-failure.ogg', 25, TRUE) return UI_CLOSE @@ -80,7 +80,7 @@ var/list/data = list() data["active"] = active data["songs"] = list() - for(var/datum/track/S in SSjukeboxes.songs) //Wasp Edit Cit #7367 + for(var/datum/track/S in SSjukeboxes.songs) //WS Edit Cit #7367 var/list/track_data = list( name = S.song_name ) @@ -109,11 +109,11 @@ to_chat(usr, "Error: The device is still resetting from the last activation, it will be ready again in [DisplayTimeText(stop-world.time)].") playsound(src, 'sound/misc/compiler-failure.ogg', 50, TRUE) return - if(!istype(selection)) //Wasp Edit Cit #7367 + if(!istype(selection)) //WS Edit Cit #7367 to_chat(usr, "Error: Severe user incompetence detected.") playsound(src, 'sound/misc/compiler-failure.ogg', 50, TRUE) return - if(!activate_music()) //Wasp Edit Cit #7367 + if(!activate_music()) //WS Edit Cit #7367 to_chat(usr, "Error: Generic hardware failure.") playsound(src, 'sound/misc/compiler-failure.ogg', 50, TRUE) return @@ -126,7 +126,7 @@ to_chat(usr, "Error: You cannot change the song until the current one is over.") return var/list/available = list() - for(var/datum/track/S in SSjukeboxes.songs) //Wasp Edit Cit #7367 + for(var/datum/track/S in SSjukeboxes.songs) //WS Edit Cit #7367 available[S.song_name] = S var/selected = params["track"] if(QDELETED(src) || !selected || !istype(available[selected], /datum/track)) @@ -149,7 +149,7 @@ return TRUE /obj/machinery/jukebox/proc/activate_music() - var/jukeboxslottotake = SSjukeboxes.addjukebox(src, selection, 2) //Wasp Edit Cit #7367 & #7458 + var/jukeboxslottotake = SSjukeboxes.addjukebox(src, selection, 2) //WS Edit Cit #7367 & #7458 if(jukeboxslottotake) active = TRUE update_icon() @@ -198,7 +198,7 @@ for(var/i in 1 to 10) spawn_atom_to_turf(/obj/effect/temp_visual/hierophant/telegraph/edge, src, 1, FALSE) sleep(5) - if(QDELETED(src)) //Wasp Edit Cit #11039 + if(QDELETED(src)) //WS Edit Cit #11039 return #define DISCO_INFENO_RANGE (rand(85, 115)*0.01) @@ -433,7 +433,7 @@ lying_prev = 0 /obj/machinery/jukebox/proc/dance_over() - var/position = SSjukeboxes.findjukeboxindex(src) //Wasp Edit Cit #10689 + var/position = SSjukeboxes.findjukeboxindex(src) //WS Edit Cit #10689 if(!position) return SSjukeboxes.removejukebox(position) @@ -446,7 +446,7 @@ QDEL_LIST(sparkles) /obj/machinery/jukebox/process() - if(active && world.time >= stop) //Wasp Edit Cit #7367 + if(active && world.time >= stop) //WS Edit Cit #7367 active = FALSE dance_over() playsound(src,'sound/machines/terminal_off.ogg',50,TRUE) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 169436de971..e4933b1fe40 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -87,8 +87,8 @@ var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock var/cyclelinkeddir = 0 - var/cyclelinkedx = 0 //Wasp start negative is left positive is right - var/cyclelinkedy = 0 //Wasp end negative is down positive is up + var/cyclelinkedx = 0 //WS start negative is left positive is right + var/cyclelinkedy = 0 //WS end negative is down positive is up var/obj/machinery/door/airlock/cyclelinkedairlock var/shuttledocked = 0 var/delayed_close_requested = FALSE // TRUE means the door will automatically close the next time it's opened. @@ -139,11 +139,11 @@ /obj/machinery/door/airlock/LateInitialize() . = ..() - if(cyclelinkedx || cyclelinkedy) //Wasp start + if(cyclelinkedx || cyclelinkedy) //WS start cyclelinkairlock_target() else if(cyclelinkeddir) - cyclelinkairlock() //Wasp end + cyclelinkairlock() //WS end if(abandoned) var/outcome = rand(1,100) switch(outcome) @@ -207,7 +207,7 @@ closeOther = A break -/obj/machinery/door/airlock/proc/cyclelinkairlock_target() //wasp start +/obj/machinery/door/airlock/proc/cyclelinkairlock_target() //WS start if (cyclelinkedairlock) cyclelinkedairlock.cyclelinkedairlock = null cyclelinkedairlock = null @@ -244,7 +244,7 @@ log_mapping("[src] at [AREACOORD(src)] failed to find a valid airlock to cyclelink_target with! Was targeting [T.x], [T.y], [T.z].") return FoundDoor.cyclelinkedairlock = src - cyclelinkedairlock = FoundDoor //wasp end + cyclelinkedairlock = FoundDoor //WS end /obj/machinery/door/airlock/proc/cyclelinkairlock() if (cyclelinkedairlock) @@ -271,10 +271,10 @@ /obj/machinery/door/airlock/vv_edit_var(var_name) . = ..() switch (var_name) - if (NAMEOF(src, cyclelinkedx)) //Wasp start + if (NAMEOF(src, cyclelinkedx)) //WS start cyclelinkairlock_target() if (NAMEOF(src, cyclelinkedy)) - cyclelinkairlock_target() //Wasp end + cyclelinkairlock_target() //WS end if (NAMEOF(src, cyclelinkeddir)) cyclelinkairlock() @@ -839,11 +839,11 @@ return attack_hand(user) /obj/machinery/door/airlock/attack_hand(mob/user) - if(user.a_intent == INTENT_GRAB && note) //Wasp edit - Grabbing notes off doors + if(user.a_intent == INTENT_GRAB && note) //WS edit - Grabbing notes off doors user.visible_message("[user] grabs [note] from [src].", "You remove [note] from [src].") user.put_in_hands(note) note = null - update_icon() //Wasp end + update_icon() //WS end return TRUE if(locked && allowed(user) && aac) aac.request_from_door(src) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index b49cf74a22a..2390b02708d 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -322,8 +322,8 @@ /obj/machinery/door/airlock/titanium name = "shuttle airlock" assemblytype = /obj/structure/door_assembly/door_assembly_titanium - icon = 'waspstation/icons/obj/doors/airlocks/shuttle/shuttle.dmi' - overlays_file = 'waspstation/icons/obj/doors/airlocks/shuttle/overlays.dmi' + icon = 'whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi' + overlays_file = 'whitesands/icons/obj/doors/airlocks/shuttle/overlays.dmi' normal_integrity = 400 has_hatch = FALSE @@ -468,8 +468,8 @@ /obj/machinery/door/airlock/shuttle name = "shuttle airlock" - icon = 'waspstation/icons/obj/doors/airlocks/shuttle/shuttle.dmi' //Wasp Edit - Classic Shuttle - overlays_file = 'waspstation/icons/obj/doors/airlocks/shuttle/overlays.dmi' + icon = 'whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi' //WS Edit - Classic Shuttle + overlays_file = 'whitesands/icons/obj/doors/airlocks/shuttle/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_shuttle has_hatch = FALSE diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 55cffe8d0f3..aa0d71e43ac 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) /obj/machinery/requests_console name = "requests console" desc = "A console intended to send requests to different departments on the station." - icon = 'waspstation/icons/obj/terminals.dmi' //WaspStation Edit - Better Icons + icon = 'whitesands/icons/obj/terminals.dmi' //WS Edit - Better Icons icon_state = "req_comp0" var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department var/list/messages = list() //List of all messages diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 798a8013ca0..4505f267bbe 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -247,7 +247,7 @@ cleanup_field(d) return ..() -/* Wasp Edit - Reverted Smartwire +/*WS Edit - Reverted Smartwire /obj/machinery/power/shieldwallgen/should_have_node() return anchored */ @@ -342,10 +342,10 @@ . |= default_unfasten_wrench(user, I, 0) var/turf/T = get_turf(src) // update_cable_icons_on_turf(T) - Removed because smartwire Revert -// Wasp Begin - Smartwire Revert +//WS Begin - Smartwire Revert var/obj/structure/cable/C = locate(/obj/structure/cable) in T C.update_icon() -// Wasp End - Smartwire Revert +//WS End - Smartwire Revert if(. == SUCCESSFUL_UNFASTEN && anchored) connect_to_network() diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm index cf158d80b49..78130421caa 100644 --- a/code/game/machinery/telecomms/broadcasting.dm +++ b/code/game/machinery/telecomms/broadcasting.dm @@ -168,13 +168,13 @@ if(R.independent && R.can_receive(frequency, levels)) radios += R - // Waspstation edit begin - Radio chatter #434 + //WS edit begin - Radio chatter #434 // Next, we'll have each radio play a small sound effect except for the one that broadcasted it. for(var/obj/item/radio/radio in radios) if(radio.last_chatter_time + 1 SECONDS < world.time && source != radio) playsound(radio, "sound/effects/radio_chatter.ogg", 20, FALSE) radio.last_chatter_time = world.time - // Waspstation edit end + //WS edit end // From the list of radios, find all mobs who can hear those. var/list/receive = get_mobs_in_radio_ranges(radios) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 4cb6b58eb57..202a9c8a620 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -121,9 +121,9 @@ . = TRUE if("tempfreq") if(params["value"]) - tempfreq = sanitize_frequency(text2num(params["value"]) * 10, TRUE) // Waspstation Edit - add frequency filter fix + tempfreq = sanitize_frequency(text2num(params["value"]) * 10, TRUE) //WS Edit - add frequency filter fix if("freq") - var/newfreq = tempfreq // Waspstation Edit - add frequency filter fix + var/newfreq = tempfreq //WS Edit - add frequency filter fix if(newfreq == FREQ_SYNDICATE) to_chat(operator, "Error: Interference preventing filtering frequency: \"[newfreq / 10] GHz\"") playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE) diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index 90f9b0d6819..504c2f06345 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -348,7 +348,7 @@ /obj/item/mecha_parts/mecha_equipment/rcd/get_equip_info() return "[..()] \[D|C|A\]" -//Wasp Edit Begin - Readded from Smartwire Revert +//WS Edit Begin - Readded from Smartwire Revert /obj/item/mecha_parts/mecha_equipment/cable_layer name = "cable layer" desc = "Equipment for engineering exosuits. Lays cable along the exosuit's path." @@ -483,7 +483,7 @@ //NC.mergeConnectedNetworksOnTurf() last_piece = NC return 1 -//Wasp Edit End - Readded from Smartwire Revert +//WS Edit End - Readded from Smartwire Revert //Dunno where else to put this so shrug /obj/item/mecha_parts/mecha_equipment/ripleyupgrade diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 1714b11af6b..ee28bd23ef0 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -65,7 +65,7 @@ var/list/equipment = new var/obj/item/mecha_parts/mecha_equipment/selected var/max_equip = 3 - var/datum/events/events //Wasp - Readded for Smartwire Revert + var/datum/events/events //WS - Readded for Smartwire Revert var/step_silent = FALSE //Used for disabling mech step sounds while using thrusters or pushing off lockers var/stepsound = 'sound/mecha/mechstep.ogg' @@ -124,7 +124,7 @@ /obj/mecha/Initialize() . = ..() - events = new //Wasp - Readded for Smartwire Revert + events = new //WS - Readded for Smartwire Revert icon_state += "-open" add_radio() add_cabin() @@ -541,7 +541,7 @@ /obj/mecha/Move(atom/newloc, direct) . = ..() if(.) - events.fireEvent("onMove",get_turf(src)) //Wasp - Readded for Smartwire Revert + events.fireEvent("onMove",get_turf(src)) //WS - Readded for Smartwire Revert if (internal_tank?.disconnect()) // Something moved us and broke connection occupant_message("Air port connection has been severed!") log_message("Lost connection to gas port.", LOG_MECHA) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 5733465ae7a..01307d4e48f 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -1051,7 +1051,7 @@ "desc" = "External armor is wrenched." ), list( - "key" = /obj/item/assembly/signaler/anomaly, //WaspStation Edit - Any anomaly core for Phazons + "key" = /obj/item/assembly/signaler/anomaly, //WS Edit - Any anomaly core for Phazons "action" = ITEM_DELETE, "back_key" = TOOL_WELDER, "desc" = "Bluespace anomaly core socket is open.", diff --git a/code/game/mecha/working/clarke.dm b/code/game/mecha/working/clarke.dm index 6009a8c4352..01012d3f7d1 100644 --- a/code/game/mecha/working/clarke.dm +++ b/code/game/mecha/working/clarke.dm @@ -1,4 +1,4 @@ -/* Wasp Edit - Removes Clarke +/*WS Edit - Removes Clarke ///Lavaproof, fireproof, fast mech with low armor and higher energy consumption, cannot strafe and has an internal ore box. /obj/mecha/working/clarke desc = "Combining man and machine for a better, stronger engineer. Can even resist lava!" @@ -99,4 +99,4 @@ /obj/item/mecha_parts/mecha_equipment/orebox_manager/get_equip_info() return "[..()] [hostmech?.box ? "Unload Cargo" : "Error"]" -Wasp End */ +WS End */ diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 9f64dc32447..3ac2ca9c87d 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -265,13 +265,13 @@ /obj/effect/anomaly/pyro/anomalyEffect() ..() ticks++ - if(ticks < 25) // WaspStation Edit - Pyroclastic Rebalance + if(ticks < 25) //WS Edit - Pyroclastic Rebalance return else ticks = 0 var/turf/open/T = get_turf(src) if(istype(T)) - T.atmos_spawn_air("o2=5;plasma=5;TEMP=500") // WaspStation Edit - Pyroclastic Rebalance + T.atmos_spawn_air("o2=5;plasma=5;TEMP=500") //WS Edit - Pyroclastic Rebalance /obj/effect/anomaly/pyro/detonate() INVOKE_ASYNC(src, .proc/makepyroslime) @@ -279,7 +279,7 @@ /obj/effect/anomaly/pyro/proc/makepyroslime() var/turf/open/T = get_turf(src) if(istype(T)) - T.atmos_spawn_air("o2=250;plasma=250;TEMP=700") // WaspStation Edit - Pyroclastic Rebalance + T.atmos_spawn_air("o2=250;plasma=250;TEMP=700") //WS Edit - Pyroclastic Rebalance var/new_colour = pick("red", "orange") var/mob/living/simple_animal/slime/S = new(T, new_colour) S.rabid = TRUE diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index b78b2cc874e..c3dbaad899a 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -114,10 +114,10 @@ R.add_fingerprint(user) qdel(src) -// WaspStation Start - Changing Posters Fix +//WS Start - Changing Posters Fix /obj/structure/sign/poster/wrench_act(mob/living/user, obj/item/wrench/I) return -// WaspStation End +//WS End /obj/structure/sign/poster/proc/roll_and_drop(loc) pixel_x = 0 diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 24e36940f2c..4529d3287c8 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -222,8 +222,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) icon_state = "Brig Physician" /obj/effect/landmark/start/lieutenant - name = "SolGov Representative" // Wasp Edit - SolGov Rep - icon_state = "SolGov Representative" // Wasp Edit - SolGov Rep + name = "SolGov Representative" //WS Edit - SolGov Rep + icon_state = "SolGov Representative" //WS Edit - SolGov Rep //Department Security spawns diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index afa9d1ed271..79aefc456a3 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -659,7 +659,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb return FALSE /obj/item/proc/get_belt_overlay() //Returns the icon used for overlaying the object on a belt - return mutable_appearance('waspstation/icons/obj/clothing/belt_overlays.dmi', icon_state) + return mutable_appearance('whitesands/icons/obj/clothing/belt_overlays.dmi', icon_state) /obj/item/proc/update_slot_icon() if(!ismob(loc)) diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 2ff6f29c73e..ce3c0059817 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -33,8 +33,8 @@ GLOBAL_LIST_INIT(atmos_pipe_recipes, list( new /datum/pipe_info/pipe("Passive Vent", /obj/machinery/atmospherics/components/unary/passive_vent), new /datum/pipe_info/pipe("Manual Valve", /obj/machinery/atmospherics/components/binary/valve), new /datum/pipe_info/pipe("Digital Valve", /obj/machinery/atmospherics/components/binary/valve/digital), - new /datum/pipe_info/pipe("Relief Valve (Binary)", /obj/machinery/atmospherics/components/binary/relief_valve), //Wasp Edit - Port of Relief Valves from Cit - new /datum/pipe_info/pipe("Relief Valve (Unary)", /obj/machinery/atmospherics/components/unary/relief_valve), //Wasp Edit - Port of Relief Valves from Cit + new /datum/pipe_info/pipe("Relief Valve (Binary)", /obj/machinery/atmospherics/components/binary/relief_valve), //WS Edit - Port of Relief Valves from Cit + new /datum/pipe_info/pipe("Relief Valve (Unary)", /obj/machinery/atmospherics/components/unary/relief_valve), //WS Edit - Port of Relief Valves from Cit new /datum/pipe_info/meter("Meter"), ), "Heat Exchange" = list( diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index a666218f3ce..54d7fd588b4 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -1,6 +1,6 @@ /obj/item/airlock_painter name = "airlock painter" - desc = "An advanced autopainter preprogrammed with several paintjobs for airlocks. Use it on an airlock during or after construction to change the paintjob." //WaspStation Edit - Floor Painters + desc = "An advanced autopainter preprogrammed with several paintjobs for airlocks. Use it on an airlock during or after construction to change the paintjob." //WS Edit - Floor Painters icon = 'icons/obj/objects.dmi' icon_state = "paint sprayer" item_state = "paint sprayer" @@ -144,11 +144,11 @@ to_chat(user, "You remove [ink] from [src].") ink = null -/* Waspstation edit - no toner +/*WS edit - no toner /obj/item/airlock_painter/decal name = "decal painter" - desc = "An airlock painter, reprogramed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed. Alt-Click to change design." //WaspStation Edit - Floor Painters + desc = "An airlock painter, reprogramed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed. Alt-Click to change design." //WS Edit - Floor Painters icon = 'icons/obj/objects.dmi' icon_state = "decal_sprayer" item_state = "decalsprayer" @@ -256,4 +256,4 @@ . = ..() ink = new /obj/item/toner/extreme(src) -Waspstation end */ +WS end */ diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 452c2396bac..f51655c03d5 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -15,7 +15,7 @@ /obj/item/card name = "card" desc = "Does card things." - icon = 'waspstation/icons/obj/card.dmi' //WaspStation Edit - Actually good-looking IDs >:) + icon = 'whitesands/icons/obj/card.dmi' //WS Edit - Actually good-looking IDs >:) w_class = WEIGHT_CLASS_TINY var/list/files = list() diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index d0f1c0d6d9e..ff0511a23a5 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -766,10 +766,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM overlay_state = "slime" grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/medicine/pyroxadone = 5) -/obj/item/lighter/clockwork //Wasp edit: Clockwork Zippo, by Tergius. PR #395 +/obj/item/lighter/clockwork //WS edit: Clockwork Zippo, by Tergius. PR #395 name = "bronze zippo" desc = "A zippo plated with brass. I mean bronze. Has a neat red flame!" - icon = 'waspstation/icons/obj/cigarettes.dmi' + icon = 'whitesands/icons/obj/cigarettes.dmi' icon_state = "clockworklighter" heat = 2000 //?????????????????? light_color = LIGHT_COLOR_BLOOD_MAGIC @@ -819,8 +819,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/vapetime = 0 //this so it won't puff out clouds every tick var/screw = 0 // kinky var/super = 0 //for the fattest vapes dude. - var/vapecolor //What color the vape should be. If this is not filled out it will automatically be set on Initialize() - Waspstation edit - Lightable e-cigarettes - var/overlayname = "vape" //Used to decide what overlay sprites to use - Waspstation edit - Lightable e-cigarettes + var/vapecolor //What color the vape should be. If this is not filled out it will automatically be set on Initialize() - WS edit - Lightable e-cigarettes + var/overlayname = "vape" //Used to decide what overlay sprites to use - WS edit - Lightable e-cigarettes /obj/item/clothing/mask/vape/suicide_act(mob/user) user.visible_message("[user] is puffin hard on dat vape, [user.p_they()] trying to join the vape life on a whole notha plane!")//it doesn't give you cancer, it is cancer @@ -831,12 +831,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM . = ..() create_reagents(chem_volume, NO_REACT) reagents.add_reagent(/datum/reagent/drug/nicotine, 50) - if(!vapecolor) //Begin Waspstation edit - Lightable e-cigarettes + if(!vapecolor) //BeginWS edit - Lightable e-cigarettes if(!param_color) param_color = pick("red","blue","black","white","green","purple","yellow","orange") vapecolor = param_color icon_state = "[vapecolor]_vapeoff" - item_state = "[vapecolor]_vapeoff" //End Waspstation edit - Lightable e-cigarettes + item_state = "[vapecolor]_vapeoff" //EndWS edit - Lightable e-cigarettes /obj/item/clothing/mask/vape/attackby(obj/item/O, mob/user, params) if(O.tool_behaviour == TOOL_SCREWDRIVER) @@ -848,11 +848,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM to_chat(user, "You open the cap on [src].") reagents.flags |= OPENCONTAINER if(obj_flags & EMAGGED) - add_overlay("[overlayname]open_high") //Waspstation edit - lightable e-cigarettes + add_overlay("[overlayname]open_high") //WS edit - lightable e-cigarettes else if(super) - add_overlay("[overlayname]open_med") //Waspstation edit - lightable e-cigarettes + add_overlay("[overlayname]open_med") //WS edit - lightable e-cigarettes else - add_overlay("[overlayname]open_low") //Waspstation edit - lightable e-cigarettes + add_overlay("[overlayname]open_low") //WS edit - lightable e-cigarettes else screw = FALSE to_chat(user, "You close the cap on [src].") @@ -865,18 +865,18 @@ CIGARETTE PACKETS ARE IN FANCY.DM cut_overlays() super = 1 to_chat(user, "You increase the voltage of [src].") - add_overlay("[overlayname]open_med") //Waspstation edit - lightable e-cigarettes + add_overlay("[overlayname]open_med") //WS edit - lightable e-cigarettes else cut_overlays() super = 0 to_chat(user, "You decrease the voltage of [src].") - add_overlay("[overlayname]open_low") //Waspstation edit - lightable e-cigarettes + add_overlay("[overlayname]open_low") //WS edit - lightable e-cigarettes if(screw && (obj_flags & EMAGGED)) to_chat(user, "[src] can't be modified!") else ..() - if(istype(O, /obj/item/pda)) //Begin Waspstation edit - Lightable e-cigarettes + if(istype(O, /obj/item/pda)) //BeginWS edit - Lightable e-cigarettes if(screw) to_chat(user, "You need to close the cap first!") return @@ -899,7 +899,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM STOP_PROCESSING(SSobj, src) src.update_icon_state() user.update_inv_wear_mask() - user.update_inv_hands() //End Waspstation edit - Lightable e-cigarettes + user.update_inv_hands() //EndWS edit - Lightable e-cigarettes /obj/item/clothing/mask/vape/emag_act(mob/user)// I WON'T REGRET WRITTING THIS, SURLY. @@ -909,7 +909,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM obj_flags |= EMAGGED super = 0 to_chat(user, "You maximize the voltage of [src].") - add_overlay("[overlayname]open_high") //Waspstation edit - lightable e-cigarettes + add_overlay("[overlayname]open_high") //WS edit - lightable e-cigarettes var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread //for effect sp.set_up(5, 1, src) sp.start() @@ -925,7 +925,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/vape/equipped(mob/user, slot) . = ..() - if(slot == ITEM_SLOT_MASK) //Begin Waspstation edit - Lightable e-cigarettes + if(slot == ITEM_SLOT_MASK) //BeginWS edit - Lightable e-cigarettes if(on) if(!screw) to_chat(user, "You start puffing on \the [src].") @@ -933,7 +933,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM else //it will not start if the vape is opened. to_chat(user, "You need to close the cap first!") else - to_chat(user, "You need to turn on \the [src] first!") //End Waspstation edit - Lightable e-cigarettes + to_chat(user, "You need to turn on \the [src] first!") //EndWS edit - Lightable e-cigarettes /obj/item/clothing/mask/vape/dropped(mob/user) . = ..() @@ -980,7 +980,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM //open flame removed because vapes are a closed system, they wont light anything on fire if(super && vapetime > 3)//Time to start puffing those fat vapes, yo. - var/datum/effect_system/smoke_spread/chem/smoke_machine/s = new //Begin Waspstation edit - Fix vape clouds + var/datum/effect_system/smoke_spread/chem/smoke_machine/s = new //BeginWS edit - Fix vape clouds var/datum/reagents/smokereagents = new reagents.trans_to(smokereagents, reagents.total_volume / 10, 0.65) s.set_up(smokereagents, 1, 24, loc) @@ -992,7 +992,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/datum/reagents/smokereagents = new reagents.trans_to(smokereagents, reagents.total_volume / 5, 0.75) s.set_up(smokereagents, 4, 24, loc) - s.start() //End Waspstation edit - Fix vape clouds + s.start() //EndWS edit - Fix vape clouds vapetime = 0 if(prob(5))//small chance for the vape to break and deal damage if it's emagged playsound(get_turf(src), 'sound/effects/pop_expl.ogg', 50, FALSE) @@ -1008,6 +1008,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(reagents && reagents.total_volume) hand_reagents() -/obj/item/clothing/mask/vape/examine(mob/user) //Begin Waspstation edit - Lightable e-cigarettes +/obj/item/clothing/mask/vape/examine(mob/user) //BeginWS edit - Lightable e-cigarettes . = ..() - to_chat(user, "It is currently [on ? "on" : "off"].") //EndWS edit - Lightable e-cigarettes diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index f1792c4428e..462f6274403 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -723,7 +723,7 @@ icon_state = "medical" build_path = /obj/machinery/rnd/production/protolathe/department/medical -/* WaspStation Edit - Sleepers are now in the modularized file, so that if TG removes the circuit board, we don't lose em. +/*WS Edit - Sleepers are now in the modularized file, so that if TG removes the circuit board, we don't lose em. /obj/item/circuitboard/machine/sleeper name = "Sleeper (Machine Board)" @@ -739,7 +739,7 @@ name = "Party Pod (Machine Board)" build_path = /obj/machinery/sleeper/party -WaspStation End */ +WS End */ /obj/item/circuitboard/machine/smoke_machine name = "Smoke Machine (Machine Board)" diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index ae55a0fbc8f..20b2c1cea52 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -122,7 +122,7 @@ H.update_hair() playsound(loc, 'sound/items/welder2.ogg', 20, TRUE) -/* Wasp edit - In modularized file +/*WS edit - In modularized file /obj/item/razor/attack(mob/M, mob/user) if(ishuman(M)) var/mob/living/carbon/human/H = M @@ -229,4 +229,4 @@ ..() else ..() -Wasp end */ +WS end */ diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 181a7bd7f20..d28c975a26c 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(PDAs) /obj/item/pda name = "\improper PDA" desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge." - icon = 'waspstation/icons/obj/pda.dmi' //WaspStation Edit - Better PDAs from Eris(?) + icon = 'whitesands/icons/obj/pda.dmi' //WS Edit - Better PDAs from Eris(?) icon_state = "pda" item_state = "electronic" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' @@ -173,9 +173,9 @@ GLOBAL_LIST_EMPTY(PDAs) if(inserted_item) overlay.icon_state = "insert_overlay" . += new /mutable_appearance(overlay) - if(cartridge) //waspedit: lol copy and pasted from PR #55072 on TGstation haha!! + if(cartridge) //WSedit: lol copy and pasted from PR #55072 on TGstation haha!! overlay.icon_state = "cartridge_overlay" //does this work? fuck if I know! - . += new /mutable_appearance(overlay) //waspstation end + . += new /mutable_appearance(overlay) //WS end if(light_on) overlay.icon_state = "light_overlay" . += new /mutable_appearance(overlay) @@ -212,7 +212,7 @@ GLOBAL_LIST_EMPTY(PDAs) user.set_machine(src) - var/dat = "" // WaspStation Edit - PDA Redesign + var/dat = "" //WS Edit - PDA Redesign dat += assets.css_tag() dat += emoji_s.css_tag() @@ -567,7 +567,7 @@ GLOBAL_LIST_EMPTY(PDAs) usr.put_in_hands(pai) to_chat(usr, "You remove the pAI from the [name].") -// WaspStation Start -- Skill Cloak Fix +//WS Start -- Skill Cloak Fix //SKILL FUNCTIONS=================================== if("SkillReward") @@ -576,7 +576,7 @@ GLOBAL_LIST_EMPTY(PDAs) var/datum/mind/mind = U.mind var/new_level = mind.get_skill_level(type) S.try_skill_reward(mind, new_level) -// WaspStation End +//WS End //LINK FUNCTIONS=================================== @@ -630,7 +630,7 @@ GLOBAL_LIST_EMPTY(PDAs) H.sec_hud_set_ID() -// WaspStation Start -- Added recipient to PDA messages +//WS Start -- Added recipient to PDA messages /obj/item/pda/proc/msg_input(mob/living/U = usr, list/obj/item/pda/targets) var/title = name if(targets) @@ -641,7 +641,7 @@ GLOBAL_LIST_EMPTY(PDAs) else CRASH("msg_input(): Length of list/obj/item/pda/targets is non-positive") var/t = stripped_input(U, "Please enter message", title, null, MAX_MESSAGE_LEN) - // WaspStation End + //WS End if(!t || toff) return if(!in_range(src, U) && loc != U) @@ -651,7 +651,7 @@ GLOBAL_LIST_EMPTY(PDAs) return t /obj/item/pda/proc/send_message(mob/living/user, list/obj/item/pda/targets, everyone) - var/message = msg_input(user, targets) // WaspStation Edit -- Added recipient to PDA messages + var/message = msg_input(user, targets) //WS Edit -- Added recipient to PDA messages if(!message || !targets.len) return if((last_text && world.time < last_text + 10) || (everyone && last_everyone && world.time < last_everyone + PDA_SPAM_DELAY)) diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index 1bf77733022..ae051b716dd 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -11,11 +11,11 @@ /obj/item/geiger_counter //DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis name = "\improper Geiger counter" desc = "A handheld device used for detecting and measuring radiation pulses." - icon = 'waspstation/icons/obj/tools.dmi' //Wasp begin - Better tool sprites + icon = 'whitesands/icons/obj/tools.dmi' //WS begin - Better tool sprites icon_state = "geiger_off" item_state = "geiger" - lefthand_file = 'waspstation/icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'waspstation/icons/mob/inhands/equipment/tools_righthand.dmi' //Wasp end + lefthand_file = 'whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'whitesands/icons/mob/inhands/equipment/tools_righthand.dmi' //WS end w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT item_flags = NOBLUDGEON diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 143d01a644a..aee044189e2 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -13,10 +13,10 @@ /obj/item/multitool name = "multitool" desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." - icon = 'waspstation/icons/obj/tools.dmi' //WaspStation Edit - Better Tool Sprites + icon = 'whitesands/icons/obj/tools.dmi' //WS Edit - Better Tool Sprites icon_state = "multitool" - lefthand_file = 'waspstation/icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'waspstation/icons/mob/inhands/equipment/tools_righthand.dmi' + lefthand_file = 'whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'whitesands/icons/mob/inhands/equipment/tools_righthand.dmi' force = 5 w_class = WEIGHT_CLASS_SMALL tool_behaviour = TOOL_MULTITOOL diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index cf098916aca..42f09b4cd5b 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -82,7 +82,7 @@ /obj/item/encryptionkey/heads/captain name = "\proper the captain's encryption key" icon_state = "cap_cypherkey" - channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_ENGINEERING = 0, RADIO_CHANNEL_SCIENCE = 0, RADIO_CHANNEL_MEDICAL = 0, RADIO_CHANNEL_SUPPLY = 0, RADIO_CHANNEL_SERVICE = 0, RADIO_CHANNEL_WIDEBAND = 0) //Wasp edit - Wideband radio + channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_ENGINEERING = 0, RADIO_CHANNEL_SCIENCE = 0, RADIO_CHANNEL_MEDICAL = 0, RADIO_CHANNEL_SUPPLY = 0, RADIO_CHANNEL_SERVICE = 0, RADIO_CHANNEL_WIDEBAND = 0) //WS edit - Wideband radio /obj/item/encryptionkey/heads/rd name = "\proper the research director's encryption key" @@ -128,7 +128,7 @@ name = "\improper CentCom radio encryption key" icon_state = "cent_cypherkey" independent = TRUE - channels = list(RADIO_CHANNEL_CENTCOM = 1, RADIO_CHANNEL_WIDEBAND = 0) //Wasp edit- Wideband Radio + channels = list(RADIO_CHANNEL_CENTCOM = 1, RADIO_CHANNEL_WIDEBAND = 0) //WS edit- Wideband Radio /obj/item/encryptionkey/ai //ported from NT, this goes 'inside' the AI. channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_ENGINEERING = 1, RADIO_CHANNEL_SCIENCE = 1, RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_AI_PRIVATE = 1) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index d4bd72f4818..8c8d301e855 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -7,7 +7,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( RADIO_CHANNEL_ENGINEERING = RADIO_TOKEN_ENGINEERING, RADIO_CHANNEL_SECURITY = RADIO_TOKEN_SECURITY, RADIO_CHANNEL_CENTCOM = RADIO_TOKEN_CENTCOM, - RADIO_CHANNEL_SOLGOV = RADIO_TOKEN_SOLGOV, // Wasp Edit - SolGov Rep + RADIO_CHANNEL_SOLGOV = RADIO_TOKEN_SOLGOV, //WS Edit - SolGov Rep RADIO_CHANNEL_SYNDICATE = RADIO_TOKEN_SYNDICATE, RADIO_CHANNEL_SUPPLY = RADIO_TOKEN_SUPPLY, RADIO_CHANNEL_SERVICE = RADIO_TOKEN_SERVICE, diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 8eef9008359..2216df8d207 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -1,14 +1,14 @@ /obj/item/radio/intercom name = "station intercom" desc = "Talk through this." - icon = 'waspstation/icons/obj/radio.dmi' + icon = 'whitesands/icons/obj/radio.dmi' icon_state = "intercom" anchored = TRUE w_class = WEIGHT_CLASS_BULKY canhear_range = 2 dog_fashion = null unscrewed = FALSE - var/obj/item/wallframe/wallframe = /obj/item/wallframe/intercom //Wasp edit - Wideband Radio + var/obj/item/wallframe/wallframe = /obj/item/wallframe/intercom //WS edit - Wideband Radio /obj/item/radio/intercom/unscrewed unscrewed = TRUE diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index a5ada718d6f..76d34366d94 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -18,7 +18,7 @@ var/frequency = FREQ_COMMON var/canhear_range = 3 // The range around the radio in which mobs can hear what it receives. var/emped = 0 // Tracks the number of EMPs currently stacked. - var/last_chatter_time // The time since we last played a radio chatter sound. (Waspstation edit - Radio Chatter #434) + var/last_chatter_time // The time since we last played a radio chatter sound. (WS edit - Radio Chatter #434) var/broadcasting = FALSE // Whether the radio will transmit dialogue it hears nearby. var/listening = TRUE // Whether the radio is currently receiving. @@ -240,19 +240,19 @@ var/datum/signal/subspace/vocal/signal = new(src, freq, speaker, language, message, spans, message_mods) // Independent radios, on the CentCom frequency, reach all independent radios - if (independent && (freq == FREQ_CENTCOM || freq == FREQ_SOLGOV || freq == FREQ_WIDEBAND || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE)) // Wasp Edit - SolGov Rep + if (independent && (freq == FREQ_CENTCOM || freq == FREQ_SOLGOV || freq == FREQ_WIDEBAND || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE)) //WS Edit - SolGov Rep signal.data["compression"] = 0 signal.transmission_method = TRANSMISSION_SUPERSPACE signal.levels = list(0) // reaches all Z-levels signal.broadcast() - playsound(src, "sound/effects/walkietalkie.ogg", 20, FALSE) // Wasp Edit - Radio chatter + playsound(src, "sound/effects/walkietalkie.ogg", 20, FALSE) //WS Edit - Radio chatter return // All radios make an attempt to use the subspace system first signal.send_to_receivers() - //At this point the signal was transmitted so play a sound // Wasp Edit - Radio chatter - playsound(src, "sound/effects/walkietalkie.ogg", 20, FALSE) // Wasp Edit - Radio chatter + //At this point the signal was transmitted so play a sound //WS Edit - Radio chatter + playsound(src, "sound/effects/walkietalkie.ogg", 20, FALSE) //WS Edit - Radio chatter // If the radio is subspace-only, that's all it can do if (subspace_transmission) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 52f1c03c036..6647bec12e1 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -21,7 +21,7 @@ GENE SCANNER name = "\improper T-ray scanner" desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." custom_price = 150 - icon = 'waspstation/icons/obj/tools.dmi' + icon = 'whitesands/icons/obj/tools.dmi' icon_state = "t-ray0" var/on = FALSE slot_flags = ITEM_SLOT_BELT @@ -153,12 +153,12 @@ GENE SCANNER if(H.undergoing_cardiac_arrest() && H.stat != DEAD) render_list += "Subject suffering from heart attack: Apply defibrillation or other electric shock immediately!\n" - //Wasp begin - Borers + //WS begin - Borers if(iscarbon(M)) var/mob/living/carbon/C = M if(C.has_brain_worms() && (!C.reagents.has_reagent(/datum/reagent/medicine/spaceacillin) || advanced)) render_list += "Foreign organism detected in subject's cranium. Recommended treatment: Dosage of sucrose solution and removal of object via surgery.\n" - //Wasp end + //WS end render_list += "Analyzing results for [M]:\nOverall status: [mob_status]\n" @@ -303,12 +303,12 @@ GENE SCANNER if(advanced && H.has_dna()) render_list += "Genetic Stability: [H.dna.stability]%.\n" - var/list/broken_stuff = list() // Wasp Edit Begin - Adds bone breakage + var/list/broken_stuff = list() //WS Edit Begin - Adds bone breakage for(var/obj/item/bodypart/B in H.bodyparts) if(B.bone_status >= BONE_FLAG_BROKEN) // Checks if bone is broken or splinted broken_stuff += B.name if(broken_stuff.len) - render_list += "\tBone fractures detected. Subject's [english_list(broken_stuff)] [broken_stuff.len > 1 ? "require" : "requires"] surgical treatment!\n" // Wasp Edit End + render_list += "\tBone fractures detected. Subject's [english_list(broken_stuff)] [broken_stuff.len > 1 ? "require" : "requires"] surgical treatment!\n" //WS Edit End // Species and body temperature var/datum/species/S = H.dna.species @@ -411,7 +411,7 @@ GENE SCANNER desc = "A hand-held environmental scanner which reports current gas levels. Alt-Click to use the built in barometer function." name = "analyzer" custom_price = 100 - icon = 'waspstation/icons/obj/tools.dmi' //Wasp edit - Better tools + icon = 'whitesands/icons/obj/tools.dmi' //WS edit - Better tools icon_state = "analyzer" item_state = "analyzer" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' @@ -461,11 +461,11 @@ GENE SCANNER var/co2_concentration = environment.get_moles(/datum/gas/carbon_dioxide)/total_moles var/plasma_concentration = environment.get_moles(/datum/gas/plasma)/total_moles - // WaspStation Start -- Atmos Analyzer Reformat (Issue #419) + //WS Start -- Atmos Analyzer Reformat (Issue #419) to_chat(user, "Results of analysis.") to_chat(user, "Pressure: [round(pressure,0.01)] kPa") to_chat(user, "Temperature: [round(environment.return_temperature()-T0C, 0.01)] °C ([round(environment.return_temperature(), 0.01)] K)") - // WaspStation End + //WS End if(abs(n2_concentration - N2STANDARD) < 20) to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/nitrogen), 0.01)] mol)") @@ -579,16 +579,16 @@ GENE SCANNER var/cached_scan_results = air_contents.analyzer_results if(total_moles > 0) - // WaspStation Start -- Atmos Analyzer Reformat (Issue #419) + //WS Start -- Atmos Analyzer Reformat (Issue #419) render_list += "Moles: [round(total_moles, 0.01)] mol\ \nVolume: [volume] L\ \nPressure: [round(pressure,0.01)] kPa\ \nTemperature: [round(temperature - T0C,0.01)] °C ([round(temperature, 0.01)] K)" - // WaspStation End + //WS End for(var/id in air_contents.get_gases()) var/gas_concentration = air_contents.get_moles(id)/total_moles - render_list += "[GLOB.meta_gas_info[id][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(air_contents.get_moles(id), 0.01)] mol)" // WaspStation Edit -- Atmos Analyzer Reformat (Issue #419) + render_list += "[GLOB.meta_gas_info[id][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(air_contents.get_moles(id), 0.01)] mol)" //WS Edit -- Atmos Analyzer Reformat (Issue #419) else render_list += airs.len > 1 ? "This node is empty!" : "[target] is empty!" diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 20bd3f19148..049c64f2946 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -118,7 +118,7 @@ breakouttime = 30 SECONDS cuffsound = 'sound/weapons/cablecuff.ogg' -/*Wasp - Smartwire Revert +/*WS - Smartwire Revert /obj/item/restraints/handcuffs/cable/Initialize(mapload, param_color) . = ..() diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index d789c4fa012..039c9a239b0 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -454,11 +454,11 @@ title = "Chemical Factories Without Narcotics" page_link = "Guide_to_plumbing" -//Wasp Addition - Spacepods +//WS Addition - Spacepods /obj/item/book/manual/wiki/spacepod name = "Guide to Podracing" icon_state = "bookParticleAccelerator" author = "Bananakin" title = "Guide to Podracing" page_link = "Space_Pods" -//Wasp End +//WS End diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index bf7bddf87c8..f2cf54d3e67 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -7,7 +7,7 @@ w_class = WEIGHT_CLASS_SMALL resistance_flags = FLAMMABLE var/list/squeak_override //Weighted list; If you want your plush to have different squeak sounds use this - var/should_squeak = TRUE //Waspstation edit: really shitty spritercode + var/should_squeak = TRUE //WS edit: really shitty spritercode var/stuffed = TRUE //If the plushie has stuffing in it var/obj/item/grenade/grenade //You can remove the stuffing from a plushie and add a grenade to it for *nefarious uses* //--love ~<3-- @@ -690,13 +690,13 @@ user.dust(just_ash = FALSE, drop_items = TRUE) return MANUAL_SUICIDE -/obj/item/toy/plush/hornet //wasp begin: spritercode +/obj/item/toy/plush/hornet //WS begin: spritercode name = "strange bug plushie" desc = "A cute, soft plush of a long-horned bug." - icon = 'waspstation/icons/obj/plushes.dmi' + icon = 'whitesands/icons/obj/plushes.dmi' icon_state = "plushie_hornet" attack_verb = list("poked", "shaws") - squeak_override = list('waspstation/sound/hornetnoises/hornet_gitgud.ogg'=1, 'waspstation/sound/hornetnoises/hornet_SHAW.ogg'=10) //i have no clue how this works, the intended effect is that "git gud" will play 1 out of 11 times + squeak_override = list('whitesands/sound/hornetnoises/hornet_gitgud.ogg'=1, 'whitesands/sound/hornetnoises/hornet_SHAW.ogg'=10) //i have no clue how this works, the intended effect is that "git gud" will play 1 out of 11 times gender = FEMALE /obj/item/toy/plush/hornet/gay @@ -707,7 +707,7 @@ /obj/item/toy/plush/knight name = "odd bug plushie" desc = "A cute, soft plush of a little bug. It sounds like this one didn't come with a voice box." - icon = 'waspstation/icons/obj/plushes.dmi' + icon = 'whitesands/icons/obj/plushes.dmi' icon_state = "plushie_knight" attack_verb = list("poked") - should_squeak = FALSE //wasp end + should_squeak = FALSE //WS end diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index a7c31197cb2..78ccf6efd46 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -12,8 +12,8 @@ max_integrity = 40 novariants = FALSE item_flags = NOBLUDGEON - var/splint_fracture = FALSE //WaspStation Edit- Splints - var/failure_chance //Waspstation Edit - Failure chance + var/splint_fracture = FALSE //WS Edit- Splints + var/failure_chance //WS Edit - Failure chance var/self_delay = 50 var/other_delay = 0 var/repeating = FALSE @@ -57,11 +57,11 @@ to_chat(user, "\The [src] won't work on a robotic limb!") return - //Waspstation begin - failure chance + //WS begin - failure chance if(prob(failure_chance)) user.visible_message("[user] tries to apply \the [src] on [C]'s [affecting.name], but fails!", "You try to apply \the [src] on on [C]'s [affecting.name], but fail!") return - //Waspstation end + //WS end if(affecting.brute_dam && brute || affecting.burn_dam && burn) user.visible_message("[user] applies \the [src] on [C]'s [affecting.name].", "You apply \the [src] on [C]'s [affecting.name].") @@ -76,7 +76,7 @@ return TRUE - //WaspStation Begin - Splints + //WS Begin - Splints if(splint_fracture) //Check if it's a splint and the bone is broken if(affecting.body_part in list(CHEST, HEAD)) // Check if it isn't the head or chest to_chat(user, "You can't splint that bodypart!") @@ -91,7 +91,7 @@ C.update_inv_splints() user.visible_message("[user] applies [src] on [C].", "You apply [src] on [C]'s [affecting.name].") return TRUE - //WaspStation End + //WS End to_chat(user, "[C]'s [affecting.name] can not be healed with \the [src]!") diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 4ade2d74806..24ab044a191 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -3,14 +3,14 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ new/datum/stack_recipe("table frame", /obj/structure/table_frame, 2, time = 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("scooter frame", /obj/item/scooter_frame, 10, time = 25, one_per_turf = 0), \ new/datum/stack_recipe("linen bin", /obj/structure/bedsheetbin/empty, 2, time = 5, one_per_turf = 0), \ - // Wasp start + //WS start null, \ new/datum/stack_recipe("fore port spacepod frame", /obj/item/pod_parts/pod_frame/fore_port, 15, time = 30, one_per_turf = 0), \ new/datum/stack_recipe("fore starboard spacepod frame", /obj/item/pod_parts/pod_frame/fore_starboard, 15, time = 30, one_per_turf = 0), \ new/datum/stack_recipe("aft port spacepod frame", /obj/item/pod_parts/pod_frame/aft_port, 15, time = 30, one_per_turf = 0), \ new/datum/stack_recipe("aft starboard spacepod frame", /obj/item/pod_parts/pod_frame/aft_starboard, 15, time = 30, one_per_turf = 0), \ null, \ - // Wasp end + //WS end new/datum/stack_recipe("railing", /obj/structure/railing, 3, time = 18, window_checks = TRUE), \ )) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 66f571c9a92..0f31033f505 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -118,7 +118,7 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \ /obj/item/stack/sheet/mineral/diamond/get_main_recipes() . = ..() . += GLOB.diamond_recipes - + /obj/item/stack/sheet/mineral/diamond/fifty amount = 50 @@ -155,7 +155,7 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \ /obj/item/stack/sheet/mineral/uranium/get_main_recipes() . = ..() . += GLOB.uranium_recipes - + /obj/item/stack/sheet/mineral/uranium/fifty amount = 50 @@ -209,7 +209,7 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \ /obj/item/stack/sheet/mineral/plasma/fire_act(exposed_temperature, exposed_volume) atmos_spawn_air("plasma=[amount*10];TEMP=[exposed_temperature]") qdel(src) - + /obj/item/stack/sheet/mineral/plasma/fifty amount = 50 @@ -290,7 +290,7 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \ /obj/item/stack/sheet/mineral/silver/get_main_recipes() . = ..() . += GLOB.silver_recipes - + /obj/item/stack/sheet/mineral/silver/fifty amount = 50 @@ -341,7 +341,7 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \ throw_range = 3 sheettype = "titanium" custom_materials = list(/datum/material/titanium=MINERAL_MATERIAL_AMOUNT) - grind_results = list(/datum/reagent/titanium = 20) // Wasp Edit - Adds titanium reagent + grind_results = list(/datum/reagent/titanium = 20) //WS Edit - Adds titanium reagent point_value = 20 merge_type = /obj/item/stack/sheet/mineral/titanium material_type = /datum/material/titanium @@ -358,7 +358,7 @@ GLOBAL_LIST_INIT(titanium_recipes, list ( \ /obj/item/stack/sheet/mineral/titanium/fifty amount = 50 - + /obj/item/stack/sheet/mineral/titanium/twenty amount = 20 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 9c459a9459f..22e2fc9b246 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -622,7 +622,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ w_class = WEIGHT_CLASS_NORMAL throw_speed = 1 throw_range = 3 - grind_results = list(/datum/reagent/calcium = 10) // Wasp Edit - Fuck + grind_results = list(/datum/reagent/calcium = 10) //WS Edit - Fuck merge_type = /obj/item/stack/sheet/bone material_type = /datum/material/bone diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index a1f33910cb7..8523bd234e0 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -222,7 +222,7 @@ /obj/item/storage/backpack/satchel/leather name = "leather satchel" desc = "It's a very fancy satchel made with fine leather." - icon = 'waspstation/icons/obj/storage.dmi' // Wasp Edit - Suitcases + icon = 'whitesands/icons/obj/storage.dmi' //WS Edit - Suitcases icon_state = "satchel" item_state = "satchel" @@ -403,7 +403,7 @@ new /obj/item/wrench(src) new /obj/item/weldingtool(src) new /obj/item/crowbar(src) - new /obj/item/stack/cable_coil/random(src) //Random from Wasp Smartwire Revert + new /obj/item/stack/cable_coil/random(src) //Random from WS Smartwire Revert new /obj/item/wirecutters(src) new /obj/item/multitool(src) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 3d3ac1622fc..99851a17719 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -100,10 +100,10 @@ /obj/item/storage/bag/ore name = "mining satchel" desc = "This little bugger can be used to store and transport ores." - //WaspStation Begin - Better bag sprites - icon = 'waspstation/icons/obj/bags.dmi' + //WS Begin - Better bag sprites + icon = 'whitesands/icons/obj/bags.dmi' icon_state = "minebag" - //WaspStation end + //WS end slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS component_type = /datum/component/storage/concrete/stack var/spam_protection = FALSE //If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it @@ -172,10 +172,10 @@ /obj/item/storage/bag/ore/holding //miners, your messiah has arrived name = "mining satchel of holding" desc = "A revolution in convenience, this satchel allows for huge amounts of ore storage. It's been outfitted with anti-malfunction safety measures." - //WaspStation Begin - Better bag sprites - icon = 'waspstation/icons/obj/bags.dmi' + //WS Begin - Better bag sprites + icon = 'whitesands/icons/obj/bags.dmi' icon_state = "minebagbs" - //WaspStation end + //WS end /obj/item/storage/bag/ore/holding/ComponentInitialize() . = ..() @@ -190,10 +190,10 @@ /obj/item/storage/bag/plants name = "plant bag" - //WaspStation Begin - Better bag sprites - icon = 'waspstation/icons/obj/bags.dmi' + //WS Begin - Better bag sprites + icon = 'whitesands/icons/obj/bags.dmi' icon_state = "plantbag" - //WaspStation end + //WS end resistance_flags = FLAMMABLE /obj/item/storage/bag/plants/ComponentInitialize() @@ -365,10 +365,10 @@ /obj/item/storage/bag/chemistry name = "chemistry bag" - //WaspStation Begin - Better bag sprites - icon = 'waspstation/icons/obj/bags.dmi' + //WS Begin - Better bag sprites + icon = 'whitesands/icons/obj/bags.dmi' icon_state = "chembag" - //WaspStation end + //WS end desc = "A bag for storing pills, patches, and bottles." resistance_flags = FLAMMABLE @@ -395,10 +395,10 @@ /obj/item/storage/bag/bio name = "bio bag" - //WaspStation Begin - Better bag sprites - icon = 'waspstation/icons/obj/bags.dmi' + //WS Begin - Better bag sprites + icon = 'whitesands/icons/obj/bags.dmi' icon_state = "virobag" - //WaspStation end + //WS end desc = "A bag for the safe transportation and disposal of biowaste and other biological materials." resistance_flags = FLAMMABLE @@ -428,10 +428,10 @@ /obj/item/storage/bag/construction name = "construction bag" - //WaspStation Begin - Better bag sprites - icon = 'waspstation/icons/obj/bags.dmi' + //WS Begin - Better bag sprites + icon = 'whitesands/icons/obj/bags.dmi' icon_state = "engbag" - //WaspStation end + //WS end desc = "A bag for storing small construction components." resistance_flags = FLAMMABLE diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 435ef0a3917..931d9d85ec1 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -65,9 +65,9 @@ /obj/item/pipe_dispenser, /obj/item/inducer, /obj/item/plunger, - /obj/item/clothing/glasses/welding, //wasp edit: ok mald sure I'll add the welding stuff to the. ok. + /obj/item/clothing/glasses/welding, //WS edit: ok mald sure I'll add the welding stuff to the. ok. /obj/item/clothing/mask/gas/welding, - /obj/item/clothing/head/welding //wasp end + /obj/item/clothing/head/welding //WS end )) /obj/item/storage/belt/utility/chief @@ -236,7 +236,7 @@ /obj/item/clothing/gloves, /obj/item/restraints/legcuffs/bola, /obj/item/holosign_creator/security, - /obj/item/stock_parts/cell/gun //waspstation edit Gun cells fit where they should and not where they dont + /obj/item/stock_parts/cell/gun //WS edit Gun cells fit where they should and not where they dont )) /obj/item/storage/belt/security/full/PopulateContents() diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 1f0246a9722..74f802995a1 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -260,7 +260,7 @@ /obj/item/storage/box/hypospray name = "hypospray mk. II kit" - icon = 'waspstation/icons/obj/storage.dmi' // Wasp Edit - Suitcases + icon = 'whitesands/icons/obj/storage.dmi' //WS Edit - Suitcases icon_state = "medbriefcase" illustration = null @@ -1214,7 +1214,7 @@ /obj/item/storage/box/dishdrive/PopulateContents() var/static/items_inside = list( /obj/item/stack/sheet/metal/five = 1, - /obj/item/stack/cable_coil/random/five = 1, //Random from Smartwire Revert - Waspie Bois + /obj/item/stack/cable_coil/random/five = 1, //Random from Smartwire Revert - WSie Bois /obj/item/circuitboard/machine/dish_drive = 1, /obj/item/stack/sheet/glass = 1, /obj/item/stock_parts/manipulator = 1, diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index 1cf4e113aec..1cd0acf8a88 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -1,7 +1,7 @@ /obj/item/storage/briefcase name = "briefcase" desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." - icon = 'waspstation/icons/obj/storage.dmi' //Wasp edit - Better briefcases + icon = 'whitesands/icons/obj/storage.dmi' //WS edit - Better briefcases icon_state = "briefcase" lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi' diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 01503e8015a..131acaff153 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -9,7 +9,7 @@ * First Aid Kits */ -/* WaspStation Edit - In Modularized File +/*WS Edit - In Modularized File /obj/item/storage/firstaid name = "first-aid kit" @@ -499,4 +499,4 @@ for(var/i in 1 to 5) new /obj/item/reagent_containers/pill/paxpsych(src) -WaspStation End */ +WS End */ diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index 3727dd9ffa6..35e4899b090 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -1,5 +1,5 @@ -/* WaspStation Begin - Holsters are Accessories +/*WS Begin - Holsters are Accessories /obj/item/storage/belt/holster @@ -122,4 +122,4 @@ )) -WaspStation End */ +WS End */ diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 43aefe8ab48..1df3a834a80 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -3,15 +3,15 @@ desc = "A locked box." icon_state = "lockbox+l" item_state = "syringe_kit" - icon = 'waspstation/icons/obj/storage.dmi' //Wasp edit - better briefcases + icon = 'whitesands/icons/obj/storage.dmi' //WS edit - better briefcases lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' w_class = WEIGHT_CLASS_BULKY req_access = list(ACCESS_ARMORY) var/broken = FALSE var/open = FALSE - var/icon_locked = "lockbox" //Waspstation edit - fix lockbox sprites - var/icon_closed = "lockbox+l" //Waspstation edit - fix lockbox sprites + var/icon_locked = "lockbox" //WS edit - fix lockbox sprites + var/icon_closed = "lockbox+l" //WS edit - fix lockbox sprites var/icon_broken = "lockbox+b" /obj/item/storage/lockbox/ComponentInitialize() diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 23608e7fe38..af91b552203 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -117,7 +117,7 @@ // ----------------------------- /obj/item/storage/secure/briefcase name = "secure briefcase" - icon = 'waspstation/icons/obj/storage.dmi' //Wasp edit - better briefcases + icon = 'whitesands/icons/obj/storage.dmi' //WS edit - better briefcases icon_state = "secure" item_state = "sec-case" lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 12fb2d6b3f0..c6c0e3e13b3 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -71,12 +71,12 @@ material_flags = NONE /obj/item/storage/toolbox/mechanical/PopulateContents() - //WaspStation Edit - Better Tool sprites + //WS Edit - Better Tool sprites if(prob(50)) new /obj/item/wrench(src) else new /obj/item/wrench/crescent(src) - //WaspStation End + //WS End new /obj/item/screwdriver(src) new /obj/item/weldingtool(src) new /obj/item/crowbar(src) @@ -172,11 +172,11 @@ /obj/item/storage/toolbox/syndicate/PopulateContents() new /obj/item/screwdriver/nuke(src) - new /obj/item/wrench/syndie(src) //WaspStation Edit - Cool Syndie Tools + new /obj/item/wrench/syndie(src) //WS Edit - Cool Syndie Tools new /obj/item/weldingtool/largetank(src) - new /obj/item/crowbar/syndie(src) //WaspStation Begin - Cool Syndie Tools + new /obj/item/crowbar/syndie(src) //WS Begin - Cool Syndie Tools new /obj/item/wirecutters/syndie(src) - new /obj/item/multitool/syndie(src) //WaspStation End + new /obj/item/multitool/syndie(src) //WS End new /obj/item/clothing/gloves/combat(src) /obj/item/storage/toolbox/drone diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index eb6da256308..3f05070c245 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -23,7 +23,7 @@ toggle_internals(user) /obj/item/tank/proc/toggle_internals(mob/user) - var/mob/living/carbon/H = user //Wasp Port - Citadel Internals + var/mob/living/carbon/H = user //WS Port - Citadel Internals if(!istype(H)) return @@ -33,7 +33,7 @@ H.update_internals_hud_icon(0) else if(!H.getorganslot(ORGAN_SLOT_BREATHING_TUBE)) - //Wasp Port Begin - Citadel Internals + //WS Port Begin - Citadel Internals var/obj/item/clothing/check var/internals = FALSE @@ -48,7 +48,7 @@ if(!internals) to_chat(H, "You are not wearing an internals mask!") return - //Wasp Port End - Citadel Internals + //WS Port End - Citadel Internals if(H.internal) to_chat(H, "You switch your internals to [src].") diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index 203709cc207..96f3a42952d 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -86,7 +86,7 @@ /obj/item/screwdriver/nuke name = "screwdriver" desc = "A screwdriver with an ultra thin tip that's carefully designed to boost screwing speed." -// icon = 'icons/obj/nuke_tools.dmi' Wasp edit - better tool sprites +// icon = 'icons/obj/nuke_tools.dmi' WS edit - better tool sprites icon_state = "screwdriver_nuke" item_state = "screwdriver_nuke" toolspeed = 0.5 diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 56b6f4d4464..a3202135e53 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -1,10 +1,10 @@ /obj/item/crowbar name = "pocket crowbar" desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors." - icon = 'waspstation/icons/obj/tools.dmi' //WaspStation Edit - Better Tool Sprites + icon = 'whitesands/icons/obj/tools.dmi' //WS Edit - Better Tool Sprites icon_state = "crowbar" - lefthand_file = 'waspstation/icons/mob/inhands/equipment/tools_lefthand.dmi' //wasp edit: i finally do those god forsaken inhands - righthand_file = 'waspstation/icons/mob/inhands/equipment/tools_righthand.dmi' + lefthand_file = 'whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi' //WS edit: i finally do those god forsaken inhands + righthand_file = 'whitesands/icons/mob/inhands/equipment/tools_righthand.dmi' usesound = 'sound/items/crowbar.ogg' flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index 57194125899..ea932c3cd65 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -1,7 +1,7 @@ /obj/item/screwdriver name = "screwdriver" desc = "You can be totally screwy with this." - icon = 'waspstation/icons/obj/tools.dmi' //WaspStation Edit - Better Tool Sprites + icon = 'whitesands/icons/obj/tools.dmi' //WS Edit - Better Tool Sprites icon_state = "screwdriver_map" item_state = "screwdriver" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' @@ -22,7 +22,7 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) drop_sound = 'sound/items/handling/screwdriver_drop.ogg' pickup_sound = 'sound/items/handling/screwdriver_pickup.ogg' - item_flags = SURGICAL_TOOL | EYE_STAB //Waspstation - Fix IPC surgery + item_flags = SURGICAL_TOOL | EYE_STAB //WS - Fix IPC surgery var/random_color = TRUE //if the screwdriver uses random coloring var/static/list/screwdriver_colors = list( "blue" = "#8080ff", @@ -65,13 +65,13 @@ /obj/item/screwdriver/get_belt_overlay() if(random_color) - var/mutable_appearance/body = mutable_appearance('waspstation/icons/obj/clothing/belt_overlays.dmi', "screwdriver") - var/mutable_appearance/head = mutable_appearance('waspstation/icons/obj/clothing/belt_overlays.dmi', "screwdriver_head") + var/mutable_appearance/body = mutable_appearance('whitesands/icons/obj/clothing/belt_overlays.dmi', "screwdriver") + var/mutable_appearance/head = mutable_appearance('whitesands/icons/obj/clothing/belt_overlays.dmi', "screwdriver_head") body.color = color head.add_overlay(body) return head else - return mutable_appearance('waspstation/icons/obj/clothing/belt_overlays.dmi', icon_state) + return mutable_appearance('whitesands/icons/obj/clothing/belt_overlays.dmi', icon_state) /obj/item/screwdriver/abductor name = "alien screwdriver" @@ -84,7 +84,7 @@ random_color = FALSE /obj/item/screwdriver/abductor/get_belt_overlay() - return mutable_appearance('waspstation/icons/obj/clothing/belt_overlays.dmi', "screwdriver_nuke") + return mutable_appearance('whitesands/icons/obj/clothing/belt_overlays.dmi', "screwdriver_nuke") /obj/item/screwdriver/power name = "hand drill" diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index cc60a70252d..e0ee3ae4f8a 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -2,7 +2,7 @@ /obj/item/weldingtool name = "welding tool" desc = "A standard edition welder provided by Nanotrasen." - icon = 'waspstation/icons/obj/tools.dmi' //WaspStation Edit - Better Tool Sprites + icon = 'whitesands/icons/obj/tools.dmi' //WS Edit - Better Tool Sprites icon_state = "welder" item_state = "welder" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' @@ -368,9 +368,9 @@ item_state = "exwelder" max_fuel = 40 custom_materials = list(/datum/material/iron=70, /datum/material/glass=120) - /* Wasp Begin - Better Tool sprites + /*WS Begin - Better Tool sprites change_icons = 0 - Wasp End */ + WS End */ can_off_process = 1 light_range = 1 toolspeed = 0.5 diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index c430a0add59..5417096d2c8 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -1,7 +1,7 @@ /obj/item/wirecutters name = "wirecutters" desc = "This cuts wires." - icon = 'waspstation/icons/obj/tools.dmi' //WaspStation Edit - Better Tool Sprites + icon = 'whitesands/icons/obj/tools.dmi' //WS Edit - Better Tool Sprites icon_state = "cutters_map" item_state = "cutters" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' @@ -52,13 +52,13 @@ /obj/item/wirecutters/get_belt_overlay() if(random_color) - var/mutable_appearance/body = mutable_appearance('waspstation/icons/obj/clothing/belt_overlays.dmi', "cutters") - var/mutable_appearance/head = mutable_appearance('waspstation/icons/obj/clothing/belt_overlays.dmi', "cutters_head") + var/mutable_appearance/body = mutable_appearance('whitesands/icons/obj/clothing/belt_overlays.dmi', "cutters") + var/mutable_appearance/head = mutable_appearance('whitesands/icons/obj/clothing/belt_overlays.dmi', "cutters_head") body.color = color head.add_overlay(body) return head else - return mutable_appearance('waspstation/icons/obj/clothing/belt_overlays.dmi', icon_state) + return mutable_appearance('whitesands/icons/obj/clothing/belt_overlays.dmi', icon_state) /obj/item/wirecutters/attack(mob/living/carbon/C, mob/user) if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index 6517d403f32..6922c6d7344 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -1,10 +1,10 @@ /obj/item/wrench name = "wrench" desc = "A wrench with common uses. Can be found in your hand. This one is a pipe wrench." - icon = 'waspstation/icons/obj/tools.dmi' + icon = 'whitesands/icons/obj/tools.dmi' icon_state = "wrench_pipe" //now where could my pipe wrench be? - lefthand_file = 'waspstation/icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'waspstation/icons/mob/inhands/equipment/tools_righthand.dmi' + lefthand_file = 'whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'whitesands/icons/mob/inhands/equipment/tools_righthand.dmi' flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT force = 5 diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index a4ac76ea23c..5010a5efa70 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -534,14 +534,14 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 ///The vehicle counterpart for the board var/board_item_type = /obj/vehicle/ridden/scooter/skateboard -/obj/item/melee/skateboard/suicide_act(mob/living/carbon/user) // Wasp Edit Begin - Skateboards can take you to the afterlife +/obj/item/melee/skateboard/suicide_act(mob/living/carbon/user) //WS Edit Begin - Skateboards can take you to the afterlife user.visible_message("[user] begins attempting to preform a double kickflip! It looks like [user.p_theyre()] trying to commit suicide!") if(prob(3)) user.dust() user.visible_message("[user] succeeds! [user.p_theyre()] ascends for a moment before exploding into a fine dust!") //this is very likely to cause issues in the future, yell at the coder for(var/mob/living/M in get_hearers_in_view(7,user)) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "Rad", /datum/mood_event/dkickflip) - return BRUTELOSS // Wasp Edit End + return BRUTELOSS //WS Edit End /obj/item/melee/skateboard/attack_self(mob/user) var/obj/vehicle/ridden/scooter/skateboard/S = new board_item_type(get_turf(user))//this probably has fucky interactions with telekinesis but for the record it wasnt my fault diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index 5a8857cba43..a9fa37e6e22 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -279,12 +279,12 @@ icon = "maidcafe" desc = "Welcome back, master!" -//Waspstation edit - Jackpot Brew +//WS edit - Jackpot Brew /datum/barsign/jackpotbrew name = "Jackpot Brews" icon = "jackpotbrew" desc = "Gambling and alcohol, nothing could go wrong with this combo!" -//End waspstation edit +//EndWS edit /datum/barsign/the_lightbulb name = "The Lightbulb" diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index eecdeae030d..613ab366610 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -1,7 +1,7 @@ /obj/structure/chair name = "chair" desc = "You sit in this. Either by will or force." - icon = 'waspstation/icons/obj/chairs.dmi' //WaspStation Edit - Better Icons + icon = 'whitesands/icons/obj/chairs.dmi' //WS Edit - Better Icons icon_state = "chair" anchored = TRUE can_buckle = TRUE @@ -163,7 +163,7 @@ return ..() /obj/structure/chair/comfy/proc/GetArmrest() - return mutable_appearance('waspstation/icons/obj/chairs.dmi', "comfychair_armrest") //WaspStation Edit - Better Icons + return mutable_appearance('whitesands/icons/obj/chairs.dmi', "comfychair_armrest") //WS Edit - Better Icons /obj/structure/chair/comfy/Destroy() QDEL_NULL(armrest) @@ -205,7 +205,7 @@ buildstacktype = /obj/item/stack/sheet/mineral/titanium /obj/structure/chair/comfy/shuttle/GetArmrest() - return mutable_appearance('waspstation/icons/obj/chairs.dmi', "shuttle_chair_armrest") + return mutable_appearance('whitesands/icons/obj/chairs.dmi', "shuttle_chair_armrest") /obj/structure/chair/office anchored = FALSE @@ -258,7 +258,7 @@ /obj/item/chair name = "chair" desc = "Bar brawl essential." - icon = 'waspstation/icons/obj/chairs.dmi' //WaspStation Edit - Better Icons + icon = 'whitesands/icons/obj/chairs.dmi' //WS Edit - Better Icons icon_state = "chair_toppled" item_state = "chair" lefthand_file = 'icons/mob/inhands/misc/chairs_lefthand.dmi' diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 9833eeeadb4..ffd2cc9b4ae 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -124,7 +124,7 @@ /obj/item/clothing/under/rank/security/officer = 3, /obj/item/clothing/under/rank/security/officer/skirt = 2, /obj/item/clothing/shoes/jackboots = 3, - /obj/item/clothing/head/beret/sec = 3, // Waspstation edit - Berets + /obj/item/clothing/head/beret/sec = 3, //WS edit - Berets /obj/item/clothing/head/soft/sec = 3, /obj/item/clothing/mask/bandana/red = 2) generate_items_inside(items_inside,src) @@ -150,7 +150,7 @@ /obj/structure/closet/wardrobe/atmospherics_yellow/PopulateContents() var/static/items_inside = list( - /obj/item/clothing/head/beret/atmos = 3, // Waspstation edit - Berets + /obj/item/clothing/head/beret/atmos = 3, //WS edit - Berets /obj/item/clothing/accessory/pocketprotector = 1, /obj/item/storage/backpack/duffelbag/engineering = 1, /obj/item/storage/backpack/satchel/eng = 1, @@ -175,7 +175,7 @@ /obj/item/clothing/under/rank/engineering/engineer = 3, /obj/item/clothing/suit/hazardvest = 3, /obj/item/clothing/shoes/workboots = 3, - /obj/item/clothing/head/beret/eng = 3, // Waspstation edit - Berets + /obj/item/clothing/head/beret/eng = 3, //WS edit - Berets /obj/item/clothing/head/hardhat = 3) generate_items_inside(items_inside,src) return @@ -199,7 +199,7 @@ /obj/item/clothing/suit/toggle/labcoat = 3, /obj/item/clothing/suit/toggle/labcoat/paramedic = 3, /obj/item/clothing/shoes/sneakers/white = 3, - /obj/item/clothing/head/beret/med = 3, // Waspstation edit - Berets + /obj/item/clothing/head/beret/med = 3, //WS edit - Berets /obj/item/clothing/head/soft/paramedic = 3) generate_items_inside(items_inside,src) return @@ -215,7 +215,7 @@ /obj/item/clothing/suit/toggle/labcoat = 2, /obj/item/clothing/shoes/sneakers/black = 2, /obj/item/clothing/gloves/fingerless = 2, - /obj/item/clothing/head/beret/sci = 2, // Waspstation edit - Berets + /obj/item/clothing/head/beret/sci = 2, //WS edit - Berets /obj/item/clothing/head/soft/black = 2) generate_items_inside(items_inside,src) if(prob(40)) @@ -266,7 +266,7 @@ /obj/item/clothing/shoes/sneakers/white = 2, /obj/item/clothing/suit/toggle/labcoat/virologist = 2, /obj/item/clothing/mask/surgical = 2, - /obj/item/clothing/head/beret/med = 2, // Waspstation edit - Berets + /obj/item/clothing/head/beret/med = 2, //WS edit - Berets /obj/item/storage/backpack/virology = 2, /obj/item/storage/backpack/satchel/vir = 2) generate_items_inside(items_inside,src) @@ -286,7 +286,7 @@ /obj/item/clothing/suit/toggle/labcoat/science = 3, /obj/item/clothing/shoes/sneakers/white = 3, /obj/item/radio/headset/headset_sci = 2, - /obj/item/clothing/head/beret/sci = 3, // Waspstation edit - Berets + /obj/item/clothing/head/beret/sci = 3, //WS edit - Berets /obj/item/clothing/mask/gas = 3) generate_items_inside(items_inside,src) return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 9238fa0c18b..5115b0d9fe8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -5,8 +5,8 @@ /obj/structure/closet/secure_closet/quartermaster/PopulateContents() ..() - new /obj/item/stack/tape(src) //Waspstation Edit - Tape - new /obj/item/card/id/departmental_budget/car(src)//WaspStation Edit - Budget Cards + new /obj/item/stack/tape(src) //WS Edit - Tape + new /obj/item/card/id/departmental_budget/car(src)//WS Edit - Budget Cards new /obj/item/clothing/neck/cloak/qm(src) new /obj/item/storage/lockbox/medal/cargo(src) new /obj/item/clothing/under/rank/cargo/qm(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 8aaaba97bf8..6e290b5ecc3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -5,12 +5,12 @@ /obj/structure/closet/secure_closet/engineering_chief/PopulateContents() ..() - //WaspStation Begin + //WS Begin new /obj/item/clothing/head/beret/ce(src) //Berets new /obj/item/clothing/under/rank/command(src) //Better command uniforms new /obj/item/card/id/departmental_budget/eng(src) //Budger Cards new /obj/item/stack/tape/industrial/pro(src) //Better tape - //WaspStation End + //WS End new /obj/item/clothing/neck/cloak/ce(src) new /obj/item/clothing/under/rank/engineering/chief_engineer(src) new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src) @@ -41,9 +41,9 @@ /obj/structure/closet/secure_closet/engineering_electrical/PopulateContents() ..() var/static/items_inside = list( - //Waspstation Begin + //WS Begin /obj/item/stack/tape/industrial/electrical = 1, // Better tape - //Waspstation End + //WS End /obj/item/clothing/gloves/color/yellow = 2, /obj/item/inducer = 2, /obj/item/storage/toolbox/electrical = 3, @@ -72,10 +72,10 @@ /obj/structure/closet/secure_closet/engineering_personal/PopulateContents() ..() - new /obj/item/stack/tape/industrial(src) // Waspstation edit - Tape - new /obj/item/clothing/head/beret/eng(src) // Waspstation edit - Berets + new /obj/item/stack/tape/industrial(src) //WS edit - Tape + new /obj/item/clothing/head/beret/eng(src) //WS edit - Berets new /obj/item/clothing/head/safety_helmet(src) - new /obj/item/clothing/glasses/meson/prescription(src) //Waspstation edit - Prescription HUDs + new /obj/item/clothing/glasses/meson/prescription(src) //WS edit - Prescription HUDs new /obj/item/radio/headset/headset_eng(src) new /obj/item/storage/toolbox/mechanical(src) new /obj/item/tank/internals/emergency_oxygen/engi(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 9550025a76a..7bb6c77f63e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -37,12 +37,12 @@ /obj/structure/closet/secure_closet/medical3/PopulateContents() ..() - //WaspStation Begin + //WS Begin new /obj/item/storage/box/hypospray(src) //Hypo Mk. 2s new /obj/item/storage/bag/medical(src) //Medibags new /obj/item/clothing/head/beret/med(src) //Berets new /obj/item/clothing/glasses/hud/health/prescription(src) //Prescription HUDs - //WaspStation End + //WS End new /obj/item/radio/headset/headset_med(src) new /obj/item/defibrillator/loaded(src) new /obj/item/clothing/gloves/color/latex/nitrile(src) @@ -79,14 +79,14 @@ /obj/structure/closet/secure_closet/CMO/PopulateContents() ..() - //WaspStation Begin + //WS Begin new /obj/item/storage/belt/medical(src) //Gives the CMO a belt new /obj/item/storage/bag/medical(src) //Medibags new /obj/item/clothing/head/beret/cmo(src) //Berets new /obj/item/clothing/under/rank/command(src) //Better command uniforms new /obj/item/storage/box/hypospray/CMO(src) //Hypo mk. 2s new /obj/item/card/id/departmental_budget/med(src) //Budget cards - //WaspStation End + //WS End new /obj/item/clothing/neck/cloak/cmo(src) new /obj/item/clothing/suit/bio_suit/cmo(src) new /obj/item/clothing/head/bio_hood/cmo(src) @@ -142,6 +142,6 @@ new /obj/item/reagent_containers/dropper(src) new /obj/item/storage/box/syringes/variety(src) new /obj/item/storage/box/beakers/variety(src) - new /obj/item/clothing/head/beret/chem(src) // Wasp edit - Berets - new /obj/item/clothing/glasses/science/prescription(src) // Wasp Edit - Prescription HUDs + new /obj/item/clothing/head/beret/chem(src) //WS edit - Berets + new /obj/item/clothing/glasses/science/prescription(src) //WS Edit - Prescription HUDs new /obj/item/clothing/glasses/science(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index e5e946c9f7d..4ae2dc929df 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -5,9 +5,9 @@ /obj/structure/closet/secure_closet/RD/PopulateContents() ..() - new /obj/item/clothing/head/beret/rd(src) // Waspstation edit - Berets - new /obj/item/card/id/departmental_budget/sci(src) // WaspStation Edit - Budget Cards - new /obj/item/clothing/under/rank/command(src) // WaspStation edit - better command uniforms + new /obj/item/clothing/head/beret/rd(src) //WS edit - Berets + new /obj/item/card/id/departmental_budget/sci(src) //WS Edit - Budget Cards + new /obj/item/clothing/under/rank/command(src) //WS edit - better command uniforms new /obj/item/clothing/neck/cloak/rd(src) new /obj/item/clothing/suit/bio_suit/scientist(src) new /obj/item/clothing/head/bio_hood/scientist(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index fabddf61cf3..134c56a3d4f 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -5,11 +5,11 @@ /obj/structure/closet/secure_closet/captains/PopulateContents() ..() - //WaspStation Begin + //WS Begin new /obj/item/clothing/head/beret/captain(src) //Berets new /obj/item/card/id/departmental_budget/civ(src) //Budget Cards new /obj/item/storage/backpack/messenger/com(src) //Messenger Bags - //WaspStation End + //WS End new /obj/item/clothing/suit/hooded/wintercoat/captain(src) if(prob(33)) new /obj/item/storage/backpack/captain(src) @@ -48,12 +48,12 @@ /obj/structure/closet/secure_closet/head_of_personnel/PopulateContents() ..() - new /obj/item/card/id/departmental_budget/srv(src) //WaspStation Edit - Budget Cards + new /obj/item/card/id/departmental_budget/srv(src) //WS Edit - Budget Cards new /obj/item/clothing/neck/cloak/head_of_personnel(src) new /obj/item/storage/lockbox/medal/service(src) - new /obj/item/clothing/head/beret/hop(src) //Waspstation edit - More Berets - new /obj/item/clothing/under/rank/command/head_of_personnel(src) //WaspStation Edit - Better Command Uniforms - new /obj/item/clothing/under/rank/command/head_of_personnel/skirt(src) //WaspStation Edit - Better Command Uniforms + new /obj/item/clothing/head/beret/hop(src) //WS edit - More Berets + new /obj/item/clothing/under/rank/command/head_of_personnel(src) //WS Edit - Better Command Uniforms + new /obj/item/clothing/under/rank/command/head_of_personnel/skirt(src) //WS Edit - Better Command Uniforms new /obj/item/clothing/head/hopcap(src) new /obj/item/cartridge/head_of_personnel(src) new /obj/item/radio/headset/heads/head_of_personnel(src) @@ -61,10 +61,10 @@ new /obj/item/storage/box/ids(src) new /obj/item/storage/box/ids(src) new /obj/item/megaphone/command(src) - new /obj/item/clothing/suit/armor/vest/hop(src) //Waspstation edit - Command Resprite 3 + new /obj/item/clothing/suit/armor/vest/hop(src) //WS edit - Command Resprite 3 new /obj/item/assembly/flash/handheld(src) new /obj/item/clothing/glasses/sunglasses(src) - new /obj/item/gun/energy/e_gun/mini(src) //WaspStation Edit - Gives HoP a mini egun + new /obj/item/gun/energy/e_gun/mini(src) //WS Edit - Gives HoP a mini egun new /obj/item/clothing/neck/petcollar(src) new /obj/item/pet_carrier(src) new /obj/item/door_remote/civilian(src) @@ -78,17 +78,17 @@ /obj/structure/closet/secure_closet/hos/PopulateContents() ..() - new /obj/item/card/id/departmental_budget/sec(src) //WaspStation edit - budget card - new /obj/item/storage/box/deputy(src) // WaspStation edit - Small QoL Brig additions + new /obj/item/card/id/departmental_budget/sec(src) //WS edit - budget card + new /obj/item/storage/box/deputy(src) //WS edit - Small QoL Brig additions new /obj/item/clothing/neck/cloak/hos(src) - new /obj/item/clothing/under/rank/command(src) // WaspStation edit - better command uniforms + new /obj/item/clothing/under/rank/command(src) //WS edit - better command uniforms new /obj/item/cartridge/hos(src) - new /obj/item/radio/headset/heads/hos/alt(src) // WaspStation edit - Small QoL Brig additions + new /obj/item/radio/headset/heads/hos/alt(src) //WS edit - Small QoL Brig additions new /obj/item/radio/headset/heads/hos(src) new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src) new /obj/item/clothing/under/rank/security/head_of_security/parade(src) new /obj/item/clothing/suit/armor/vest/leather(src) - new /obj/item/clothing/suit/armor/hos/trenchcoat(src) // WaspStation edit - Small QoL Brig additions + new /obj/item/clothing/suit/armor/hos/trenchcoat(src) //WS edit - Small QoL Brig additions new /obj/item/clothing/suit/armor/hos(src) new /obj/item/clothing/under/rank/security/head_of_security/skirt(src) new /obj/item/clothing/under/rank/security/head_of_security/alt(src) @@ -106,7 +106,7 @@ new /obj/item/shield/riot/tele(src) new /obj/item/storage/belt/security/full(src) new /obj/item/gun/energy/e_gun/hos(src) - new /obj/item/gun/ballistic/automatic/pistol/commander(src) // Waspstation edit - free lethals + new /obj/item/gun/ballistic/automatic/pistol/commander(src) //WS edit - free lethals new /obj/item/pinpointer/nuke(src) new /obj/item/circuitboard/machine/techfab/department/security(src) new /obj/item/storage/photo_album/HoS(src) @@ -132,11 +132,11 @@ new /obj/item/storage/box/flashbangs(src) new /obj/item/storage/belt/security/full(src) new /obj/item/flashlight/seclite(src) - new /obj/item/megaphone/sec(src) // WaspStation edit - Small QoL Brig additions + new /obj/item/megaphone/sec(src) //WS edit - Small QoL Brig additions new /obj/item/clothing/gloves/krav_maga/sec(src) new /obj/item/door_remote/head_of_security(src) new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src) - new /obj/item/gun/ballistic/automatic/pistol/commander(src) // Waspstation edit - free lethals + new /obj/item/gun/ballistic/automatic/pistol/commander(src) //WS edit - free lethals /obj/structure/closet/secure_closet/security name = "security officer's locker" @@ -149,12 +149,12 @@ new /obj/item/clothing/head/helmet/sec(src) new /obj/item/radio/headset/headset_sec(src) new /obj/item/radio/headset/headset_sec/alt(src) - //Waspstation begin - Prescription HUDs + //WS begin - Prescription HUDs if(prob(75)) new /obj/item/clothing/glasses/hud/security/sunglasses(src) else new /obj/item/clothing/glasses/hud/security/prescription(src) - //Waspstation end + //WS end new /obj/item/flashlight/seclite(src) /obj/structure/closet/secure_closet/security/sec @@ -162,7 +162,7 @@ /obj/structure/closet/secure_closet/security/sec/PopulateContents() ..() new /obj/item/storage/belt/security/full(src) - new /obj/item/gun/ballistic/automatic/pistol/commander/no_mag(src) // Waspstation edit - free lethals + new /obj/item/gun/ballistic/automatic/pistol/commander/no_mag(src) //WS edit - free lethals /obj/structure/closet/secure_closet/security/cargo @@ -210,7 +210,7 @@ new /obj/item/holosign_creator/security(src) new /obj/item/reagent_containers/spray/pepper(src) new /obj/item/clothing/suit/armor/vest/det_suit(src) - new /obj/item/clothing/accessory/holster/detective(src) //WaspStation Edit - Made Holsters Accessories + new /obj/item/clothing/accessory/holster/detective(src) //WS Edit - Made Holsters Accessories new /obj/item/pinpointer/crew(src) new /obj/item/binoculars(src) new /obj/item/clothing/neck/tie/red(src) @@ -335,10 +335,10 @@ ..() for(var/i in 1 to 3) new /obj/item/storage/box/lethalshot(src) - new /obj/item/ammo_box/magazine/co9mm(src) // Waspstation edit - begin - better safe than sorry + new /obj/item/ammo_box/magazine/co9mm(src) //WS edit - begin - better safe than sorry new /obj/item/ammo_box/magazine/co9mm(src) new /obj/item/ammo_box/magazine/co9mm(src) - new /obj/item/ammo_box/magazine/co9mm(src) // Waspstation edit - end + new /obj/item/ammo_box/magazine/co9mm(src) //WS edit - end /obj/structure/closet/secure_closet/labor_camp_security name = "labor camp security locker" diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index f1be4358739..d38cc7d0d1c 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -16,7 +16,7 @@ new /obj/item/storage/belt/military(src) new /obj/item/crowbar/syndie(src) new /obj/item/clothing/glasses/night(src) - new /obj/item/clothing/accessory/holster/nukie(src) //WASPSTATION EDIT - HOLSTERS AS ACCESSORIES + new /obj/item/clothing/accessory/holster/nukie(src) //WS EDIT - HOLSTERS AS ACCESSORIES /obj/structure/closet/syndicate/nuclear desc = "It's a storage unit for a Syndicate boarding party." diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index ff05ab484dc..1b99265b446 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -108,11 +108,11 @@ if(prob(20)) new /obj/item/storage/belt/utility(src) if(prob(30)) - new /obj/item/stack/cable_coil/random(src) //Random from Wasp Smartwire Revert + new /obj/item/stack/cable_coil/random(src) //Random from WS Smartwire Revert if(prob(30)) - new /obj/item/stack/cable_coil/random(src) //Random from Wasp Smartwire Revert + new /obj/item/stack/cable_coil/random(src) //Random from WS Smartwire Revert if(prob(30)) - new /obj/item/stack/cable_coil/random(src) //Random from Wasp Smartwire Revert + new /obj/item/stack/cable_coil/random(src) //Random from WS Smartwire Revert if(prob(20)) new /obj/item/multitool(src) if(prob(5)) diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index 6810d0577d4..133f25afdb4 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -233,9 +233,9 @@ /obj/structure/door_assembly/door_assembly_titanium name = "titanium airlock assembly" - icon = 'waspstation/icons/obj/doors/airlocks/shuttle/shuttle.dmi' + icon = 'whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi' base_name = "shuttle airlock" - overlays_file = 'waspstation/icons/obj/doors/airlocks/shuttle/overlays.dmi' + overlays_file = 'whitesands/icons/obj/doors/airlocks/shuttle/overlays.dmi' glass_type = /obj/machinery/door/airlock/titanium/glass airlock_type = /obj/machinery/door/airlock/titanium mineral = "titanium" diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index b32e383b317..1f2556a6cb8 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -1,7 +1,7 @@ /obj/structure/extinguisher_cabinet name = "extinguisher cabinet" desc = "A small wall mounted cabinet designed to hold a fire extinguisher." - icon = 'waspstation/icons/obj/wallmounts.dmi' //WaspStation Edit - Better Icons + icon = 'whitesands/icons/obj/wallmounts.dmi' //WS Edit - Better Icons icon_state = "extinguisher_closed" anchored = TRUE density = FALSE diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index b954aac1315..ab5d321abb0 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -324,7 +324,7 @@ /obj/structure/falsewall/titanium name = "wall" desc = "A light-weight titanium wall used in shuttles." - icon = 'waspstation/icons/turf/walls/shuttle_wall.dmi' + icon = 'whitesands/icons/turf/walls/shuttle_wall.dmi' icon_state = "shuttle_wall-0" base_icon_state = "shuttle_wall" mineral = /obj/item/stack/sheet/mineral/titanium diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index c9b6d67c5fb..3a3017b0e58 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -63,7 +63,7 @@ return ..() var/mob/living/carbon/human/yolk = new /mob/living/carbon/human/(get_turf(src)) yolk.fully_replace_character_name(null,random_unique_lizard_name(gender)) - yolk.set_species(/datum/species/lizard/ashwalker/kobold) //Wasp Edit - Kobold + yolk.set_species(/datum/species/lizard/ashwalker/kobold) //WS Edit - Kobold yolk.underwear = "Nude" yolk.equipOutfit(/datum/outfit/ashwalker)//this is an authentic mess we're making yolk.update_body() @@ -78,7 +78,7 @@ mob_name = "an ash walker" icon = 'icons/mob/lavaland/lavaland_monsters.dmi' icon_state = "large_egg" - mob_species = /datum/species/lizard/ashwalker/kobold //Wasp Edit - Kobold + mob_species = /datum/species/lizard/ashwalker/kobold //WS Edit - Kobold outfit = /datum/outfit/ashwalker roundstart = FALSE death = FALSE diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 532c425ca3b..b954fad9dd4 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -20,7 +20,7 @@ pipe_astar_cost = 1\ ) -/*Wasp Edit - Revert smartwire +/*WS Edit - Revert smartwire /obj/structure/grille/Destroy() update_cable_icons_on_turf(get_turf(src)) return ..() diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index e7763daf22b..b7319280f1d 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -93,8 +93,8 @@ GLOBAL_LIST_INIT(tendrils, list()) for(var/mob/M in range(7,src)) shake_camera(M, 15, 1) playsound(get_turf(src),'sound/effects/explosionfar.ogg', 200, TRUE) - visible_message("The tendril falls inward, the ground around it erupting into bubbling lava!") //Waspstation edit. + visible_message("The tendril falls inward, the ground around it erupting into bubbling lava!") //WS edit. for(var/turf/T in range(2,src)) if(!T.density) - T.TerraformTurf(/turf/open/lava/smooth/lava_land_surface, /turf/open/lava/smooth/lava_land_surface, flags = CHANGETURF_INHERIT_AIR) //Waspstation edit, instead of chasms this produces lava instead. + T.TerraformTurf(/turf/open/lava/smooth/lava_land_surface, /turf/open/lava/smooth/lava_land_surface, flags = CHANGETURF_INHERIT_AIR) //WS edit, instead of chasms this produces lava instead. qdel(src) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index f40201da1d1..860c269af6f 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -367,7 +367,7 @@ armor = list("melee" = 80, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100) max_integrity = 75 explosion_block = 1 - damage_deflection = 5 // Wasp Edit - Weakens R-Windows + damage_deflection = 5 //WS Edit - Weakens R-Windows state = RWINDOW_SECURE glass_type = /obj/item/stack/sheet/rglass rad_insulation = RAD_HEAVY_INSULATION @@ -494,7 +494,7 @@ heat_resistance = 50000 armor = list("melee" = 80, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100) max_integrity = 500 - damage_deflection = 11 // Wasp Edit - Weakens R-Windows + damage_deflection = 11 //WS Edit - Weakens R-Windows explosion_block = 2 glass_type = /obj/item/stack/sheet/plasmarglass @@ -667,13 +667,13 @@ icon = 'icons/obj/smooth_structures/rice_window.dmi' icon_state = "rice_window-0" base_icon_state = "rice_window" - max_integrity = 300 //Wasp change - Monstermos + max_integrity = 300 //WS change - Monstermos glass_amount = 2 /obj/structure/window/shuttle name = "shuttle window" desc = "A reinforced, air-locked pod window." - icon = 'waspstation/icons/obj/smooth_structures/shuttle_window.dmi' + icon = 'whitesands/icons/obj/smooth_structures/shuttle_window.dmi' icon_state = "shuttle_window-0" base_icon_state = "shuttle_window" dir = FULLTILE_WINDOW_DIR @@ -718,7 +718,7 @@ smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE) canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE) explosion_block = 3 - damage_deflection = 5 // Wasp Edit - Weakens R-Windows + damage_deflection = 5 //WS Edit - Weakens R-Windows glass_type = /obj/item/stack/sheet/plastitaniumglass glass_amount = 2 rad_insulation = RAD_HEAVY_INSULATION diff --git a/code/game/say.dm b/code/game/say.dm index a3b39c7f425..a1a0a77895b 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -14,8 +14,8 @@ GLOBAL_LIST_INIT(freqtospan, list( "[FREQ_AI_PRIVATE]" = "aiprivradio", "[FREQ_SYNDICATE]" = "syndradio", "[FREQ_CENTCOM]" = "centcomradio", - "[FREQ_SOLGOV]" = "solgovradio", // Wasp Edit - SolGov Rep - "[FREQ_WIDEBAND]" = "widebandradio", // Wasp Edit - Overmaps + "[FREQ_SOLGOV]" = "solgovradio", //WS Edit - SolGov Rep + "[FREQ_WIDEBAND]" = "widebandradio", //WS Edit - Overmaps "[FREQ_CTF_RED]" = "redteamradio", "[FREQ_CTF_BLUE]" = "blueteamradio" )) @@ -28,7 +28,7 @@ GLOBAL_LIST_INIT(freqtospan, list( spans |= speech_span if(!language) language = get_selected_language() - message = process_chat_markup(message) // Waspstation edit - Chat markup + message = process_chat_markup(message) //WS edit - Chat markup send_speech(message, 7, src, , spans, message_language=language) /atom/movable/proc/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list()) diff --git a/code/game/sound.dm b/code/game/sound.dm index 7a41a3cb28e..0bd4df18a92 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -44,7 +44,7 @@ if(get_dist(M, turf_source) <= maxdistance) M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, channel, pressure_affected, S) -/mob/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, channel = 0, pressure_affected = TRUE, sound/S, distance_multiplier = 1, envwet = -10000, envdry = 0) //Wasp Edit Cit #7367 - Env Wet / Dry is Reverb +/mob/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, channel = 0, pressure_affected = TRUE, sound/S, distance_multiplier = 1, envwet = -10000, envdry = 0) //WS Edit Cit #7367 - Env Wet / Dry is Reverb if(!client || !can_hear()) return @@ -54,7 +54,7 @@ S.wait = 0 //No queue S.channel = channel || SSsounds.random_available_channel() S.volume = vol - S.environment = 7 //Wasp Edit Cit #7367 + S.environment = 7 //WS Edit Cit #7367 if(vary) if(frequency) @@ -85,7 +85,7 @@ else //space pressure_factor = 0 - S.echo = list(envdry, null, envwet, null, null, null, null, null, null, null, null, null, null, 1, 1, 1, null, null) //Wasp Edit Cit #7367 + S.echo = list(envdry, null, envwet, null, null, null, null, null, null, null, null, null, null, 1, 1, 1, null, null) //WS Edit Cit #7367 if(distance <= 1) pressure_factor = max(pressure_factor, 0.15) //touching the source of the sound diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index e3a03a999c7..9c23d1c4e23 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -217,7 +217,7 @@ /turf/closed/wall/mineral/titanium //has to use this path due to how building walls works name = "wall" desc = "A light-weight titanium wall used in shuttles." - icon = 'waspstation/icons/turf/walls/shuttle_wall.dmi' + icon = 'whitesands/icons/turf/walls/shuttle_wall.dmi' icon_state = "shuttle_wall-0" base_icon_state = "shuttle_wall" explosion_block = 3 @@ -229,7 +229,7 @@ canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS) /turf/closed/wall/mineral/titanium/nodiagonal - icon = 'waspstation/icons/turf/walls/shuttle_wall.dmi' + icon = 'whitesands/icons/turf/walls/shuttle_wall.dmi' icon_state = "map-shuttle_nd" base_icon_state = "shuttle_wall" smoothing_flags = SMOOTH_BITMASK diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm index d7d45c7a1b8..2e8933a773b 100644 --- a/code/game/turfs/open/floor/mineral_floor.dm +++ b/code/game/turfs/open/floor/mineral_floor.dm @@ -79,7 +79,7 @@ /turf/open/floor/mineral/titanium name = "shuttle floor" - icon = 'waspstation/icons/turf/floors/shuttle_floors.dmi' + icon = 'whitesands/icons/turf/floors/shuttle_floors.dmi' icon_state = "titanium" floor_tile = /obj/item/stack/tile/mineral/titanium broken_states = list("titanium_dam1","titanium_dam2","titanium_dam3","titanium_dam4","titanium_dam5") @@ -114,7 +114,7 @@ //PLASTITANIUM (syndieshuttle) /turf/open/floor/mineral/plastitanium name = "shuttle floor" - icon = 'waspstation/icons/turf/floors/shuttle_floors.dmi' + icon = 'whitesands/icons/turf/floors/shuttle_floors.dmi' icon_state = "plastitanium" floor_tile = /obj/item/stack/tile/mineral/plastitanium broken_states = list("plastitanium_dam1","plastitanium_dam2","plastitanium_dam3","plastitanium_dam4","plastitanium_dam5") diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 9bb4fa12db7..03dba86ee16 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -216,20 +216,20 @@ GLOBAL_LIST_EMPTY(station_turfs) return FALSE if(!force && (!can_zFall(A, levels, target) || !A.can_zFall(src, levels, target, DOWN))) return FALSE - var/atom/movable/AM = null //Wasp Start - Dragging down stairs works now + var/atom/movable/AM = null //WS Start - Dragging down stairs works now var/was_pulling = FALSE if(ismob(A)) var/mob/M = A if(A.pulling) AM = M.pulling AM.forceMove(target) - was_pulling = TRUE //Wasp End + was_pulling = TRUE //WS End A.zfalling = TRUE A.forceMove(target) A.zfalling = FALSE - if(ismob(A) && was_pulling) //Wasp Start - Dragging down stairs works now + if(ismob(A) && was_pulling) //WS Start - Dragging down stairs works now var/mob/M = A - M.start_pulling(AM) //Wasp End + M.start_pulling(AM) //WS End target.zImpact(A, levels, src) return TRUE diff --git a/code/game/world.dm b/code/game/world.dm index e5d78166dd6..d7e3e7bb18c 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -50,14 +50,14 @@ GLOBAL_VAR(restart_counter) config.Load(params[OVERRIDE_CONFIG_DIRECTORY_PARAMETER]) load_admins() - load_mentors() //Wasp edit - Mentors + load_mentors() //WS edit - Mentors //SetupLogs depends on the RoundID, so lets check //DB schema and set RoundID if we can SSdbcore.CheckSchemaVersion() SSdbcore.SetRoundID() SetupLogs() - populate_gear_list() //Wasp edit - Loadouts + populate_gear_list() //WS edit - Loadouts load_poll_data() #ifndef USE_CUSTOM_ERROR_HANDLER @@ -314,7 +314,7 @@ GLOBAL_VAR(restart_counter) s += "" s += ")" s += " (" - s += "" //Change this to wherever you want the hub to link to. + s += "" //Change this to wherever you want the hub to link to. s += "Github" //Replace this with something else. Or ever better, delete it and uncomment the game version. s += "" s += ")" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 10b7a70452e..e25dcc4c4a2 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -61,7 +61,7 @@ body += "- " body += "= " body += "0" - //WaspStation Begin - Metacoins + //WS Begin - Metacoins var/metabalance = M.client.get_metabalance() body += "

[CONFIG_GET(string/metacurrency_name)]s: [metabalance] " body += "
+ " @@ -75,7 +75,7 @@ body += "- " body += "= " body += "0" - //WaspStation End + //WS End var/full_version = "Unknown" if(M.client.byond_version) full_version = "[M.client.byond_version].[M.client.byond_build ? M.client.byond_build : "xxx"]" @@ -216,13 +216,13 @@ body += "" - //WaspStation Begin - Better Looking Admin Panels + //WS Begin - Better Looking Admin Panels var/datum/browser/popup = new(usr, "adminplayeropts-[REF(M)]", "
Options for [M.key]
", 700, 600) popup.set_content(body) popup.open(0) - //WaspStation End + //WS End - /*WaspStation Begin - Better Looking Admin Panels + /*WS Begin - Better Looking Admin Panels usr << browse(body, "window=adminplayeropts-[REF(M)];size=550x515") */ @@ -587,7 +587,7 @@ SSredbot.send_discord_message("ooc", "**OOC has been [GLOB.ooc_allowed ? "enabled" : "disabled"] on the server.**") SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle OOC", "[GLOB.ooc_allowed ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -//Begin Wasp Edit +//BeginWS Edit /datum/admins/proc/toggleooclocal() set category = "Server" set desc="Toggle dat bitch" @@ -596,7 +596,7 @@ log_admin("[key_name(usr)] toggled LOOC.") message_admins("[key_name_admin(usr)] toggled LOOC.") SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Local OOC", "[GLOB.looc_allowed ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -//End Wasp Edit +//EndWS Edit /datum/admins/proc/toggleoocdead() set category = "Server" diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 3ce2a7ef00f..19122848e44 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -65,7 +65,7 @@ return if (!sender) - sender = input("Who is the message from?", "Sender") as null|anything in list(RADIO_CHANNEL_CENTCOM,RADIO_CHANNEL_SYNDICATE,RADIO_CHANNEL_SOLGOV) // Wasp Edit - SolGov Rep + sender = input("Who is the message from?", "Sender") as null|anything in list(RADIO_CHANNEL_CENTCOM,RADIO_CHANNEL_SYNDICATE,RADIO_CHANNEL_SOLGOV) //WS Edit - SolGov Rep if(!sender) return @@ -77,7 +77,7 @@ log_directed_talk(mob, H, input, LOG_ADMIN, "reply") message_admins("[key_name_admin(src)] replied to [key_name_admin(H)]'s [sender] message with: \"[input]\"") - to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender == RADIO_CHANNEL_SYNDICATE ? "your benefactor" : sender]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] [input]. Message ends.\"", confidential = TRUE) // Wasp Edit - SolGov Rep + to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender == RADIO_CHANNEL_SYNDICATE ? "your benefactor" : sender]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] [input]. Message ends.\"", confidential = TRUE) //WS Edit - SolGov Rep SSblackbox.record_feedback("tally", "admin_verb", 1, "Headset Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -1057,7 +1057,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_ADMIN) || !check_rights(R_FUN)) return - var/list/punishment_list = list(ADMIN_PUNISHMENT_BREAK_BONES, ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_ROD, ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_IMMERSE, ADMIN_PUNISHMENT_NYA)//WaspStation Edit - Admin Punishment: Cat Tongue + var/list/punishment_list = list(ADMIN_PUNISHMENT_BREAK_BONES, ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_ROD, ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_IMMERSE, ADMIN_PUNISHMENT_NYA)//WS Edit - Admin Punishment: Cat Tongue var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in sortList(punishment_list) @@ -1127,14 +1127,14 @@ Traitors and the like can also be revived with the previous role mostly intact. return if(ADMIN_PUNISHMENT_IMMERSE) immerse_player(target) - if(ADMIN_PUNISHMENT_NYA)//WaspStation Start - Admin Punishment: Cat Tongue + if(ADMIN_PUNISHMENT_NYA)//WS Start - Admin Punishment: Cat Tongue if(!iscarbon(target)) to_chat(usr,"This must be used on a carbon mob.") return to_chat(target, "You do nyat feew vewy good!", confidential = TRUE) var/mob/living/carbon/dude = target var/obj/item/organ/tongue/felinid/tonje = new - tonje.Insert(dude, TRUE, FALSE)//WaspStation End - Admin Punishment: Cat Tongue + tonje.Insert(dude, TRUE, FALSE)//WS End - Admin Punishment: Cat Tongue punish_log(target, punishment) diff --git a/code/modules/antagonists/changeling/powers/panacea.dm b/code/modules/antagonists/changeling/powers/panacea.dm index e7fc0316839..5c1010aaf69 100644 --- a/code/modules/antagonists/changeling/powers/panacea.dm +++ b/code/modules/antagonists/changeling/powers/panacea.dm @@ -26,7 +26,7 @@ C.vomit(0, toxic = TRUE) O.forceMove(get_turf(user)) - var/mob/living/simple_animal/borer/B = user.has_brain_worms() //Wasp Begin - Borers + var/mob/living/simple_animal/borer/B = user.has_brain_worms() //WS Begin - Borers if(B) if(B.controlling) B.detatch() @@ -34,7 +34,7 @@ if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit(0, toxic = TRUE) - to_chat(user, "A parasite exits our form.") //Wasp End + to_chat(user, "A parasite exits our form.") //WS End user.reagents.add_reagent(/datum/reagent/medicine/mutadone, 10) user.reagents.add_reagent(/datum/reagent/medicine/pen_acid, 20) diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 2e71776e227..1beb7fe24a6 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -226,12 +226,12 @@ always_new_team = TRUE send_to_spawnpoint = FALSE //Handled by event nukeop_outfit = /datum/outfit/syndicate/full - var/intern_pop_max = 8 // Wasp Edit Begin - State from Jakefarm + var/intern_pop_max = 8 //WS Edit Begin - State from Jakefarm var/intern_outfit = /datum/outfit/syndicate/intern /datum/antagonist/nukeop/lone/on_gain() nukeop_outfit = get_active_player_count(alive_check = TRUE, afk_check = TRUE, human_check = TRUE) ? intern_outfit : nukeop_outfit - ..() // Wasp Edit End + ..() //WS Edit End /datum/antagonist/nukeop/lone/assign_nuke() if(nuke_team && !nuke_team.tracked_nuke) diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm index fe412dba924..12512a5c37a 100644 --- a/code/modules/antagonists/revenant/revenant.dm +++ b/code/modules/antagonists/revenant/revenant.dm @@ -72,7 +72,7 @@ /mob/living/simple_animal/revenant/Initialize(mapload) . = ..() - flags_1 |= RAD_NO_CONTAMINATE_1 // Waspstation Edit - Deaf Revenant Fix + flags_1 |= RAD_NO_CONTAMINATE_1 //WS Edit - Deaf Revenant Fix ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT) ADD_TRAIT(src, TRAIT_SIXTHSENSE, INNATE_TRAIT) AddSpell(new /obj/effect/proc_holder/spell/targeted/night_vision/revenant(null)) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index bad0ab0dbcb..a4db40be5e7 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -109,7 +109,7 @@ /datum/antagonist/traitor/proc/forge_ai_objectives() var/objective_count = 1 - // WaspStation Edit - Malf AI Rework + //WS Edit - Malf AI Rework var/datum/objective/hack_apc/apc_objective = new apc_objective.owner = owner add_objective(apc_objective) @@ -117,7 +117,7 @@ for(var/i = objective_count, i < CONFIG_GET(number/traitor_objectives_amount), i++) objective_count += forge_single_objective() - // End WaspStation Edit - Malf AI Rework + // EndWS Edit - Malf AI Rework var/datum/objective/survive/exist/exist_objective = new exist_objective.owner = owner @@ -133,7 +133,7 @@ /datum/antagonist/traitor/proc/forge_single_human_objective() //Returns how many objectives are added .=1 - if(prob(40)) // WaspStation Edit - Less Murderbone, more Theft + if(prob(40)) //WS Edit - Less Murderbone, more Theft var/list/active_ais = active_ais() if(active_ais.len && prob(100/GLOB.joined_player_list.len)) var/datum/objective/destroy/destroy_objective = new @@ -150,7 +150,7 @@ maroon_objective.owner = owner maroon_objective.find_target() add_objective(maroon_objective) - // End WaspStation Edit - Less Murderbone, more Theft + // EndWS Edit - Less Murderbone, more Theft else if(prob(15) && !(locate(/datum/objective/download) in objectives) && !(owner.assigned_role in list("Research Director", "Scientist", "Roboticist"))) var/datum/objective/download/download_objective = new @@ -165,7 +165,7 @@ /datum/antagonist/traitor/proc/forge_single_AI_objective() .=1 - // WaspStation Edit - Malf AI Rework + //WS Edit - Malf AI Rework if(prob(20)) var/special_pick = rand(1,3) switch(special_pick) @@ -192,7 +192,7 @@ yandere_two.update_explanation_text() // normally called in find_target() add_objective(yandere_two) .=2 - // End WaspStation Edit - Malf AI rework + // EndWS Edit - Malf AI rework /datum/antagonist/traitor/greet() to_chat(owner.current, "You are the [owner.special_role].") diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index d25a95aa804..7f526a5142b 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -5,7 +5,7 @@ item_state = "mousetrap" custom_materials = list(/datum/material/iron=100) attachable = TRUE - layer = BELOW_OBJ_LAYER // Wasp Edit + layer = BELOW_OBJ_LAYER //WS Edit var/armed = FALSE drop_sound = 'sound/items/handling/component_drop.ogg' pickup_sound = 'sound/items/handling/component_pickup.ogg' diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index 5201b71576e..313a22f4a25 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -74,10 +74,10 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) /datum/gas_mixture/proc/mark_vacuum() /datum/gas_mixture/proc/get_gases() /datum/gas_mixture/proc/multiply(factor) -// WaspStation Edit Start - Immutable Gax Mix Temperature Gradients +//WS Edit Start - Immutable Gax Mix Temperature Gradients /datum/gas_mixture/proc/create_temperature_gradient(a, b, c) /datum/gas_mixture/proc/tick_temperature_gradient(step) -// WaspStation Edit End - Immutable Gax Mix Temperature Gradients +//WS Edit End - Immutable Gax Mix Temperature Gradients /datum/gas_mixture/proc/get_last_share() /datum/gas_mixture/proc/clear() diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index 64e6a80b7e1..e1b907cc50b 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -328,10 +328,10 @@ return list() /obj/machinery/atmospherics/update_remote_sight(mob/user) - if(isborer(user)) //Wasp Begin - Borers + if(isborer(user)) //WS Begin - Borers user.sight |= (SEE_PIXELS) else - user.sight |= (SEE_TURFS|BLIND) //Wasp End + user.sight |= (SEE_TURFS|BLIND) //WS End //Used for certain children of obj/machinery/atmospherics to not show pipe vision when mob is inside it. /obj/machinery/atmospherics/proc/can_see_pipes() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index f3a499a089e..eba5b496535 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -171,7 +171,7 @@ update_icon() -//Wasp Edit - Update from Cit's Thermomachine - PR #8800, adds additional info to ctrl and alt clicks - BFAT +//WS Edit - Update from Cit's Thermomachine - PR #8800, adds additional info to ctrl and alt clicks - BFAT /obj/machinery/atmospherics/components/unary/thermomachine/CtrlClick(mob/living/user) var/area/A = get_area(src) diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm index 19ba48de5c9..67b9adfaae6 100644 --- a/code/modules/atmospherics/machinery/datum_pipeline.dm +++ b/code/modules/atmospherics/machinery/datum_pipeline.dm @@ -223,13 +223,13 @@ if(V.on) PL |= V.parents[1] PL |= V.parents[2] -//Begin Wasp Edit - Porting Relief Valves +//BeginWS Edit - Porting Relief Valves else if (istype(atmosmch,/obj/machinery/atmospherics/components/binary/relief_valve)) var/obj/machinery/atmospherics/components/binary/relief_valve/V = atmosmch if(V.opened) PL |= V.parents[1] PL |= V.parents[2] -//End Wasp Edit - Porting Relief Valves +//EndWS Edit - Porting Relief Valves else if (istype(atmosmch, /obj/machinery/atmospherics/components/unary/portables_connector)) var/obj/machinery/atmospherics/components/unary/portables_connector/C = atmosmch if(C.connected_device) diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index df78118eef5..2bf44ca453a 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -239,7 +239,7 @@ . += "can-open" if(connected_port) . += "can-connector" - /* WaspStation Edit - Use our overlays + /*WS Edit - Use our overlays var/pressure = air_contents.return_pressure() if(pressure >= 40 * ONE_ATMOSPHERE) . += "can-o3" @@ -249,7 +249,7 @@ . += "can-o1" else if(pressure >= 10) . += "can-o0" - WaspStation End */ + WS End */ /obj/machinery/portable_atmospherics/canister/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index d8e0c51a59b..69ce2b4a407 100644 --- a/code/modules/cargo/bounties/reagent.dm +++ b/code/modules/cargo/bounties/reagent.dm @@ -238,10 +238,10 @@ /datum/reagent/medicine/atropine,\ /datum/reagent/medicine/cryoxadone,\ /datum/reagent/medicine/salbutamol,\ - /* WaspStation Begin - No Cobby + /*WS Begin - No Cobby /datum/reagent/medicine/C2/hercuri,\ /datum/reagent/medicine/C2/probital,\ - WaspStation End */ + WS End */ /datum/reagent/drug/methamphetamine,\ /datum/reagent/drug/crank,\ /datum/reagent/nitrous_oxide,\ diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm index 713fb5c3e4c..907266df28a 100644 --- a/code/modules/cargo/exports/large_objects.dm +++ b/code/modules/cargo/exports/large_objects.dm @@ -121,7 +121,7 @@ cost = 25 unit_name = "security barrier" export_types = list(/obj/item/grenade/barrier, /obj/structure/barricade/security) -/* Waspstation Begin - Cargo Rebalance? +/*WS Begin - Cargo Rebalance? /datum/export/large/gas_canister cost = 10 //Base cost of canister. You get more for nice gases inside. @@ -142,4 +142,4 @@ worth += gases[/datum/gas/freon][MOLES]*15 return worth -Waspstation end */ +WS end */ diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index a3a5b3d0d41..fbd6f23ae3d 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -10,7 +10,7 @@ var/crate_name = "crate" var/desc = ""//no desc by default var/crate_type = /obj/structure/closet/crate - var/dangerous = FALSE // Should we message admins? // wasp station edit: all the dangerous shit is actually labeled as dangerous + var/dangerous = FALSE // Should we message admins? //WS station edit: all the dangerous shit is actually labeled as dangerous var/special = FALSE //Event/Station Goals/Admin enabled packs var/special_enabled = FALSE var/DropPodOnly = FALSE//only usable by the Bluespace Drop Pod via the express cargo console diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index e6c2f2501b4..1bc605ceff9 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -265,7 +265,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( GLOB.preferences_datums[ckey] = prefs prefs.last_ip = address //these are gonna be used for banning prefs.last_id = computer_id //these are gonna be used for banning - fps = prefs.clientfps == 0 ? 60 : prefs.clientfps // WaspStation Edit - Client FPS Tweak + fps = prefs.clientfps == 0 ? 60 : prefs.clientfps //WS Edit - Client FPS Tweak if(fexists(roundend_report_file())) add_verb(src, /client/proc/show_previous_roundend_report) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 2250abb25cd..1681c3aa3a3 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -112,7 +112,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/list/ignoring = list() - var/clientfps = 60 // WaspStation Edit - Client FPS Tweak + var/clientfps = 60 //WS Edit - Client FPS Tweak var/parallax @@ -1595,7 +1595,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("flavor_text") var/msg = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!", "Flavor Text", features["flavor_text"], 4096, TRUE) - if(msg) //Waspstation edit - "Cancel" does not clear flavor text + if(msg) //WS edit - "Cancel" does not clear flavor text features["flavor_text"] = html_decode(msg) if("hair") @@ -1911,7 +1911,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) preferred_map = maplist[pickedmap] if ("clientfps") - var/desiredfps = input(user, "Choose your desired fps. (0 = default, 60 FPS))", "Character Preference", clientfps) as null|num // WaspStation Edit - Client FPS Tweak - + var/desiredfps = input(user, "Choose your desired fps. (0 = default, 60 FPS))", "Character Preference", clientfps) as null|num //WS Edit - Client FPS Tweak - if (!isnull(desiredfps)) clientfps = desiredfps parent.fps = desiredfps diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 52111fd3675..483757e135d 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -189,11 +189,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car READ_FILE(S["key_bindings"], key_bindings) check_keybindings() - //Wasp Begin - Custom Prefs + //WS Begin - Custom Prefs READ_FILE(S["purchased_gear"], purchased_gear) READ_FILE(S["crew_objectives"], crew_objectives) READ_FILE(S["show_credits"], show_credits) - //Wasp End + //WS End //try to fix any outdated data if necessary if(needs_update >= 0) @@ -378,7 +378,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car READ_FILE(S["feature_moth_wings"], features["moth_wings"]) READ_FILE(S["feature_moth_markings"], features["moth_markings"]) - //Wasp Begin + //WS Begin READ_FILE(S["equipped_gear"], equipped_gear) READ_FILE(S["jumpsuit_style"], jumpsuit_style) @@ -403,7 +403,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(!equipped_gear) equipped_gear = list() - //Wasp End + //WS End if(!CONFIG_GET(flag/join_with_mutant_humans)) features["tail_human"] = "none" @@ -559,7 +559,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["feature_moth_wings"] , features["moth_wings"]) WRITE_FILE(S["feature_moth_markings"] , features["moth_markings"]) - //Wasp begin + //WS begin WRITE_FILE(S["jumpsuit_style"] , jumpsuit_style) WRITE_FILE(S["exowear"] , exowear) WRITE_FILE(S["equipped_gear"] , equipped_gear) @@ -579,7 +579,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //Flavor text WRITE_FILE(S["feature_flavor_text"], features["flavor_text"]) - //Wasp End + //WS End //Custom names for(var/custom_name_id in GLOB.preferences_custom_names) diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 62ef40bbd90..28e404d5864 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -272,7 +272,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_ooc)() /datum/verbs/menu/Settings/listen_ooc/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_OOC -//Begin Wasp Edit +//BeginWS Edit TOGGLE_CHECKBOX(datum/verbs/menu/settings, listen_looc)() set name = "Show/Hide LOOC" set category = "Preferences" @@ -283,7 +283,7 @@ TOGGLE_CHECKBOX(datum/verbs/menu/settings, listen_looc)() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Seeing LOOC", "[usr.client.prefs.chat_toggles & CHAT_LOOC ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/verbs/menu/Settings/listen_looc/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_LOOC -//End Wasp Edit +//EndWS Edit TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_bank_card)() set name = "Show/Hide Income Updates" diff --git a/code/modules/client/verbs/looc.dm b/code/modules/client/verbs/looc.dm index 4ad71a733c6..81255272c85 100644 --- a/code/modules/client/verbs/looc.dm +++ b/code/modules/client/verbs/looc.dm @@ -45,8 +45,8 @@ GLOBAL_VAR_INIT(normal_looc_colour, "#6699CC") return msg = emoji_parse(msg) - msg = process_chat_markup(msg) // Waspstation edit - Chat markup - + msg = process_chat_markup(msg) //WS edit - Chat markup + mob.log_talk(msg,LOG_OOC, tag="(LOOC)") var/list/heard = get_hearers_in_view(7, get_top_level_mob(src.mob)) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index fdd011e46a2..d048e4b91c9 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -55,8 +55,8 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") mob.log_talk(raw_msg, LOG_OOC) SSredbot.send_discord_message("ooc", "**[key]:** [msg]") - msg = process_chat_markup(msg) // Waspstation edit - Chat markup - + msg = process_chat_markup(msg) //WS edit - Chat markup + var/keyname = key if(prefs.unlock_content) if(prefs.toggles & MEMBER_PUBLIC) @@ -99,7 +99,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") GLOB.ooc_allowed = !GLOB.ooc_allowed to_chat(world, "The OOC channel has been globally [GLOB.ooc_allowed ? "enabled" : "disabled"].") -//Begin Wasp Edit +//BeginWS Edit /proc/toggle_looc(toggle = null) if(toggle != null) if(toggle != GLOB.looc_allowed) @@ -108,7 +108,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") return else GLOB.looc_allowed = !GLOB.looc_allowed -//End Wasp Edit +//EndWS Edit /proc/toggle_dooc(toggle = null) if(toggle != null) diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index 16b5f7ec962..ebf47272dd0 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -262,7 +262,7 @@ if(!(mobility_flags & MOBILITY_USE)) //just while I finish up the new 'fun' suiciding verb. This is to prevent metagaming via suicide to_chat(src, "You can't commit suicide whilst immobile! ((You can type Ghost instead however.))") return - if(has_brain_worms()) //Wasp Begin - Borers + if(has_brain_worms()) //WS Begin - Borers to_chat(src, "You can't bring yourself to commit suicide!") - return //Wasp End + return //WS End return TRUE diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 7ed3b85e7d4..1f5473fe7f7 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -458,7 +458,7 @@ item_state = "gas_alt" resistance_flags = NONE armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - clothing_flags = BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS // Wasp Port - Citadel Internals + clothing_flags = BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS //WS Port - Citadel Internals flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 3353564fb26..aaae58cdccb 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -115,13 +115,13 @@ user.vars[variable] = user_vars_remembered[variable] user_vars_remembered = initial(user_vars_remembered) // Effectively this sets it to null. - if((HIDEJUMPSUIT in flags_inv) || (LEGS & body_parts_covered)) //WaspStation start - Digitigrade magboots + if((HIDEJUMPSUIT in flags_inv) || (LEGS & body_parts_covered)) //WS start - Digitigrade magboots var/mob/living/carbon/human/H = user if(H.get_item_by_slot(ITEM_SLOT_FEET)) var/obj/item/clothing/shoes/S = H.get_item_by_slot(ITEM_SLOT_FEET) if(("legs" in H.dna.species.mutant_bodyparts) && H.dna.features["legs"] == "Digitigrade Legs") if((DIGITIGRADE_SHOE & S.obj_flags) || (DIGITIGRADE_COMPATIBLE & S.obj_flags)) - S.digi_alt(H, 0) //WaspStation end - Digitigrade magboots + S.digi_alt(H, 0) //WS end - Digitigrade magboots /obj/item/clothing/equipped(mob/user, slot) ..() @@ -134,13 +134,13 @@ LAZYSET(user_vars_remembered, variable, user.vars[variable]) user.vv_edit_var(variable, user_vars_to_edit[variable]) - if((HIDEJUMPSUIT in flags_inv) || (LEGS & body_parts_covered)) //WaspStation start - Digitigrade magboots + if((HIDEJUMPSUIT in flags_inv) || (LEGS & body_parts_covered)) //WS start - Digitigrade magboots var/mob/living/carbon/human/H = user if(H.get_item_by_slot(ITEM_SLOT_FEET)) var/obj/item/clothing/shoes/S = H.get_item_by_slot(ITEM_SLOT_FEET) if(("legs" in H.dna.species.mutant_bodyparts) && H.dna.features["legs"] == "Digitigrade Legs") if((DIGITIGRADE_SHOE & S.obj_flags) || (DIGITIGRADE_COMPATIBLE & S.obj_flags)) - S.digi_alt(H, 1) //WaspStation end - Digitigrade magboots + S.digi_alt(H, 1) //WS end - Digitigrade magboots /obj/item/clothing/examine(mob/user) . = ..() diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index af818ad5687..3f19aad2be4 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -166,8 +166,8 @@ /obj/item/clothing/gloves/color/captain desc = "Regal white gloves, with a nice gold trim, a diamond anti-shock coating, and an integrated thermal barrier, and armoured bracers. Swanky." name = "captain's gloves" - icon = 'waspstation/icons/obj/clothing/gloves.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/hands.dmi' + icon = 'whitesands/icons/obj/clothing/gloves.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/hands.dmi' icon_state = "captain" item_state = "egloves" siemens_coefficient = 0 @@ -222,10 +222,10 @@ icon = 'icons/obj/clothing/clockwork_garb.dmi' icon_state = "clockwork_gauntlets" item_state = "clockwork_gauntlets" - siemens_coefficient = 0 //Wasp Station eddit "Tinkers Gloves Insuls" - permeability_coefficient = 0.05 //Wasp Station eddit "Tinkers Gloves Insuls" - //siemens_coefficient = 0.8 Wasp Station eddit "Tinkers Gloves Insuls" - //permeability_coefficient = 0.3 Wasp Station eddit "Tinkers Gloves Insuls" + siemens_coefficient = 0 //WS Station eddit "Tinkers Gloves Insuls" + permeability_coefficient = 0.05 //WS Station eddit "Tinkers Gloves Insuls" + //siemens_coefficient = 0.8 WS Station eddit "Tinkers Gloves Insuls" + //permeability_coefficient = 0.3 WS Station eddit "Tinkers Gloves Insuls" carrytrait = TRAIT_QUICK_BUILD custom_materials = list(/datum/material/iron=2000, /datum/material/silver=1500, /datum/material/gold = 1000) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index b65b866111f..7d6da6f6022 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -28,8 +28,8 @@ /obj/item/clothing/head/caphat name = "captain's peaked cap" desc = "It's good being the king." - icon = 'waspstation/icons/obj/clothing/hats.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/head.dmi' + icon = 'whitesands/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/head.dmi' icon_state = "captain" item_state = "that" flags_inv = 0 @@ -49,8 +49,8 @@ //Head of Personnel /obj/item/clothing/head/hopcap name = "head of personnel's cap" - icon = 'waspstation/icons/obj/clothing/hats.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/head.dmi' + icon = 'whitesands/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/head.dmi' icon_state = "hopcap" desc = "The symbol of true bureaucratic micromanagement." armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) @@ -99,15 +99,15 @@ else to_chat(user, "You just took a candy corn! You should wait a couple minutes, lest you burn through your stash.") -/*WaspStation Edit - Berets +/*WS Edit - Berets //Mime /obj/item/clothing/head/beret name = "beret" desc = "A beret, a mime's favorite headwear." icon_state = "beret" dog_fashion = /datum/dog_fashion/head/beret - dynamic_hair_suffix = "+generic" // Waspstation edit - Berets - dynamic_fhair_suffix = "+generic" // Waspstation edit - Berets + dynamic_hair_suffix = "+generic" //WS edit - Berets + dynamic_fhair_suffix = "+generic" //WS edit - Berets /obj/item/clothing/head/beret/vintage name = "vintage beret" @@ -140,7 +140,7 @@ icon_state = "beretdurathread" armor = list("melee" = 15, "bullet" = 5, "laser" = 15, "energy" = 25, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 5) -WaspStation End*/ +WS End*/ //Curator /obj/item/clothing/head/fedora/curator @@ -162,12 +162,12 @@ WaspStation End*/ name = "syndicate cap" desc = "A black cap fit for a high ranking syndicate officer." -/* Wasp edit - Better Berets +/*WS edit - Better Berets /obj/item/clothing/head/HoS/beret name = "head of security beret" desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection." icon_state = "hosberetblack" -Wasp End */ +WS End */ /obj/item/clothing/head/HoS/beret/syndicate name = "syndicate beret" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 30abc701031..7995880801c 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -1,8 +1,8 @@ /obj/item/clothing/head/centhat name = "\improper CentCom hat" - icon = 'waspstation/icons/obj/clothing/hats.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/head.dmi' + icon = 'whitesands/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/head.dmi' icon_state = "centcom" desc = "It's good to be emperor." item_state = "that" diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 5b084916312..154f5c79f65 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -4,7 +4,7 @@ icon_state = "breath" item_state = "m_mask" body_parts_covered = 0 - clothing_flags = ALLOWINTERNALS //Wasp Port - Cit Internals + clothing_flags = ALLOWINTERNALS //WS Port - Cit Internals visor_flags = ALLOWINTERNALS w_class = WEIGHT_CLASS_SMALL gas_transfer_coefficient = 0.1 diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index db722705c2f..49877539558 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -78,13 +78,13 @@ our_alert = user.throw_alert("shoealert", /obj/screen/alert/shoes/untied) RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/check_trip, override=TRUE) - if((DIGITIGRADE_SHOE & obj_flags) || (DIGITIGRADE_COMPATIBLE & obj_flags)) //WaspStation start - Digitigrade magboots + if((DIGITIGRADE_SHOE & obj_flags) || (DIGITIGRADE_COMPATIBLE & obj_flags)) //WS start - Digitigrade magboots var/mob/living/carbon/human/H = user if(H.get_item_by_slot(ITEM_SLOT_FEET) && H.get_item_by_slot(ITEM_SLOT_ICLOTHING)) var/obj/item/clothing/under/S = H.get_item_by_slot(ITEM_SLOT_ICLOTHING) if(("legs" in H.dna.species.mutant_bodyparts) && H.dna.features["legs"] == "Digitigrade Legs") if((HIDEJUMPSUIT in S.flags_inv) || (LEGS & S.body_parts_covered)) - digi_alt(H, 1) //WaspStation end - Digitigrade magboots + digi_alt(H, 1) //WS end - Digitigrade magboots /obj/item/clothing/shoes/proc/restore_offsets(mob/user) equipped_before_drop = FALSE @@ -97,13 +97,13 @@ if(offset && equipped_before_drop) restore_offsets(user) - if((DIGITIGRADE_SHOE & obj_flags) || (DIGITIGRADE_COMPATIBLE & obj_flags)) //WaspStation start - Digitigrade magboots + if((DIGITIGRADE_SHOE & obj_flags) || (DIGITIGRADE_COMPATIBLE & obj_flags)) //WS start - Digitigrade magboots var/mob/living/carbon/human/H = user if(H.get_item_by_slot(ITEM_SLOT_FEET) && H.get_item_by_slot(ITEM_SLOT_ICLOTHING)) var/obj/item/clothing/under/S = H.get_item_by_slot(ITEM_SLOT_ICLOTHING) if(("legs" in H.dna.species.mutant_bodyparts) && H.dna.features["legs"] == "Digitigrade Legs") if((HIDEJUMPSUIT in S.flags_inv) || (LEGS & S.body_parts_covered)) - digi_alt(H, 0) //WaspStation end - Digitigrade magboots + digi_alt(H, 0) //WS end - Digitigrade magboots . = ..() diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 57d43bff207..a6696c2155b 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -4,7 +4,7 @@ name = "space helmet" icon_state = "spaceold" desc = "A special helmet with solar UV shielding to protect your eyes from harmful rays." - clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS //Wasp Port - Cit Internals + clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS //WS Port - Cit Internals item_state = "spaceold" permeability_coefficient = 0.01 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 70) @@ -43,4 +43,4 @@ strip_delay = 80 equip_delay_other = 80 resistance_flags = NONE - + diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 43002482c88..91dbe1cc8f5 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -102,11 +102,11 @@ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser) siemens_coefficient = 0 var/obj/item/clothing/head/helmet/space/hardsuit/helmet - actions_types = list(/datum/action/item_action/toggle_helmet) //WaspStation Edit - No Cells in EVA suits + actions_types = list(/datum/action/item_action/toggle_helmet) //WS Edit - No Cells in EVA suits var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit var/obj/item/tank/jetpack/suit/jetpack = null var/hardsuit_type - pocket_storage_component_path = FALSE // WaspStation Edit - Exowear Pockets + pocket_storage_component_path = FALSE //WS Edit - Exowear Pockets /obj/item/clothing/suit/space/hardsuit/Initialize() @@ -469,7 +469,7 @@ hardsuit_type = "medical" flash_protect = FLASH_PROTECTION_NONE armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 75) - clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SCAN_REAGENTS | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS //Wasp Port - Cit Internals + clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SCAN_REAGENTS | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS //WS Port - Cit Internals /obj/item/clothing/suit/space/hardsuit/medical name = "medical hardsuit" @@ -500,7 +500,7 @@ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 100, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 80) var/explosion_detection_dist = 21 - clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SCAN_REAGENTS | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS //Wasp Port - Cit Internals + clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SCAN_REAGENTS | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS //WS Port - Cit Internals actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_research_scanner) /obj/item/clothing/head/helmet/space/hardsuit/rd/Initialize() diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index 869deb7615b..bb2b0fae914 100644 --- a/code/modules/clothing/suits/_suits.dm +++ b/code/modules/clothing/suits/_suits.dm @@ -10,7 +10,7 @@ var/blood_overlay_type = "suit" var/togglename = null var/suittoggled = FALSE - pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo // WaspStation Edit - Exowear Pockets + pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo //WS Edit - Exowear Pockets /obj/item/clothing/suit/worn_overlays(isinhands = FALSE) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 41166109138..f7364b778ef 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -57,7 +57,7 @@ /obj/item/clothing/suit/armor/hos/trenchcoat name = "armored trenchcoat" desc = "A trenchcoat enhanced with a special lightweight kevlar. The epitome of tactical plainclothes." - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "hostrench" item_state = "hostrench" flags_inv = 0 @@ -66,8 +66,8 @@ /obj/item/clothing/suit/armor/vest/security/warden name = "warden's jacket" desc = "A black armored jacket with silver shoulder designations and '/Warden/' stitched into one of the chest pockets." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "warden_alt" item_state = "armor" body_parts_covered = CHEST|GROIN|ARMS @@ -95,8 +95,8 @@ /obj/item/clothing/suit/armor/vest/capcarapace name = "captain's carapace" desc = "A fireproof armored chestpiece reinforced with ceramic plates and plasteel pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "capcarapace" item_state = "armor" body_parts_covered = CHEST|GROIN diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index bce7f2a151a..4406d7c21ff 100644 --- a/code/modules/clothing/suits/cloaks.dm +++ b/code/modules/clothing/suits/cloaks.dm @@ -9,7 +9,7 @@ w_class = WEIGHT_CLASS_SMALL body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDESUITSTORAGE - pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/cloak //WaspStation Edit - Exowear Pockets + pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/cloak //WS Edit - Exowear Pockets /obj/item/clothing/neck/cloak/suicide_act(mob/user) user.visible_message("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index cbcd6e4c14c..881ba5d0573 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -125,8 +125,8 @@ //Security /obj/item/clothing/suit/armor/vest/security - icon = 'waspstation/icons/obj/clothing/under/security.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/security.dmi' + icon = 'whitesands/icons/obj/clothing/under/security.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/security.dmi' /obj/item/clothing/suit/armor/vest/security/officer name = "security officer's jacket" diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index 7d307f70aa5..fa3ecd0641a 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -37,7 +37,7 @@ actions_types = list(/datum/action/item_action/toggle) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF hit_reaction_chance = 50 - pocket_storage_component_path = FALSE // WaspStation Edit - Exowear Pockets + pocket_storage_component_path = FALSE //WS Edit - Exowear Pockets /obj/item/clothing/suit/armor/reactive/attack_self(mob/user) active = !(active) diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index d23241c2d0d..6c2954752b6 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -4,7 +4,7 @@ actions_types = list(/datum/action/item_action/toggle_hood) var/obj/item/clothing/head/hooded/hood var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this - pocket_storage_component_path = FALSE // WaspStation Edit - Exowear Pockets + pocket_storage_component_path = FALSE //WS Edit - Exowear Pockets /obj/item/clothing/suit/hooded/Initialize() . = ..() diff --git a/code/modules/clothing/under/jobs/centcom.dm b/code/modules/clothing/under/jobs/centcom.dm index 7b56081c955..221665ab3b9 100644 --- a/code/modules/clothing/under/jobs/centcom.dm +++ b/code/modules/clothing/under/jobs/centcom.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/clothing/under/centcom.dmi' mob_overlay_icon = 'icons/mob/clothing/under/centcom.dmi' -/* WaspStation Edit - Better Command Uniforms +/*WS Edit - Better Command Uniforms /obj/item/clothing/under/rank/centcom/officer name = "\improper CentCom officer's jumpsuit" @@ -24,4 +24,4 @@ item_state = "g_suit" can_adjust = FALSE -Waspstation End */ +WS End */ diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm index a42226985fc..2664a2a8864 100644 --- a/code/modules/clothing/under/jobs/civilian/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian/civilian.dm @@ -56,7 +56,7 @@ can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP -/* WaspStation Begin - Better Command Uniforms (see waspstation\code\modules\clothing\under\jobs\civilian\civilian.dm) +/*WS Begin - Better Command Uniforms (see whitesands\code\modules\clothing\under\jobs\civilian\civilian.dm) /obj/item/clothing/under/rank/command/head_of_personnel desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"." @@ -90,7 +90,7 @@ can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP -WaspStation End */ +WS End */ /obj/item/clothing/under/rank/civilian/hydroponics desc = "It's a jumpsuit designed to protect against minor plant-related hazards." diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm index 30a797170df..252dc07325d 100644 --- a/code/modules/clothing/under/jobs/command.dm +++ b/code/modules/clothing/under/jobs/command.dm @@ -1,4 +1,4 @@ -/* WaspStation Edit - Better Command Uniforms +/*WS Edit - Better Command Uniforms /obj/item/clothing/under/rank/command/captain desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"." @@ -42,4 +42,4 @@ item_state = "by_suit" can_adjust = FALSE -WaspStation End */ +WS End */ diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm index 43e966febfe..197d3e34bc4 100644 --- a/code/modules/clothing/under/jobs/medical.dm +++ b/code/modules/clothing/under/jobs/medical.dm @@ -22,8 +22,8 @@ /obj/item/clothing/under/rank/medical/geneticist desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it." name = "geneticist's jumpsuit" - icon = 'icons/obj/clothing/under/rnd.dmi' //WaspStation Edit - Gen/Sci Split - mob_overlay_icon = 'icons/mob/clothing/under/rnd.dmi' //WaspStation Edit - Gen/Sci Split + icon = 'icons/obj/clothing/under/rnd.dmi' //WS Edit - Gen/Sci Split + mob_overlay_icon = 'icons/mob/clothing/under/rnd.dmi' //WS Edit - Gen/Sci Split icon_state = "genetics" item_state = "w_suit" permeability_coefficient = 0.5 diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 916bff0a7d2..abf9e453d2e 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -28,7 +28,7 @@ ///obj/item/clothing/under/rank/security/officer/grey //name = "grey security jumpsuit" -/obj/item/clothing/under/rank/security/officer/white //WaspStation edit - Better security jumpsuit sprites +/obj/item/clothing/under/rank/security/officer/white //WS edit - Better security jumpsuit sprites name = "white security jumpsuit" desc = "A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood." icon_state = "security" @@ -78,7 +78,7 @@ ///obj/item/clothing/under/rank/security/warden/grey // name = "grey security suit" -/obj/item/clothing/under/rank/security/warden/white //WaspStation edit - Better security jumpsuit sprites +/obj/item/clothing/under/rank/security/warden/white //WS edit - Better security jumpsuit sprites name = "white security suit" desc = "A formal relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood." icon_state = "warden" @@ -164,7 +164,7 @@ ///obj/item/clothing/under/rank/security/head_of_security/grey // name = "head of security's grey jumpsuit" -/obj/item/clothing/under/rank/security/head_of_security/white //WaspStation edit - Better security jumpsuit sprites +/obj/item/clothing/under/rank/security/head_of_security/white //WS edit - Better security jumpsuit sprites name = "head of security's white jumpsuit" desc = "There are old men, and there are bold men, but there are very few old, bold men." icon_state = "hos" @@ -208,7 +208,7 @@ alt_covers_chest = TRUE /* - WaspStation edit - Better security jumpsuit sprites + WS edit - Better security jumpsuit sprites */ /* diff --git a/code/modules/events/anomaly_pyro.dm b/code/modules/events/anomaly_pyro.dm index fa7605c3d78..20d20a30fa4 100644 --- a/code/modules/events/anomaly_pyro.dm +++ b/code/modules/events/anomaly_pyro.dm @@ -3,7 +3,7 @@ typepath = /datum/round_event/anomaly/anomaly_pyro max_occurrences = 5 - weight = 15 // WaspStation Edit - Pyroclastic Rebalance + weight = 15 //WS Edit - Pyroclastic Rebalance /datum/round_event/anomaly/anomaly_pyro startWhen = 3 diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm index 7976e789298..f7324e3c57d 100644 --- a/code/modules/events/brain_trauma.dm +++ b/code/modules/events/brain_trauma.dm @@ -2,7 +2,7 @@ name = "Spontaneous Brain Trauma" typepath = /datum/round_event/brain_trauma weight = 25 - min_players = 10 // WaspStation Edit - Min pop Braintrauma event (because braintrauma event on lowpop when theres no one to fix it is terible) + min_players = 10 //WS Edit - Min pop Braintrauma event (because braintrauma event on lowpop when theres no one to fix it is terible) /datum/round_event/brain_trauma fakeable = FALSE diff --git a/code/modules/events/bureaucratic_error.dm b/code/modules/events/bureaucratic_error.dm index 64756df526b..8753edc00be 100644 --- a/code/modules/events/bureaucratic_error.dm +++ b/code/modules/events/bureaucratic_error.dm @@ -3,11 +3,11 @@ typepath = /datum/round_event/bureaucratic_error max_occurrences = 1 weight = 5 - min_players = 10 //Wasp Edit - Bureaucracy Nerf + min_players = 10 //WS Edit - Bureaucracy Nerf /datum/round_event/bureaucratic_error announceWhen = 1 - //Wasp Start - Bureaucracy Nerf + //WS Start - Bureaucracy Nerf //these jobs can't be reopened, and AI can't have multiple latejoins anyway, so the error will not close them var/list/blacklisted = list( "AI", @@ -18,14 +18,14 @@ "Head of Security", "Chief Engineer", "Research Director", - "Chief Medical Officer") //Wasp End + "Chief Medical Officer") //WS End /datum/round_event/bureaucratic_error/announce(fake) priority_announce("A recent bureaucratic error in the Organic Resources Department may result in personnel shortages in some departments and redundant staffing in others.", "Paperwork Mishap Alert") /datum/round_event/bureaucratic_error/start() var/list/jobs = SSjob.occupations.Copy() - if(prob(5)) // Only allows latejoining as a single role. Add latejoin AI bluespace pods for fun later. Wasp Edit - Bureaucracy Nerf + if(prob(5)) // Only allows latejoining as a single role. Add latejoin AI bluespace pods for fun later. WS Edit - Bureaucracy Nerf var/datum/job/overflow = pick_n_take(jobs) overflow.spawn_positions = -1 overflow.total_positions = -1 // Ensures infinite slots as this role. Assistant will still be open for those that cant play it. diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 9cc46a76dc6..c724191c641 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -793,7 +793,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( ..() var/turf/source = random_far_turf() if(!sound_type) - sound_type = pick("airlock","airlock pry","console","explosion","far explosion","mech","glass","alarm","beepsky","mech","wall decon","door hack","speen") //Waspstation - Ghostspeen + sound_type = pick("airlock","airlock pry","console","explosion","far explosion","mech","glass","alarm","beepsky","mech","wall decon","door hack","speen") //WS - Ghostspeen feedback_details += "Type: [sound_type]" //Strange audio switch(sound_type) @@ -840,8 +840,8 @@ GLOBAL_LIST_INIT(hallucination_list, list( target.playsound_local(source, 'sound/items/screwdriver.ogg', 50, 1) sleep(rand(40,80)) target.playsound_local(source, 'sound/machines/airlockforced.ogg', 30, 1) - if("speen") //Waspstation - Ghostspeen - target.playsound_local(source, 'waspstation/sound/voice/speen.ogg', 50, 1) + if("speen") //WS - Ghostspeen + target.playsound_local(source, 'whitesands/sound/voice/speen.ogg', 50, 1) qdel(src) /datum/hallucination/weird_sounds @@ -1321,9 +1321,9 @@ GLOBAL_LIST_INIT(hallucination_list, list( H.fire() qdel(src) -//Wasp Begin - Borers +//WS Begin - Borers /obj/effect/hallucination/simple/borer - image_icon = 'waspstation/icons/mob/borer.dmi' + image_icon = 'whitesands/icons/mob/borer.dmi' image_state = "brainslug" /datum/hallucination/borer @@ -1353,4 +1353,4 @@ GLOBAL_LIST_INIT(hallucination_list, list( qdel(borer) qdel(src) -//Wasp end +//WS end diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 9ab77dc1be2..5f9d37f0b47 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -4,7 +4,7 @@ /obj/item/reagent_containers/food/drinks name = "drink" desc = "yummy" - icon = 'waspstation/icons/obj/drinks.dmi' + icon = 'whitesands/icons/obj/drinks.dmi' icon_state = null lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' @@ -111,7 +111,7 @@ return var/obj/item/broken_bottle/B = new (loc) B.icon_state = icon_state - var/icon/I = new('waspstation/icons/obj/drinks.dmi', src.icon_state) + var/icon/I = new('whitesands/icons/obj/drinks.dmi', src.icon_state) I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1) I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0)) B.icon = I @@ -256,7 +256,7 @@ /obj/item/reagent_containers/food/drinks/waterbottle name = "bottle of water" desc = "A bottle of water filled at an old Earth bottling facility." - icon = 'waspstation/icons/obj/drinks.dmi' + icon = 'whitesands/icons/obj/drinks.dmi' icon_state = "smallbottle" item_state = "bottle" list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard @@ -443,7 +443,7 @@ return var/obj/item/broken_bottle/B = new (loc) B.icon_state = icon_state - var/icon/I = new('waspstation/icons/obj/drinks.dmi', src.icon_state) + var/icon/I = new('whitesands/icons/obj/drinks.dmi', src.icon_state) I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1) I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0)) B.icon = I @@ -502,7 +502,7 @@ /obj/item/reagent_containers/food/drinks/colocup name = "colo cup" desc = "A cheap, mass produced style of cup, typically used at parties. They never seem to come out red, for some reason..." - icon = 'waspstation/icons/obj/drinks.dmi' + icon = 'whitesands/icons/obj/drinks.dmi' icon_state = "colocup" lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 7495edb7353..2a1cf4684a5 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -42,7 +42,7 @@ thrower.put_in_hands(B) B.icon_state = icon_state - var/icon/I = new('waspstation/icons/obj/drinks.dmi', src.icon_state) + var/icon/I = new('whitesands/icons/obj/drinks.dmi', src.icon_state) I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1) I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0)) B.icon = I @@ -135,7 +135,7 @@ /obj/item/broken_bottle name = "broken bottle" desc = "A bottle with a sharp broken bottom." - icon = 'waspstation/icons/obj/drinks.dmi' + icon = 'whitesands/icons/obj/drinks.dmi' icon_state = "broken_bottle" force = 9 throwforce = 5 @@ -146,7 +146,7 @@ hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("stabbed", "slashed", "attacked") sharpness = IS_SHARP - var/static/icon/broken_outline = icon('waspstation/icons/obj/drinks.dmi', "broken") + var/static/icon/broken_outline = icon('whitesands/icons/obj/drinks.dmi', "broken") /obj/item/broken_bottle/Initialize() . = ..() diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index 4b74f2ba33f..327117227e0 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -52,7 +52,7 @@ icon_state = "ambrosiadeus" filling_color = "#008B8B" wine_power = 50 - wine_flavor = "the hand of god" //wasp edit: new wine flavors + wine_flavor = "the hand of god" //WS edit: new wine flavors //Ambrosia Gaia /obj/item/seeds/ambrosia/gaia diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm index eeb68ba34c1..91fbb4d72c1 100644 --- a/code/modules/hydroponics/grown/apple.dm +++ b/code/modules/hydroponics/grown/apple.dm @@ -50,4 +50,4 @@ filling_color = "#FFD700" distill_reagent = null wine_power = 50 - wine_flavor = "forbidden knowledge and discord" //wasp edit: new wine flavors + wine_flavor = "forbidden knowledge and discord" //WS edit: new wine flavors diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm index b7b806a9f76..42615aa84fd 100644 --- a/code/modules/hydroponics/grown/beans.dm +++ b/code/modules/hydroponics/grown/beans.dm @@ -53,4 +53,4 @@ foodtype = VEGETABLES tastes = list("koi" = 1) wine_power = 40 - wine_flavor = "something fishy" //wasp edit: new wine flavors + wine_flavor = "something fishy" //WS edit: new wine flavors diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index 1e6e68f7b87..74388caa601 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -78,7 +78,7 @@ tastes = list("death-berry" = 1) distill_reagent = null wine_power = 70 - wine_flavor = "something breathtaking" //wasp edit: new wine flavors + wine_flavor = "something breathtaking" //WS edit: new wine flavors // Glow Berries /obj/item/seeds/berry/glow @@ -105,7 +105,7 @@ tastes = list("glow-berry" = 1) distill_reagent = null wine_power = 60 - wine_flavor = "gentle warmth" //wasp edit: new wine flavors + wine_flavor = "gentle warmth" //WS edit: new wine flavors // Cherries /obj/item/seeds/cherry diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index 82a9e305e0c..2d9186802c5 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -111,7 +111,7 @@ desc = "It feels smooth and nice to the touch." icon_state = "whitecannabis" wine_power = 40 - wine_flavor = "medicinal properties" //wasp edit: new wine flavors + wine_flavor = "medicinal properties" //WS edit: new wine flavors /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate seed = /obj/item/seeds/cannabis/ultimate @@ -120,4 +120,4 @@ icon_state = "ocannabis" volume = 420 wine_power = 120 - wine_flavor = "the highest highs and the lowest lows" //wasp edit: new wine flavors + wine_flavor = "the highest highs and the lowest lows" //WS edit: new wine flavors diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 90e0f66356b..306be5883e1 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -27,7 +27,7 @@ bitesize_mod = 2 foodtype = FRUIT wine_power = 20 - wine_flavor = "a lake of fire" //wasp edit: new wine flavors + wine_flavor = "a lake of fire" //WS edit: new wine flavors // Ice Chili /obj/item/seeds/chili/ice @@ -53,7 +53,7 @@ bitesize_mod = 2 foodtype = FRUIT wine_power = 30 - wine_flavor = "the 8th circle of hell" //wasp edit: new wine flavors + wine_flavor = "the 8th circle of hell" //WS edit: new wine flavors // Ghost Chili /obj/item/seeds/chili/ghost @@ -81,7 +81,7 @@ bitesize_mod = 4 foodtype = FRUIT wine_power = 50 - wine_flavor = "burning regret and the veil growing thinner" //wasp edit: new wine flavors + wine_flavor = "burning regret and the veil growing thinner" //WS edit: new wine flavors /obj/item/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user) . = ..() diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index d9ad1f7c36a..dcfc5bfbb3e 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -112,7 +112,7 @@ bitesize_mod = 2 foodtype = FRUIT wine_power = 70 - wine_flavor = "an urge to burn houses down" //wasp edit: new wine flavors + wine_flavor = "an urge to burn houses down" //WS edit: new wine flavors /obj/item/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user) user.visible_message("[user] primes [src]!", "You prime [src]!") @@ -186,7 +186,7 @@ juice_results = list(/datum/reagent/consumable/orangejuice = 0) tastes = list("polygons" = 1, "oranges" = 1) wine_power = 90 - wine_flavor = "removals" //wasp edit: new wine flavors + wine_flavor = "removals" //WS edit: new wine flavors /obj/item/reagent_containers/food/snacks/grown/citrus/orange_3d/pickup(mob/user) . = ..() diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm index c1153480a82..2c560393d69 100644 --- a/code/modules/hydroponics/grown/cocoa_vanilla.dm +++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm @@ -82,7 +82,7 @@ juice_results = list(/datum/reagent/consumable/bungojuice = 0) tastes = list("bungo" = 2, "tropical fruitiness" = 1) wine_power = 80 - wine_flavor = "Hula! baby" //wasp edit: new wine flavors + wine_flavor = "Hula! baby" //WS edit: new wine flavors /obj/item/reagent_containers/food/snacks/grown/bungopit seed = /obj/item/seeds/cocoapod/bungotree diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 55b8162879e..985a32fe727 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -84,7 +84,7 @@ bitesize_mod = 3 foodtype = VEGETABLES wine_power = 40 - wine_flavor = "Purple" //wasp edit: new wine flavors. capitalization intentional + wine_flavor = "Purple" //WS edit: new wine flavors. capitalization intentional // Geranium /obj/item/seeds/poppy/geranium diff --git a/code/modules/hydroponics/grown/garlic.dm b/code/modules/hydroponics/grown/garlic.dm index 0f724e7b53f..b9ae83af9e6 100644 --- a/code/modules/hydroponics/grown/garlic.dm +++ b/code/modules/hydroponics/grown/garlic.dm @@ -20,4 +20,4 @@ bitesize_mod = 2 tastes = list("garlic" = 1) wine_power = 10 - wine_flavor = "vampire repellant" //wasp edit: new wine flavors + wine_flavor = "vampire repellant" //WS edit: new wine flavors diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm index c4f15571371..eab251f7f1c 100644 --- a/code/modules/hydroponics/grown/grass_carpet.dm +++ b/code/modules/hydroponics/grown/grass_carpet.dm @@ -28,7 +28,7 @@ var/stacktype = /obj/item/stack/tile/grass var/tile_coefficient = 0.02 // 1/50 wine_power = 15 - wine_flavor = "rabbit food" //wasp edit: new wine flavors + wine_flavor = "rabbit food" //WS edit: new wine flavors /obj/item/reagent_containers/food/snacks/grown/grass/attack_self(mob/user) to_chat(user, "You prepare the astroturf.") @@ -62,7 +62,7 @@ filling_color = "#3399ff" stacktype = /obj/item/stack/tile/fairygrass wine_power = 45 - wine_flavor = "wild fantasy" //wasp edit: new wine flavors + wine_flavor = "wild fantasy" //WS edit: new wine flavors // Carpet /obj/item/seeds/grass/carpet @@ -82,4 +82,4 @@ icon_state = "carpetclump" stacktype = /obj/item/stack/tile/carpet wine_power = 30 - wine_flavor = "lint and dust" //wasp edit: new wine flavors + wine_flavor = "lint and dust" //WS edit: new wine flavors diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm index 8781bfd7c7e..33f3df827dc 100644 --- a/code/modules/hydroponics/grown/kudzu.dm +++ b/code/modules/hydroponics/grown/kudzu.dm @@ -105,4 +105,4 @@ foodtype = VEGETABLES | GROSS tastes = list("kudzu" = 1) wine_power = 45 - wine_flavor = "choking vines" //wasp edit: new wine flavors + wine_flavor = "choking vines" //WS edit: new wine flavors diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index c68dd73b6f3..a1d583a8f2d 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -95,7 +95,7 @@ bitesize_mod = 3 foodtype = VEGETABLES wine_power = 35 - wine_flavor = "the vast and infinite cosmos" //wasp edit: new wine flavors + wine_flavor = "the vast and infinite cosmos" //WS edit: new wine flavors tastes = list("thistle" = 2, "artichoke" = 1) // Cabbage @@ -184,7 +184,7 @@ foodtype = FRUIT tastes = list("gunpowder" = 1) wine_power = 90 //It burns going down, too. - wine_flavor = "the most powerful handgun in the world" //wasp edit: new wine flavors + wine_flavor = "the most powerful handgun in the world" //WS edit: new wine flavors //Cherry Bombs /obj/item/seeds/cherry/bomb @@ -208,7 +208,7 @@ volume = 125 //Gives enough room for the gunpowder at max potency max_integrity = 40 wine_power = 80 - wine_flavor = "smokey sweetness and poprocks" //wasp edit: new wine flavors + wine_flavor = "smokey sweetness and poprocks" //WS edit: new wine flavors /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/attack_self(mob/living/user) user.visible_message("[user] plucks the stem from [src]!", "You pluck the stem from [src], which begins to hiss loudly!") diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 8c03b8d4204..07c0ead81f1 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -84,7 +84,7 @@ icon_state = "angel" filling_color = "#C0C0C0" wine_power = 60 - wine_flavor = "armageddon" //wasp edit: new wine flavors + wine_flavor = "armageddon" //WS edit: new wine flavors // Liberty Cap /obj/item/seeds/liberty @@ -110,7 +110,7 @@ icon_state = "libertycap" filling_color = "#DAA520" wine_power = 80 - wine_flavor = "your third eye opening" //wasp edit: new wine flavors + wine_flavor = "your third eye opening" //WS edit: new wine flavors // Plump Helmet /obj/item/seeds/plump @@ -233,7 +233,7 @@ icon_state = "jupitercup" filling_color = "#B5003D" wine_power = 50 - wine_flavor = "rolling thunder and crackling lightning" //wasp edit: new wine flavors + wine_flavor = "rolling thunder and crackling lightning" //WS edit: new wine flavors // Glowshroom /obj/item/seeds/glowshroom @@ -264,7 +264,7 @@ filling_color = "#00FA9A" var/effect_path = /obj/structure/glowshroom wine_power = 50 - wine_flavor = "luminescence" //wasp edit: new wine flavors + wine_flavor = "luminescence" //WS edit: new wine flavors /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user) if(isspaceturf(user.loc)) @@ -312,7 +312,7 @@ effect_path = /obj/structure/glowshroom/glowcap tastes = list("glowcap" = 1) wine_power = 60 - wine_flavor = "battery acid" //wasp edit: new wine flavors + wine_flavor = "battery acid" //WS edit: new wine flavors //Shadowshroom @@ -338,7 +338,7 @@ effect_path = /obj/structure/glowshroom/shadowshroom tastes = list("shadow" = 1, "mushroom" = 1) wine_power = 60 - wine_flavor = "flashdarks" //wasp edit: new wine flavors + wine_flavor = "flashdarks" //WS edit: new wine flavors /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom/attack_self(mob/user) . = ..() diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index 3837310b721..7f059051b01 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -45,7 +45,7 @@ throw_range = 3 attack_verb = list("stung") wine_power = 20 - wine_flavor = "tingling itchiness" //wasp edit: new wine flavors + wine_flavor = "tingling itchiness" //WS edit: new wine flavors /obj/item/reagent_containers/food/snacks/grown/nettle/suicide_act(mob/user) user.visible_message("[user] is eating some of [src]! It looks like [user.p_theyre()] trying to commit suicide!") @@ -93,7 +93,7 @@ force = 30 throwforce = 15 wine_power = 50 - wine_flavor = "burning rage" //wasp edit: new wine flavors + wine_flavor = "burning rage" //WS edit: new wine flavors /obj/item/reagent_containers/food/snacks/grown/nettle/death/add_juice() ..() diff --git a/code/modules/hydroponics/grown/peas.dm b/code/modules/hydroponics/grown/peas.dm index c9bc120ba49..40c0d0e7f5c 100644 --- a/code/modules/hydroponics/grown/peas.dm +++ b/code/modules/hydroponics/grown/peas.dm @@ -60,7 +60,7 @@ filling_color = "#ee7bee" bitesize_mod = 2 foodtype = VEGETABLES - // Waspstation edit - Adds Juice Reagent for recipes + //WS edit - Adds Juice Reagent for recipes juice_results = list(/datum/reagent/consumable/laughsyrup = 0) tastes = list ("a prancing rabbit" = 1) //Vib Ribbon sends her regards.. wherever she is. wine_power = 90 diff --git a/code/modules/hydroponics/grown/random.dm b/code/modules/hydroponics/grown/random.dm index 895bed0645c..c533c912a54 100644 --- a/code/modules/hydroponics/grown/random.dm +++ b/code/modules/hydroponics/grown/random.dm @@ -27,7 +27,7 @@ desc = "What could this even be?" icon_state = "crunchy" bitesize_mod = 2 - wine_flavor = "surprise mechanics" //wasp edit: surprise robberies + wine_flavor = "surprise mechanics" //WS edit: surprise robberies /obj/item/reagent_containers/food/snacks/grown/random/Initialize() . = ..() diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 635a56ea635..824d1e0b66d 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -2,7 +2,7 @@ /obj/item/plant_analyzer name = "plant analyzer" desc = "A scanner used to evaluate a plant's various areas of growth." - icon = 'waspstation/icons/obj/device.dmi' //Waspstation edit - analyzer update + icon = 'whitesands/icons/obj/device.dmi' //WS edit - analyzer update icon_state = "hydro" item_state = "analyzer" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 34738fb2d6e..76ca1a14d79 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -115,7 +115,7 @@ if(myseed.get_gene(/datum/plant_gene/trait/plant_type/crystal)) temp_sustain = TRUE - if(self_sustaining || temp_sustain) // Wasp edit end + if(self_sustaining || temp_sustain) //WS edit end adjustNutri(1) adjustWater(rand(3,5)) adjustWeeds(-2) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 3e690fd4629..2e0dc0bf449 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -142,7 +142,7 @@ ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_PHARMACY, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_SOLGOV) //WaspStation Edit - SolGov Rep + ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_SOLGOV) //WS Edit - SolGov Rep /proc/get_all_centcom_access() return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_TELEPORTER, ACCESS_CENT_CAPTAIN) @@ -170,7 +170,7 @@ if(2) //security return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_HOS) if(3) //medbay - return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PHARMACY, ACCESS_PSYCHOLOGY) //WaspStation Edit - Gen/Sci Split + return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PHARMACY, ACCESS_PSYCHOLOGY) //WS Edit - Gen/Sci Split if(4) //research return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK) if(5) //engineering and maintenance @@ -334,12 +334,12 @@ if(ACCESS_MECH_ENGINE) return "Engineering Mech Access" -//WaspStation Begin +//WS Begin if(ACCESS_CLONING) return "Cloning Room" if(ACCESS_SOLGOV) return "SolGov Office" -//WaspStation End +//WS End /proc/get_centcom_access_desc(A) switch(A) @@ -365,8 +365,8 @@ /proc/get_all_jobs() return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", - "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic", "Prisoner", "Psychologist", //WaspStation Edit - Brig Phys / SolGov Rep - "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "SolGov Representative") //WaspStation Edit - Brig Phys / SolGov Rep + "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic", "Prisoner", "Psychologist", //WS Edit - Brig Phys / SolGov Rep + "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "SolGov Representative") //WS Edit - Brig Phys / SolGov Rep /proc/get_all_job_icons() //For all existing HUD icons return get_all_jobs() + list("Emergency Response Team Commander", "Security Response Officer", "Engineering Response Officer", "Medical Response Officer", "Entertainment Response Officer", "Religious Response Officer", "Janitorial Response Officer", "Death Commando") diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 23eebf77564..4198a9d3046 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -108,10 +108,10 @@ if(!permitted) to_chat(M, "Your current species or role does not permit you to spawn with [gear]!") continue - // WaspStation Edit - Fix Loadout Uniforms not spawning ID/PDA + //WS Edit - Fix Loadout Uniforms not spawning ID/PDA if(G.slot == ITEM_SLOT_ICLOTHING) continue // Handled in pre_equip - //End WaspStation Edit - Fix Loadout Uniforms not spawning ID/PDA + //EndWS Edit - Fix Loadout Uniforms not spawning ID/PDA if(G.slot) if(!H.equip_to_slot_or_del(G.spawn_item(H, owner = H), G.slot)) LAZYADD(gear_leftovers, G) @@ -298,7 +298,7 @@ holder = "[alt_uniform]" if(PREF_GREYSUIT) holder = "/obj/item/clothing/under/color/grey" - // WaspStation Edit - Fix Loadout Uniforms not spawning ID/PDA + //WS Edit - Fix Loadout Uniforms not spawning ID/PDA if(PREF_LOADOUT) if (preference_source == null) holder = "[uniform]" // Who are we getting the loadout pref from anyways? @@ -312,7 +312,7 @@ holder = "[uniform]" else uniform = pref_loadout_uniform - // End WaspStation Edit - Fix Loadout Uniforms not spawning ID/PDA + // EndWS Edit - Fix Loadout Uniforms not spawning ID/PDA else holder = "[uniform]" @@ -353,12 +353,12 @@ C.access = J.get_access() shuffle_inplace(C.access) // Shuffle access list to make NTNet passkeys less predictable C.registered_name = H.real_name - //Wasp begin - Alt job titles + //WS begin - Alt job titles if(preference_source && preference_source.prefs && preference_source.prefs.alt_titles_preferences[J.title]) C.assignment = preference_source.prefs.alt_titles_preferences[J.title] else C.assignment = J.title - //Wasp end + //WS end if(H.age) C.registered_age = H.age C.update_label() @@ -373,12 +373,12 @@ var/obj/item/pda/PDA = H.get_item_by_slot(pda_slot) if(istype(PDA)) PDA.owner = H.real_name - //Wasp begin - Alt job titles + //WS begin - Alt job titles if(preference_source && preference_source.prefs && preference_source.prefs.alt_titles_preferences[J.title]) PDA.ownjob = preference_source.prefs.alt_titles_preferences[J.title] else PDA.ownjob = J.title - //Wasp end + //WS end PDA.update_label() /datum/outfit/job/get_chameleon_disguise_info() diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm index 5253409ca8f..b294bf330d7 100644 --- a/code/modules/jobs/job_types/ai.dm +++ b/code/modules/jobs/job_types/ai.dm @@ -13,8 +13,8 @@ exp_type_department = EXP_TYPE_SILICON display_order = JOB_DISPLAY_ORDER_AI var/do_special_check = TRUE - wiki_page = "AI" //WaspStation Edit - Wikilinks/Warning - special_notice = "Your laws take precedence over everything, including space law and past objectives. Do NOT break them." //WaspStation Edit - Wikilinks/Warning + wiki_page = "AI" //WS Edit - Wikilinks/Warning + special_notice = "Your laws take precedence over everything, including space law and past objectives. Do NOT break them." //WS Edit - Wikilinks/Warning /datum/job/ai/equip(mob/living/carbon/human/H, visualsOnly, announce, latejoin, datum/outfit/outfit_override, client/preference_source = null) if(visualsOnly) diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index ef76e06ccac..ca8bb96ef1a 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -15,7 +15,7 @@ Assistant paycheck = PAYCHECK_ASSISTANT // Get a job. Job reassignment changes your paycheck now. Get over it. paycheck_department = ACCOUNT_CIV display_order = JOB_DISPLAY_ORDER_ASSISTANT - wiki_page = "Assistant" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Assistant" //WS Edit - Wikilinks/Warning /datum/job/assistant/get_access() if(CONFIG_GET(flag/assistants_have_maint_access) || !CONFIG_GET(flag/jobs_have_minimal_access)) //Config has assistant maint access set diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index 5af1f67efe0..b5c3c0c7da9 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -8,7 +8,7 @@ selection_color = "#fff5cc" exp_requirements = 60 exp_type = EXP_TYPE_CREW - wiki_page = "Guide_to_Atmospherics" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Guide_to_Atmospherics" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/atmos @@ -28,9 +28,9 @@ l_pocket = /obj/item/pda/atmos ears = /obj/item/radio/headset/headset_eng uniform = /obj/item/clothing/under/rank/engineering/atmospheric_technician - alt_uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard //WS Edit - Alt Uniforms alt_suit = /obj/item/clothing/suit/hazardvest - dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering //WS Edit - Alt Uniforms r_pocket = /obj/item/analyzer backpack = /obj/item/storage/backpack/industrial @@ -60,8 +60,8 @@ uniform = /obj/item/clothing/under/rank/engineering/atmospheric_technician/life_support_specialist backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1, /obj/item/storage/box/survival=2) -/datum/outfit/job/atmos/chadmos // WaspStation Edit - Give Chadmos Sr. Uniform - name = "Atmospheric Technician (Chadmos)" // WaspStation Edit - Give Chadmos Sr. Uniform +/datum/outfit/job/atmos/chadmos //WS Edit - Give Chadmos Sr. Uniform + name = "Atmospheric Technician (Chadmos)" //WS Edit - Give Chadmos Sr. Uniform belt = null uniform = /obj/item/clothing/under/suit/senior_atmos diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index ebf8fe6b8e8..69f4c9b788e 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -6,7 +6,7 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#bbe291" - wiki_page = "Drinks" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Drinks" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/bartender @@ -24,7 +24,7 @@ belt = /obj/item/pda/bar ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/civilian/bartender - alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple //WS Edit - Alt Uniforms alt_suit = /obj/item/clothing/suit/apron/purple_bartender suit = /obj/item/clothing/suit/armor/vest backpack_contents = list(/obj/item/storage/box/beanbag=1) diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index 3f23e687008..ba4e9d4c286 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -6,7 +6,7 @@ spawn_positions = 2 supervisors = "the head of personnel" selection_color = "#bbe291" - wiki_page = "Guide_to_Botany" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Guide_to_Botany" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/botanist @@ -23,8 +23,8 @@ belt = /obj/item/pda/botanist ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/civilian/hydroponics - alt_uniform = /obj/item/clothing/under/color/green //Wasp Edit - Alt Uniforms - dcoat = /obj/item/clothing/suit/hooded/wintercoat/hydro //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/color/green //WS Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/hydro //WS Edit - Alt Uniforms suit = /obj/item/clothing/suit/apron alt_suit = /obj/item/clothing/suit/apron/overalls gloves =/obj/item/clothing/gloves/botanic_leather diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index d6de93c8821..a7163c30c02 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -13,7 +13,7 @@ exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_COMMAND wiki_page = "Captain" - special_notice = "You may be the Captain of this station, but you are still beholden to The Corporation." //WaspStation Edit - Wikilinks/Warning + special_notice = "You may be the Captain of this station, but you are still beholden to The Corporation." //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/captain @@ -43,11 +43,11 @@ ears = /obj/item/radio/headset/heads/captain/alt gloves = /obj/item/clothing/gloves/color/captain uniform = /obj/item/clothing/under/rank/command/captain - alt_uniform = /obj/item/clothing/under/rank/command/captain/parade //Wasp Edit - Alt Uniforms - dcoat = /obj/item/clothing/under/rank/command/captain/suit //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/command/captain/parade //WS Edit - Alt Uniforms + dcoat = /obj/item/clothing/under/rank/command/captain/suit //WS Edit - Alt Uniforms suit = /obj/item/clothing/suit/armor/vest/capcarapace alt_suit = /obj/item/clothing/suit/armor/vest/capcarapace/alt - dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/sneakers/brown head = /obj/item/clothing/head/caphat backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/station_charter=1) diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm index 8cbf77b428f..58c57e8bf50 100644 --- a/code/modules/jobs/job_types/cargo_technician.dm +++ b/code/modules/jobs/job_types/cargo_technician.dm @@ -6,7 +6,7 @@ spawn_positions = 2 supervisors = "the quartermaster and the head of personnel" selection_color = "#dcba97" - wiki_page = "Cargo_technician" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Cargo_technician" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/cargo_tech @@ -24,9 +24,9 @@ belt = /obj/item/pda/cargo ears = /obj/item/radio/headset/headset_cargo uniform = /obj/item/clothing/under/rank/cargo/tech - alt_uniform = /obj/item/clothing/under/shorts/grey //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/shorts/grey //WS Edit - Alt Uniforms alt_suit = /obj/item/clothing/suit/hazardvest - dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo //WS Edit - Alt Uniforms l_hand = /obj/item/export_scanner backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1) diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index 63d5b3cc17d..e8dfe468244 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -5,7 +5,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" - wiki_page = "Chaplain" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Chaplain" //WS Edit - Wikilinks/Warning selection_color = "#bbe291" outfit = /datum/outfit/job/chaplain @@ -122,7 +122,7 @@ belt = /obj/item/pda/chaplain ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/civilian/chaplain - alt_uniform = /obj/item/clothing/under/pants/youngfolksjeans //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/pants/youngfolksjeans //WS Edit - Alt Uniforms backpack_contents = list( /obj/item/stamp/chap = 1, /obj/item/camera/spooky = 1 diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index 789fe0abd8b..4b30f8a45e9 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -8,11 +8,11 @@ selection_color = "#ffeef0" exp_type = EXP_TYPE_CREW exp_requirements = 60 - wiki_page = "Guide_to_Chemistry" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Guide_to_Chemistry" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/chemist - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_EVA) //WaspStation Edit - Gen/Sci Split + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_EVA) //WS Edit - Gen/Sci Split minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_PHARMACY) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED @@ -27,10 +27,10 @@ belt = /obj/item/pda/chemist ears = /obj/item/radio/headset/headset_med uniform = /obj/item/clothing/under/rank/medical/chemist - alt_uniform = /obj/item/clothing/under/rank/medical/chemist //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/medical/chemist //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/sneakers/white suit = /obj/item/clothing/suit/toggle/labcoat/chemist - dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //WS Edit - Alt Uniforms backpack = /obj/item/storage/backpack/chemistry satchel = /obj/item/storage/backpack/satchel/chem duffelbag = /obj/item/storage/backpack/duffelbag/med diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 79e70a96ccd..aa41e634ee6 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -13,7 +13,7 @@ exp_requirements = 180 exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_ENGINEERING - wiki_page = "Chief_Engineer" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Chief_Engineer" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/ce @@ -39,9 +39,9 @@ l_pocket = /obj/item/pda/heads/ce ears = /obj/item/radio/headset/heads/ce uniform = /obj/item/clothing/under/rank/engineering/chief_engineer - alt_uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard //WS Edit - Alt Uniforms alt_suit = /obj/item/clothing/suit/hazardvest - dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/sneakers/brown head = /obj/item/clothing/head/hardhat/white gloves = /obj/item/clothing/gloves/color/black diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index ae125698db7..df553d8c0fa 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -17,10 +17,10 @@ outfit = /datum/outfit/job/cmo - access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_PHARMACY, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM, //WaspStation edit - Gen/Sci Split + access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_PHARMACY, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM, //WS edit - Gen/Sci Split ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_MECH_MEDICAL, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_PHARMACY, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM, //WaspStation edit - Gen/Sci Split + minimal_access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_PHARMACY, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM, //WS edit - Gen/Sci Split ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_MECH_MEDICAL, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS) paycheck = PAYCHECK_COMMAND @@ -37,11 +37,11 @@ l_pocket = /obj/item/pinpointer/crew ears = /obj/item/radio/headset/heads/cmo uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer - alt_uniform = /obj/item/clothing/under/rank/medical/doctor/blue //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/medical/doctor/blue //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/sneakers/brown suit = /obj/item/clothing/suit/toggle/labcoat/cmo - alt_suit = /obj/item/clothing/suit/toggle/labcoat/mad // Wasp Edit - Alt-Job Titles - dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //Wasp Edit - Alt Uniforms + alt_suit = /obj/item/clothing/suit/toggle/labcoat/mad //WS Edit - Alt-Job Titles + dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //WS Edit - Alt Uniforms l_hand = /obj/item/storage/firstaid/medical suit_store = /obj/item/flashlight/pen backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index c428ea238c5..31f246df8f3 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -5,8 +5,8 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" - wiki_page = "Clown" //WaspStation Edit - Wikilinks/Warning - special_notice = "There is a difference between funny pranks and griefing. Know it." //WaspStation Edit - Wikilinks/Warning + wiki_page = "Clown" //WS Edit - Wikilinks/Warning + special_notice = "There is a difference between funny pranks and griefing. Know it." //WS Edit - Wikilinks/Warning selection_color = "#bbe291" outfit = /datum/outfit/job/clown @@ -30,7 +30,7 @@ belt = /obj/item/pda/clown ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/civilian/clown - alt_uniform = /obj/item/clothing/under/rank/civilian/clown/green //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/civilian/clown/green //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/clown_shoes mask = /obj/item/clothing/mask/gas/clown_hat l_pocket = /obj/item/bikehorn diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index 7ec1c645336..09ada2b43c6 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -6,7 +6,7 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#bbe291" - wiki_page = "Food" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Food" //WS Edit - Wikilinks/Warning var/cooks = 0 //Counts cooks amount outfit = /datum/outfit/job/cook @@ -25,7 +25,7 @@ belt = /obj/item/pda/cook ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/civilian/chef - alt_uniform = /obj/item/clothing/under/rank/civilian/cookjorts //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/civilian/cookjorts //WS Edit - Alt Uniforms suit = /obj/item/clothing/suit/toggle/chef alt_suit = /obj/item/clothing/suit/apron/chef head = /obj/item/clothing/head/chefhat @@ -53,7 +53,7 @@ var/datum/martial_art/cqc/under_siege/justacook = new justacook.teach(H) -// Wasp Edit Start - Alt-Job Titles +//WS Edit Start - Alt-Job Titles /datum/outfit/job/cook/grillmaster uniform = /obj/item/clothing/under/rank/civilian/cookjorts suit = null @@ -61,4 +61,4 @@ mask = null r_hand = /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy l_pocket = /obj/item/stack/sheet/mineral/coal -// Wasp Edit End - Alt-Job Titles +//WS Edit End - Alt-Job Titles diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index a24de3ca1eb..e5fe1e76b50 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -5,7 +5,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" - wiki_page = "Curator" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Curator" //WS Edit - Wikilinks/Warning selection_color = "#bbe291" outfit = /datum/outfit/job/curator diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm index 38c94464f84..32e8af92d18 100644 --- a/code/modules/jobs/job_types/cyborg.dm +++ b/code/modules/jobs/job_types/cyborg.dm @@ -9,8 +9,8 @@ minimal_player_age = 21 exp_requirements = 120 exp_type = EXP_TYPE_CREW - wiki_page = "Cyborg" //WaspStation Edit - Wikilinks/Warning - special_notice = "Your laws take precedence over everything, including space law and past objectives. Do NOT break them." //WaspStation Edit - Wikilinks/Warning + wiki_page = "Cyborg" //WS Edit - Wikilinks/Warning + special_notice = "Your laws take precedence over everything, including space law and past objectives. Do NOT break them." //WS Edit - Wikilinks/Warning display_order = JOB_DISPLAY_ORDER_CYBORG diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 4757c7a14f7..a3695efb7a6 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -10,8 +10,8 @@ minimal_player_age = 7 exp_requirements = 300 exp_type = EXP_TYPE_CREW - special_notice = "You are not a security officer, do not do their job for them. However, you can help them if they need immediate assistance." //WaspStation Edit - Wikilinks/Warning - wiki_page = "Space_Law" //WaspStation Edit - Wikilinks/Warning + special_notice = "You are not a security officer, do not do their job for them. However, you can help them if they need immediate assistance." //WS Edit - Wikilinks/Warning + wiki_page = "Space_Law" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/detective @@ -30,7 +30,7 @@ belt = /obj/item/pda/detective ears = /obj/item/radio/headset/headset_sec/alt uniform = /obj/item/clothing/under/rank/security/detective - alt_uniform = /obj/item/clothing/under/rank/security/detective/grey //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/security/detective/grey //WS Edit - Alt Uniforms neck = /obj/item/clothing/neck/tie/detective shoes = /obj/item/clothing/shoes/sneakers/brown suit = /obj/item/clothing/suit/det_suit diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 8d44ca43138..b37f5c2bfc3 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -1,21 +1,21 @@ /datum/job/geneticist title = "Geneticist" - department_head = list("Chief Medical Officer") // Wasp Edit - More Gen/Sci Split + department_head = list("Chief Medical Officer") //WS Edit - More Gen/Sci Split faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the chief medical officer" //WaspStation Edit - Gen/Sci Split + supervisors = "the chief medical officer" //WS Edit - Gen/Sci Split selection_color = "#ffeef0" exp_type = EXP_TYPE_CREW exp_requirements = 60 - wiki_page = "Guide_to_Genetics" //WaspStation Edit - Wikilinks + wiki_page = "Guide_to_Genetics" //WS Edit - Wikilinks outfit = /datum/outfit/job/geneticist - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_EVA) //WaspStation edit - Gen/Sci Split - minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_PHARMACY) //WaspStation edit - Gen/Sci Split + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_EVA) //WS edit - Gen/Sci Split + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_PHARMACY) //WS edit - Gen/Sci Split paycheck = PAYCHECK_MEDIUM - paycheck_department = ACCOUNT_MED // Wasp Edit - Connects gen to med budget + paycheck_department = ACCOUNT_MED //WS Edit - Connects gen to med budget display_order = JOB_DISPLAY_ORDER_GENETICIST @@ -26,8 +26,8 @@ belt = /obj/item/pda/geneticist ears = /obj/item/radio/headset/headset_medsci uniform = /obj/item/clothing/under/rank/medical/geneticist - alt_uniform = /obj/item/clothing/under/rank/medical/doctor/green //Wasp Edit - Alt Uniforms - dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/medical/doctor/green //WS Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/sneakers/white suit = /obj/item/clothing/suit/toggle/labcoat/genetics suit_store = /obj/item/flashlight/pen diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index b00aebbb4f8..2d1a48635eb 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -11,7 +11,7 @@ req_admin_notify = 1 minimal_player_age = 10 exp_requirements = 180 - wiki_page = "Head_of_Personnel" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Head_of_Personnel" //WS Edit - Wikilinks/Warning exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_SERVICE @@ -44,9 +44,9 @@ belt = /obj/item/pda/heads/head_of_personnel ears = /obj/item/radio/headset/heads/head_of_personnel uniform = /obj/item/clothing/under/rank/command/head_of_personnel - alt_uniform = /obj/item/clothing/under/rank/command/head_of_personnel/suit //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/command/head_of_personnel/suit //WS Edit - Alt Uniforms alt_suit = /obj/item/clothing/suit/ianshirt - dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/sneakers/brown head = /obj/item/clothing/head/hopcap backpack_contents = list(/obj/item/storage/box/ids=1,\ diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index a1196c68a64..7085d909d3f 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -11,8 +11,8 @@ req_admin_notify = 1 minimal_player_age = 14 exp_requirements = 300 - wiki_page = "Head_of_Security" //WaspStation Edit - Wikilinks/Warning - special_notice = "Remember, Space Law is THE law. Follow it." //WaspStation Edit - Wikilinks/Warning + wiki_page = "Head_of_Security" //WS Edit - Wikilinks/Warning + special_notice = "Remember, Space Law is THE law. Follow it." //WS Edit - Wikilinks/Warning exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_SECURITY @@ -43,9 +43,9 @@ shoes = /obj/item/clothing/shoes/jackboots suit = /obj/item/clothing/suit/armor/hos/trenchcoat alt_suit = /obj/item/clothing/suit/armor/vest/security/hos - dcoat = /obj/item/clothing/suit/hooded/wintercoat/security //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/security //WS Edit - Alt Uniforms gloves = /obj/item/clothing/gloves/color/black - head = /obj/item/clothing/head/beret/sec/hos //Wasp edit - Better Berets + head = /obj/item/clothing/head/beret/sec/hos //WS edit - Better Berets glasses = /obj/item/clothing/glasses/hud/security/sunglasses suit_store = /obj/item/gun/energy/e_gun r_pocket = /obj/item/assembly/flash/handheld diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index 2bb8061514c..c8e648f4f0a 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -6,7 +6,7 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#bbe291" - wiki_page = "Janitor" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Janitor" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/janitor @@ -24,7 +24,7 @@ belt = /obj/item/pda/janitor ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/civilian/janitor - alt_uniform = /obj/item/clothing/under/rank/civilian/janitor/maid //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/civilian/janitor/maid //WS Edit - Alt Uniforms backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) /datum/outfit/job/janitor/pre_equip(mob/living/carbon/human/H, visualsOnly) diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index 1eb264cd01c..4535b13cf67 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -5,8 +5,8 @@ total_positions = 2 spawn_positions = 2 supervisors = "the head of personnel" - special_notice = "You are not a security officer. However, you represent the law and can defend those who are mishandled by security in court." //WaspStation Edit - Wikilinks/Warning - wiki_page = "Lawyer" //WaspStation Edit - Wikilinks/Warning + special_notice = "You are not a security officer. However, you represent the law and can defend those who are mishandled by security in court." //WS Edit - Wikilinks/Warning + wiki_page = "Lawyer" //WS Edit - Wikilinks/Warning selection_color = "#bbe291" var/lawyers = 0 //Counts lawyer amount @@ -27,7 +27,7 @@ belt = /obj/item/pda/lawyer ears = /obj/item/radio/headset/headset_srvsec uniform = /obj/item/clothing/under/rank/civilian/lawyer/bluesuit - alt_uniform = /obj/item/clothing/under/rank/civilian/lawyer/red //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/civilian/lawyer/red //WS Edit - Alt Uniforms suit = /obj/item/clothing/suit/toggle/lawyer shoes = /obj/item/clothing/shoes/laceup l_hand = /obj/item/storage/briefcase/lawyer diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index d1748c04089..5f521170d6e 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -10,7 +10,7 @@ outfit = /datum/outfit/job/doctor - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_EVA) //WaspStation edit - Gen/Sci Split + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_EVA) //WS edit - Gen/Sci Split minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_PHARMACY) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED @@ -24,11 +24,11 @@ belt = /obj/item/pda/medical ears = /obj/item/radio/headset/headset_med uniform = /obj/item/clothing/under/rank/medical/doctor - alt_uniform = /obj/item/clothing/under/rank/medical/doctor/blue //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/medical/doctor/blue //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/sneakers/white suit = /obj/item/clothing/suit/toggle/labcoat alt_suit = /obj/item/clothing/suit/apron/surgical - dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //WS Edit - Alt Uniforms l_hand = /obj/item/storage/firstaid/medical suit_store = /obj/item/flashlight/pen @@ -40,7 +40,7 @@ chameleon_extras = /obj/item/gun/syringe -// Wasp Edit Start - Alt-Job Titles +//WS Edit Start - Alt-Job Titles /datum/outfit/job/doctor/surgeon name = "Medical Doctor (Surgeon)" @@ -98,4 +98,4 @@ suit_store = null backpack_contents = list(/obj/item/clipboard=1, /obj/item/folder/white=1, /obj/item/taperecorder=1) -// Wasp Edit End - Alt-Job Titles +//WS Edit End - Alt-Job Titles diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index 8c480c8d96e..8edecced542 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -5,7 +5,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" - wiki_page = "Mime" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Mime" //WS Edit - Wikilinks/Warning selection_color = "#bbe291" outfit = /datum/outfit/job/mime @@ -28,7 +28,7 @@ belt = /obj/item/pda/mime ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/civilian/mime - alt_uniform = /obj/item/clothing/under/rank/civilian/mime/sexy //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/civilian/mime/sexy //WS Edit - Alt Uniforms mask = /obj/item/clothing/mask/gas/mime gloves = /obj/item/clothing/gloves/color/white head = /obj/item/clothing/head/frenchberet diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index a4cf8a1a5b9..a8897620910 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -10,8 +10,8 @@ outfit = /datum/outfit/job/paramedic - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA) //WaspStation edit - Gen/Sci Split + Reduces Paramed access - minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA) // Waspstation edit - Reduces paramed access + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA) //WS edit - Gen/Sci Split + Reduces Paramed access + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA) //WS edit - Reduces paramed access paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED @@ -23,12 +23,12 @@ ears = /obj/item/radio/headset/headset_med uniform = /obj/item/clothing/under/rank/medical/paramedic - alt_uniform = /obj/item/clothing/under/rank/medical/doctor/blue //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/medical/doctor/blue //WS Edit - Alt Uniforms head = /obj/item/clothing/head/soft/paramedic shoes = /obj/item/clothing/shoes/sneakers/blue suit = /obj/item/clothing/suit/toggle/labcoat/paramedic alt_suit = /obj/item/clothing/suit/apron/surgical - dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //WS Edit - Alt Uniforms gloves = /obj/item/clothing/gloves/color/latex/nitrile belt = /obj/item/storage/belt/medical/paramedic id = /obj/item/card/id @@ -40,7 +40,7 @@ backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med - courierbag = /obj/item/storage/backpack/messenger/para //WaspStation Edit - Paramedic Bling + courierbag = /obj/item/storage/backpack/messenger/para //WS Edit - Paramedic Bling box = /obj/item/storage/box/survival/medical chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index 9ed68746fc0..0ec2597016d 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -15,7 +15,7 @@ name = "Prisoner" uniform = /obj/item/clothing/under/rank/prisoner - alt_uniform = /obj/item/clothing/under/rank/prisoner //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/prisoner //WS Edit - Alt Uniforms alt_suit = /obj/item/clothing/suit/jacket/leather shoes = /obj/item/clothing/shoes/sneakers/orange id = /obj/item/card/id/prisoner diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm index 876473afa01..57ef4caed76 100644 --- a/code/modules/jobs/job_types/psychologist.dm +++ b/code/modules/jobs/job_types/psychologist.dm @@ -1,4 +1,4 @@ -/* Wasp Edit - Fuck Psychologists. +/*WS Edit - Fuck Psychologists. /datum/job/psychologist title = "Psychologist" department_head = list("Head of Personnel","Chief Medical Officer") diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 7425537341f..521122bdb9c 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -6,8 +6,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#d7b088" - wiki_page = "Quartermaster" //WaspStation Edit - Wikilinks/Warning - special_notice = "You are not a head of staff. You answer to the Head of Personnel." //WaspStation Edit - Wikilinks/Warning + wiki_page = "Quartermaster" //WS Edit - Wikilinks/Warning + special_notice = "You are not a head of staff. You answer to the Head of Personnel." //WS Edit - Wikilinks/Warning exp_type_department = EXP_TYPE_SUPPLY // This is so the jobs menu can work properly outfit = /datum/outfit/job/quartermaster @@ -26,9 +26,9 @@ belt = /obj/item/pda/quartermaster ears = /obj/item/radio/headset/headset_cargo uniform = /obj/item/clothing/under/rank/cargo/qm - alt_uniform = /obj/item/clothing/under/pants/jeans //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/pants/jeans //WS Edit - Alt Uniforms alt_suit = /obj/item/clothing/suit/hazardvest - dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/sneakers/brown glasses = /obj/item/clothing/glasses/sunglasses l_hand = /obj/item/clipboard diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 26c143d359e..545aeca2a97 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -13,7 +13,7 @@ exp_type_department = EXP_TYPE_SCIENCE exp_requirements = 180 exp_type = EXP_TYPE_CREW - wiki_page = "Research_Director" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Research_Director" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/rd @@ -21,12 +21,12 @@ ACCESS_TOX_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE, ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, - ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK) //WaspStation edit - Gen/Sci Split + ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK) //WS edit - Gen/Sci Split minimal_access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_MORGUE, ACCESS_TOX_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE, ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, - ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK) //WaspStation edit - Gen/Sci Split + ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK) //WS edit - Gen/Sci Split paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SCI @@ -40,11 +40,11 @@ belt = /obj/item/pda/heads/rd ears = /obj/item/radio/headset/heads/rd uniform = /obj/item/clothing/under/rank/rnd/research_director - alt_uniform = /obj/item/clothing/under/rank/rnd/research_director/turtleneck //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/rnd/research_director/turtleneck //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/sneakers/brown suit = /obj/item/clothing/suit/toggle/labcoat alt_suit = /obj/item/clothing/suit/toggle/suspenders - dcoat = /obj/item/clothing/suit/hooded/wintercoat/science //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/science //WS Edit - Alt Uniforms l_hand = /obj/item/clipboard l_pocket = /obj/item/laser_pointer backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced=1) diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index c49e23bb3a5..373ea26f8d2 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -8,11 +8,11 @@ selection_color = "#ffeeff" exp_requirements = 60 exp_type = EXP_TYPE_CREW - wiki_page = "Guide_to_Robotics" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Guide_to_Robotics" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/roboticist - access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_MECH_SCIENCE, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM, ACCESS_XENOBIOLOGY) //WaspStation edit - Gen/Sci Split + access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_MECH_SCIENCE, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM, ACCESS_XENOBIOLOGY) //WS edit - Gen/Sci Split minimal_access = list(ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI @@ -27,10 +27,10 @@ l_pocket = /obj/item/pda/roboticist ears = /obj/item/radio/headset/headset_sci uniform = /obj/item/clothing/under/rank/rnd/roboticist - alt_uniform = /obj/item/clothing/under/rank/rnd/scientist //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/rnd/scientist //WS Edit - Alt Uniforms suit = /obj/item/clothing/suit/toggle/labcoat alt_suit = /obj/item/clothing/suit/toggle/suspenders/gray - dcoat = /obj/item/clothing/suit/hooded/wintercoat/science //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/science //WS Edit - Alt Uniforms backpack = /obj/item/storage/backpack/science satchel = /obj/item/storage/backpack/satchel/tox diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index b8881851623..1a763e66bd6 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -8,11 +8,11 @@ selection_color = "#ffeeff" exp_requirements = 60 exp_type = EXP_TYPE_CREW - wiki_page = "Scientist" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Scientist" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/scientist - access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE) //WaspStation edit - Gen/Sci Split + access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE) //WS edit - Gen/Sci Split minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI @@ -26,11 +26,11 @@ belt = /obj/item/pda/toxins ears = /obj/item/radio/headset/headset_sci uniform = /obj/item/clothing/under/rank/rnd/scientist - alt_uniform = /obj/item/clothing/under/rank/rnd/roboticist //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/rnd/roboticist //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/sneakers/white suit = /obj/item/clothing/suit/toggle/labcoat/science alt_suit = /obj/item/clothing/suit/toggle/suspenders/blue - dcoat = /obj/item/clothing/suit/hooded/wintercoat/science //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/science //WS Edit - Alt Uniforms backpack = /obj/item/storage/backpack/science satchel = /obj/item/storage/backpack/satchel/tox diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index b38aa574ac5..1d7f3570f92 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -10,8 +10,8 @@ minimal_player_age = 7 exp_requirements = 300 exp_type = EXP_TYPE_CREW - wiki_page = "Space_Law" //WaspStation Edit - Wikilinks/Warning - special_notice = "Space law is THE law. Follow it." //WaspStation Edit - Wikilinks/Warning + wiki_page = "Space_Law" //WS Edit - Wikilinks/Warning + special_notice = "Space law is THE law. Follow it." //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/security @@ -120,11 +120,11 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S head = /obj/item/clothing/head/helmet/sec suit = /obj/item/clothing/suit/armor/vest alt_suit = /obj/item/clothing/suit/armor/vest/security/officer - dcoat = /obj/item/clothing/suit/hooded/wintercoat/security //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/security //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/jackboots l_pocket = /obj/item/restraints/handcuffs r_pocket = /obj/item/assembly/flash/handheld - suit_store = /obj/item/gun/energy/e_gun/advtaser // Wasp edit - Readds tasers + suit_store = /obj/item/gun/energy/e_gun/advtaser //WS edit - Readds tasers backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/ammo_box/magazine/co9mm=1) //WS edit - free lethals backpack = /obj/item/storage/backpack/security diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index ef3e656ad21..4e5f4a1a1b9 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -6,7 +6,7 @@ spawn_positions = 3 supervisors = "the quartermaster and the head of personnel" selection_color = "#dcba97" - wiki_page = "Shaft_Miner" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Shaft_Miner" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/miner @@ -26,9 +26,9 @@ shoes = /obj/item/clothing/shoes/workboots/mining gloves = /obj/item/clothing/gloves/color/black uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland - alt_uniform = /obj/item/clothing/under/rank/cargo/miner //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/cargo/miner //WS Edit - Alt Uniforms alt_suit = /obj/item/clothing/suit/hazardvest - dcoat = /obj/item/clothing/suit/hooded/wintercoat/miner //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/miner //WS Edit - Alt Uniforms l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival r_pocket = /obj/item/storage/bag/ore //causes issues if spawned in backpack backpack_contents = list( diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index aae24d37e07..9e275f96862 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -8,7 +8,7 @@ selection_color = "#fff5cc" exp_requirements = 60 exp_type = EXP_TYPE_CREW - wiki_page = "Station_Engineer" //WaspStation Edit - Wikilinks/Warning + wiki_page = "Station_Engineer" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/engineer @@ -29,8 +29,8 @@ l_pocket = /obj/item/pda/engineering ears = /obj/item/radio/headset/headset_eng uniform = /obj/item/clothing/under/rank/engineering/engineer - alt_uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard //Wasp Edit - Alt Uniforms - dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard //WS Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering //WS Edit - Alt Uniforms shoes = /obj/item/clothing/shoes/workboots head = /obj/item/clothing/head/hardhat r_pocket = /obj/item/t_scanner @@ -56,7 +56,7 @@ head = null internals_slot = ITEM_SLOT_SUITSTORE -//Wasp Edit Start - Alt-Job Titles +//WS Edit Start - Alt-Job Titles /datum/outfit/job/engineer/electrician name = "Station Engineer (Electrician)" @@ -109,4 +109,4 @@ alt_uniform = null head = /obj/item/clothing/head/hardhat/dblue -//Wasp Edit End - Alt-Job Titles +//WS Edit End - Alt-Job Titles diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index b6f3d037a71..23cd797c512 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -8,12 +8,12 @@ selection_color = "#ffeef0" exp_type = EXP_TYPE_CREW exp_requirements = 60 - wiki_page = "Infections" //WaspStation Edit - Wikilinks/Warning - special_notice = "Don't release viruses, harmful or not, without the CMO's permission." //WaspStation Edit - Wikilinks/Warning + wiki_page = "Infections" //WS Edit - Wikilinks/Warning + special_notice = "Don't release viruses, harmful or not, without the CMO's permission." //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/virologist - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_EVA) //WaspStation edit - Gen/Sci Split + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_EVA) //WS edit - Gen/Sci Split minimal_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED @@ -27,12 +27,12 @@ belt = /obj/item/pda/viro ears = /obj/item/radio/headset/headset_med uniform = /obj/item/clothing/under/rank/medical/virologist - alt_uniform = /obj/item/clothing/under/rank/medical/doctor/green //Wasp Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/medical/doctor/green //WS Edit - Alt Uniforms mask = /obj/item/clothing/mask/surgical shoes = /obj/item/clothing/shoes/sneakers/white suit = /obj/item/clothing/suit/toggle/labcoat/virologist alt_suit = /obj/item/clothing/suit/toggle/labcoat/mad - dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //WS Edit - Alt Uniforms suit_store = /obj/item/flashlight/pen backpack = /obj/item/storage/backpack/virology diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 126b0a616a0..1150115df29 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -10,8 +10,8 @@ minimal_player_age = 7 exp_requirements = 300 exp_type = EXP_TYPE_CREW - wiki_page = "Space_Law" //WaspStation Edit - Wikilinks/Warning - special_notice = "You're the Warden, not a Security Officer. Your job is in the brig processing criminals, not patrolling the station." //WaspStation Edit - Wikilinks/Warning + wiki_page = "Space_Law" //WS Edit - Wikilinks/Warning + special_notice = "You're the Warden, not a Security Officer. Your job is in the brig processing criminals, not patrolling the station." //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/warden @@ -39,13 +39,13 @@ shoes = /obj/item/clothing/shoes/jackboots alt_suit = /obj/item/clothing/suit/armor/vest/security/warden suit = /obj/item/clothing/suit/armor/vest/security/warden/alt - dcoat = /obj/item/clothing/suit/hooded/wintercoat/security //Wasp Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/security //WS Edit - Alt Uniforms gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/warden glasses = /obj/item/clothing/glasses/hud/security/sunglasses r_pocket = /obj/item/assembly/flash/handheld l_pocket = /obj/item/restraints/handcuffs - suit_store = /obj/item/gun/energy/e_gun/advtaser // Wasp edit - Readds tasers + suit_store = /obj/item/gun/energy/e_gun/advtaser //WS edit - Readds tasers backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/ammo_box/magazine/co9mm=1) //WS edit - free lethals backpack = /obj/item/storage/backpack/security diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 1bc14619f4b..99a95d7903c 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -1,7 +1,7 @@ GLOBAL_LIST_INIT(command_positions, list( "Captain", "Head of Personnel", - "SolGov Representative", //Wasp edit - SolGov Rep + "SolGov Representative", //WS edit - SolGov Rep "Head of Security", "Chief Engineer", "Research Director", @@ -37,7 +37,7 @@ GLOBAL_LIST_INIT(supply_positions, list( GLOBAL_LIST_INIT(service_positions, list( "Head of Personnel", - "SolGov Representative", // Wasp Edit - SolGov Rep + "SolGov Representative", //WS Edit - SolGov Rep "Bartender", "Botanist", "Cook", @@ -57,7 +57,7 @@ GLOBAL_LIST_INIT(security_positions, list( "Warden", "Detective", "Security Officer", - "Brig Physician")) //Wasp edit - Brig Physicians + "Brig Physician")) //WS edit - Brig Physicians GLOBAL_LIST_INIT(nonhuman_positions, list( diff --git a/code/modules/language/beachbum.dm b/code/modules/language/beachbum.dm index 664b093092b..47c2afb052d 100644 --- a/code/modules/language/beachbum.dm +++ b/code/modules/language/beachbum.dm @@ -5,7 +5,7 @@ ask_verb = "grills" exclaim_verb = "hollers" sing_verb = "parties" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding key = "u" space_chance = 85 default_priority = 90 diff --git a/code/modules/language/buzzwords.dm b/code/modules/language/buzzwords.dm index 44f571dbe79..588f9c06c06 100644 --- a/code/modules/language/buzzwords.dm +++ b/code/modules/language/buzzwords.dm @@ -5,7 +5,7 @@ ask_verb = "buzzes" exclaim_verb = "loudly buzzes" sing_verb = "hums" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding key = "z" space_chance = 0 syllables = list( diff --git a/code/modules/language/calcic.dm b/code/modules/language/calcic.dm index 36f5eadd519..abbaf31e93e 100644 --- a/code/modules/language/calcic.dm +++ b/code/modules/language/calcic.dm @@ -6,7 +6,7 @@ exclaim_verb = "screeches" whisper_verb = "clicks" sing_verb = "chimes" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding key = "b" space_chance = 10 syllables = list( diff --git a/code/modules/language/draconic.dm b/code/modules/language/draconic.dm index ad09c6c6c18..363d07e5c5a 100644 --- a/code/modules/language/draconic.dm +++ b/code/modules/language/draconic.dm @@ -6,7 +6,7 @@ exclaim_verb = "roars" sing_verb = "sings" key = "o" - flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding space_chance = 40 syllables = list( "za", "az", "ze", "ez", "zi", "iz", "zo", "oz", "zu", "uz", "zs", "sz", diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm index 9b391da25f5..5110095b83d 100644 --- a/code/modules/language/language_holder.dm +++ b/code/modules/language/language_holder.dm @@ -321,10 +321,10 @@ Key procs /datum/language_holder/moth understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), /datum/language/moffic = list(LANGUAGE_ATOM), - /datum/language/buzzwords = list(LANGUAGE_ATOM)) // WaspStation Edit - Insectoid Language + /datum/language/buzzwords = list(LANGUAGE_ATOM)) //WS Edit - Insectoid Language spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), /datum/language/moffic = list(LANGUAGE_ATOM), - /datum/language/buzzwords = list(LANGUAGE_ATOM)) // WaspStation Edit - Insectoid Language + /datum/language/buzzwords = list(LANGUAGE_ATOM)) //WS Edit - Insectoid Language /datum/language_holder/skeleton understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), diff --git a/code/modules/language/moffic.dm b/code/modules/language/moffic.dm index d60978fc794..f79f7b3ff49 100644 --- a/code/modules/language/moffic.dm +++ b/code/modules/language/moffic.dm @@ -4,7 +4,7 @@ speech_verb = "flutters" ask_verb = "fluffs" exclaim_verb = "floofs" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding key = "m" space_chance = 55 syllables = list( diff --git a/code/modules/language/narsian.dm b/code/modules/language/narsian.dm index 7b24d813fd7..d3fe0f271c0 100644 --- a/code/modules/language/narsian.dm +++ b/code/modules/language/narsian.dm @@ -5,7 +5,7 @@ ask_verb = "inquires" exclaim_verb = "invokes" sing_verb = "intones" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding key = "n" sentence_chance = 8 space_chance = 95 //very high due to the potential length of each syllable diff --git a/code/modules/language/piratespeak.dm b/code/modules/language/piratespeak.dm index 0f51fcad447..8fcfede8725 100644 --- a/code/modules/language/piratespeak.dm +++ b/code/modules/language/piratespeak.dm @@ -5,7 +5,7 @@ ask_verb = "asks" exclaim_verb = "exclaims" sing_verb = "shanties" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding key = "p" space_chance = 100 default_priority = 90 diff --git a/code/modules/language/rylethian.dm b/code/modules/language/rylethian.dm index 0619c7e77e9..96e436f48ff 100644 --- a/code/modules/language/rylethian.dm +++ b/code/modules/language/rylethian.dm @@ -5,7 +5,7 @@ speech_verb = "gurgles" ask_verb = "bubbles" whisper_verb = "squelches" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding scramble_spans = list(SPAN_SGA) key = "e" sentence_chance = 8 diff --git a/code/modules/language/shadowtongue.dm b/code/modules/language/shadowtongue.dm index bd3b8334014..c8ae5a1fd42 100644 --- a/code/modules/language/shadowtongue.dm +++ b/code/modules/language/shadowtongue.dm @@ -7,7 +7,7 @@ ask_verb = "growls" exclaim_verb = "roars" sing_verb = "chants" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding key = "x" space_chance = 50 syllables = list( diff --git a/code/modules/language/slime.dm b/code/modules/language/slime.dm index 628b7d817f0..50951b6107f 100644 --- a/code/modules/language/slime.dm +++ b/code/modules/language/slime.dm @@ -5,7 +5,7 @@ ask_verb = "warbles" exclaim_verb = "warbles" sing_verb = "warbles" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding key = "k" syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix","*","!") default_priority = 70 diff --git a/code/modules/language/sylvan.dm b/code/modules/language/sylvan.dm index 96417039131..1cec50ab8d5 100644 --- a/code/modules/language/sylvan.dm +++ b/code/modules/language/sylvan.dm @@ -6,7 +6,7 @@ ask_verb = "inquires" exclaim_verb = "declares" sing_verb = "serenades" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding key = "h" space_chance = 20 syllables = list( diff --git a/code/modules/language/terrum.dm b/code/modules/language/terrum.dm index 4080c428f72..04f1ad74082 100644 --- a/code/modules/language/terrum.dm +++ b/code/modules/language/terrum.dm @@ -5,7 +5,7 @@ ask_verb = "questions" exclaim_verb = "tremors" sing_verb = "yodels" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding key = "g" space_chance = 40 syllables = list( diff --git a/code/modules/language/voltaic.dm b/code/modules/language/voltaic.dm index 2ebf9d4ed5d..0efee37e149 100644 --- a/code/modules/language/voltaic.dm +++ b/code/modules/language/voltaic.dm @@ -6,7 +6,7 @@ ask_verb = "pops" exclaim_verb = "thunders" sing_verb = "synthesizes" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding key = "v" space_chance = 20 syllables = list( diff --git a/code/modules/language/xenocommon.dm b/code/modules/language/xenocommon.dm index 512bdddc3aa..c705aa6c0f7 100644 --- a/code/modules/language/xenocommon.dm +++ b/code/modules/language/xenocommon.dm @@ -5,7 +5,7 @@ ask_verb = "hisses" exclaim_verb = "hisses" sing_verb = "hisses musically" - flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WaspStation Edit- Language icon hiding + flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding key = "4" syllables = list("sss","sSs","SSS") default_priority = 50 diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 80a52815075..f5466e509a7 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -125,7 +125,7 @@ else airlock.cyclelinkeddir = dir -/obj/effect/mapping_helpers/airlock/cyclelink_helper_target //Wasp start +/obj/effect/mapping_helpers/airlock/cyclelink_helper_target //WS start name = "airlock cyclelink helper target" icon_state = "airlock_cyclelink_helper_target" var/dirx @@ -139,7 +139,7 @@ log_mapping("[src] at [AREACOORD(src)] tried to set [airlock] cyclelinkedx and y, but has dirx and diry are uninitialized") return airlock.cyclelinkedx = dirx - airlock.cyclelinkedy = diry//Wasp end + airlock.cyclelinkedy = diry//WS end /obj/effect/mapping_helpers/airlock/locked name = "airlock lock helper" diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index c347281ed3b..35e3c5b90c1 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -139,7 +139,7 @@ //Sleeper /obj/machinery/sleeper/survival_pod - icon = 'waspstation/icons/obj/machines/sleeper.dmi' + icon = 'whitesands/icons/obj/machines/sleeper.dmi' icon_state = "lavaland_sleeper" /obj/machinery/sleeper/survival_pod/update_overlays() diff --git a/code/modules/mining/machine_bluespaceminer.dm b/code/modules/mining/machine_bluespaceminer.dm index 8d023338175..8f19942c8e3 100644 --- a/code/modules/mining/machine_bluespaceminer.dm +++ b/code/modules/mining/machine_bluespaceminer.dm @@ -1,7 +1,7 @@ /obj/machinery/power/bluespace_miner name = "bluespace mining machine" desc = "A machine that uses the magic of Bluespace to slowly generate materials and add them to a linked ore silo." - icon = 'waspstation/icons/obj/machines/bsm.dmi' + icon = 'whitesands/icons/obj/machines/bsm.dmi' icon_state = "bsm_off" density = TRUE circuit = /obj/item/circuitboard/machine/bluespace_miner diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index a89ca88cb55..bdea7bbcac5 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -58,7 +58,7 @@ new /obj/item/storage/bag/ore(src) new /obj/item/t_scanner/adv_mining_scanner/lesser(src) new /obj/item/gun/energy/kinetic_accelerator(src) - new /obj/item/clothing/glasses/meson/prescription(src) //Waspstation edit - Prescription HUDs + new /obj/item/clothing/glasses/meson/prescription(src) //WS edit - Prescription HUDs new /obj/item/clothing/glasses/meson(src) new /obj/item/survivalcapsule(src) new /obj/item/assault_pod/mining(src) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 6599263b9bf..601b07b04ac 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -134,7 +134,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ icon_state = "volcanic_sand" item_state = "volcanic_sand" singular_name = "volcanic ash pile" - grind_results = list(/datum/reagent/toxin/lava_microbe = 5) // Wasp Edit - Fuck + grind_results = list(/datum/reagent/toxin/lava_microbe = 5) //WS Edit - Fuck mine_experience = 0 /obj/item/stack/ore/plasma diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 016faaa0c50..73da0efa199 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -432,12 +432,12 @@ */ /mob/dead/new_player/proc/LateChoices() - // Waspstation Start - Added selected character name to job selection window + //WS Start - Added selected character name to job selection window var/name = client.prefs.real_name var/dat = "
Welcome, [name].
" dat += "
Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]
" - // Waspstation End + //WS End if(SSshuttle.emergency) switch(SSshuttle.emergency.mode) @@ -506,7 +506,7 @@ var/color = categorizedJobs[jobcat]["color"] dat += "
" dat += "[jobcat]" - // Wasp Edit Start - Alt-Job Titles + //WS Edit Start - Alt-Job Titles for(var/datum/job/job in categorizedJobs[jobcat]["jobs"]) var/altjobline = "" var/position_class = "otherPosition" @@ -518,7 +518,7 @@ dat += "[job.title] [altjobline] ([job.current_positions])" else dat += "[job.title] [altjobline] ([job.current_positions])" - // Wasp Edit End - Alt-Job Titles + //WS Edit End - Alt-Job Titles dat += "

" diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm index 87c14798977..9093e997e7f 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -1824,7 +1824,7 @@ icon_state = "round" /datum/sprite_accessory/moth_wings - icon = 'waspstation/icons/mob/moth_wings.dmi' + icon = 'whitesands/icons/mob/moth_wings.dmi' color_src = null /datum/sprite_accessory/moth_wings/plain @@ -1968,11 +1968,11 @@ name = "Witch Wing" icon_state = "witchwing" -//Waspstation begin - Moth wing additions / Squids / IPCs +//WS begin - Moth wing additions / Squids / IPCs //Moth fluff /datum/sprite_accessory/moth_fluff - icon = 'waspstation/icons/mob/moth_wings.dmi' + icon = 'whitesands/icons/mob/moth_wings.dmi' color_src = null /datum/sprite_accessory/moth_fluff/plain @@ -2293,7 +2293,7 @@ limbs_id = "zhpipc" /datum/sprite_accessory/spider_legs - icon = 'waspstation/icons/mob/spider_legs.dmi' + icon = 'whitesands/icons/mob/spider_legs.dmi' color_src = MUTCOLORS /datum/sprite_accessory/spider_legs/plain @@ -2309,7 +2309,7 @@ icon_state = "spiky" /datum/sprite_accessory/spider_spinneret - icon = 'waspstation/icons/mob/spider_spinneret.dmi' + icon = 'whitesands/icons/mob/spider_spinneret.dmi' color_src = MUTCOLORS /datum/sprite_accessory/spider_spinneret/plain @@ -2325,7 +2325,7 @@ icon_state = "blackwidow" /datum/sprite_accessory/spider_mandibles - icon = 'waspstation/icons/mob/spider_mandibles.dmi' + icon = 'whitesands/icons/mob/spider_mandibles.dmi' color_src = MUTCOLORS /datum/sprite_accessory/spider_mandibles/plain @@ -2340,4 +2340,4 @@ name = "Spiky" icon_state = "spiky" -//END WaspStation +//ENDWS diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index edc4d97f621..2746fce4115 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -939,7 +939,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp else client.images -= stored_t_ray_images -//Wasp Begin +//WS Begin /mob/dead/observer/proc/possess_mouse_verb() set category = "Ghost" set name = "Possess a mouse" @@ -1001,4 +1001,4 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp food on the floor to gain health and help create new mice. Mouse traps will hurt your fragile body \ and so will any kind of weapons. You can control click food and trash items in order to eat them. Get. That. Cheese.") return TRUE -//Wasp End +//WS End diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 5222398bf25..bf60ca8ce46 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -1,5 +1,5 @@ /mob/dead/observer/check_emote(message, forced) - if(message == "*spin" || message == "*flip" || message == "*speen") //Waspstation - Speen + if(message == "*spin" || message == "*flip" || message == "*speen") //WS - Speen emote(copytext(message, length(message[1]) + 1), intentional = !forced) return TRUE diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 34de02a4998..06204ea0895 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -58,14 +58,14 @@ C.update_hair() /obj/item/organ/brain/Remove(mob/living/carbon/C, special = 0, no_id_transfer = FALSE) - if(!special) //Wasp Begin - Borers + if(!special) //WS Begin - Borers if(C.has_brain_worms()) var/mob/living/simple_animal/borer/B = C.has_brain_worms() if(B.controlling) B.victim.release_control() to_chat(B, "Your probiscis is ripped out as your host's brain is removed!") B.apply_damage(15) - B.leave_victim() //Wasp End + B.leave_victim() //WS End ..() for(var/X in traumas) var/datum/brain_trauma/BT = X diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 8386fab3502..d504d7e0b92 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -57,7 +57,7 @@ /mob/living/carbon/attackby(obj/item/I, mob/user, params) var/be_nice = FALSE - // if(body_position == LYING_DOWN) // Waspstation - Fix IPC surgery + // if(body_position == LYING_DOWN) //WS - Fix IPC surgery if((I.item_flags & SURGICAL_TOOL) && user.a_intent == INTENT_HELP) attempt_initiate_surgery(I, src, user) be_nice = TRUE @@ -422,9 +422,9 @@ var/obj/item/organ/alien/plasmavessel/vessel = getorgan(/obj/item/organ/alien/plasmavessel) if(vessel) . += "Plasma Stored: [vessel.storedPlasma]/[vessel.max_plasma]" - var/obj/item/organ/dwarfgland/dwarfgland = getorgan(/obj/item/organ/dwarfgland) // Begin Wasp Edit - Dwarf Alcohol Gland + var/obj/item/organ/dwarfgland/dwarfgland = getorgan(/obj/item/organ/dwarfgland) // BeginWS Edit - Dwarf Alcohol Gland if(dwarfgland) - . += "Alcohol Stored: [dwarfgland.stored_alcohol]/[dwarfgland.max_alcohol]" // End Wasp Edit + . += "Alcohol Stored: [dwarfgland.stored_alcohol]/[dwarfgland.max_alcohol]" // EndWS Edit if(locate(/obj/item/assembly/health) in src) . += "Health: [health]" @@ -543,7 +543,7 @@ /mob/living/carbon/update_stamina() var/stam = getStaminaLoss() - if(stam > DAMAGE_PRECISION && (health - stam) <= crit_threshold && !stat) // Waspstation edit - Stamina stacks with health damage + if(stam > DAMAGE_PRECISION && (health - stam) <= crit_threshold && !stat) //WS edit - Stamina stacks with health damage enter_stamcrit() else if(HAS_TRAIT_FROM(src, TRAIT_INCAPACITATED, STAMINA)) REMOVE_TRAIT(src, TRAIT_INCAPACITATED, STAMINA) @@ -767,7 +767,7 @@ if(hud_used && hud_used.internals) hud_used.internals.icon_state = "internal[internal_state]" -/* Wasp revert +/*WS revert /mob/living/carbon/proc/update_spacesuit_hud_icon(cell_state = "empty") if(hud_used && hud_used.spacesuit) hud_used.spacesuit.icon_state = "spacesuit_[cell_state]" diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index b14ac0a5335..34de164cdb0 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -282,7 +282,7 @@ if(istype(dna.species, /datum/species/moth)) M.mothdust += 5; // End WS edit - else if(M.zone_selected == BODY_ZONE_CHEST || M.zone_selected == BODY_ZONE_PRECISE_GROIN) // Wasp Edit - Adds more help emotes + else if(M.zone_selected == BODY_ZONE_CHEST || M.zone_selected == BODY_ZONE_PRECISE_GROIN) //WS Edit - Adds more help emotes M.visible_message("[M] hugs [src] to make [p_them()] feel better!", \ "You hug [src] to make [p_them()] feel better!") if(istype(M.dna.species, /datum/species/moth)) //WS edit - moth dust from hugging @@ -328,7 +328,7 @@ to_chat(M, "[src] does not have a [M.zone_selected == BODY_ZONE_L_LEG ? "left" : "right"] leg!") else M.visible_message("[M] pokes [src]'s leg.", \ - "You poke [src]'s leg.") // Wasp Edit End + "You poke [src]'s leg.") //WS Edit End AdjustStun(-60) AdjustKnockdown(-60) AdjustUnconscious(-60) diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index 4c230ad4c22..75ca863e63d 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -1,6 +1,6 @@ -/mob/living/carbon/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, break_modifier = 1) //Wasp change, adds bone break mod +/mob/living/carbon/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, break_modifier = 1) //WS change, adds bone break mod SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone) var/hit_percent = (100-blocked)/100 if(!damage || (!forced && hit_percent <= 0)) diff --git a/code/modules/mob/living/carbon/human/damage_procs.dm b/code/modules/mob/living/carbon/human/damage_procs.dm index c0a2d3cef50..4883446b7cb 100644 --- a/code/modules/mob/living/carbon/human/damage_procs.dm +++ b/code/modules/mob/living/carbon/human/damage_procs.dm @@ -1,6 +1,6 @@ /// depending on the species, it will run the corresponding apply_damage code there -/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, break_modifier = 1) //WaspStation Edit - Breakable Bones +/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, break_modifier = 1) //WS Edit - Breakable Bones return dna.species.apply_damage(damage, damagetype, def_zone, blocked, src, forced, spread_damage) /mob/living/carbon/human/revive(full_heal = 0, admin_revive = 0) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 4118b96efb3..d485feda274 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -68,8 +68,8 @@ return pick('sound/voice/human/malescream_1.ogg', 'sound/voice/human/malescream_2.ogg', 'sound/voice/human/malescream_3.ogg', 'sound/voice/human/malescream_4.ogg', 'sound/voice/human/malescream_5.ogg', 'sound/voice/human/malescream_6.ogg') else if(ismoth(H)) return 'sound/voice/moth/scream_moth.ogg' - else if(issquidperson(H)) //Waspstation squids go blubbblp - return 'waspstation/sound/voice/squid/squidscream.ogg' + else if(issquidperson(H)) //WS squids go blubbblp + return 'whitesands/sound/voice/squid/squidscream.ogg' /datum/emote/living/carbon/human/pale diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 1fe8758aa87..37587c72872 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -130,7 +130,7 @@ else . += "[t_He] [t_is] limp and unresponsive; there are no signs of life..." -//WaspStaion Begin - Broken Bones +//WSStaion Begin - Broken Bones var/list/splinted_stuff = list() for(var/obj/item/bodypart/B in bodyparts) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b85bcd2ab0c..fc9073027a2 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -64,16 +64,16 @@ . += "Internal Atmosphere Info: [internal.name]" . += "Tank Pressure: [internal.air_contents.return_pressure()]" . += "Distribution Pressure: [internal.distribute_pressure]" - /* Wasp begin - no cells in suits + /*WS begin - no cells in suits if(istype(wear_suit, /obj/item/clothing/suit/space)) var/obj/item/clothing/suit/space/S = wear_suit . += "Thermal Regulator: [S.thermal_on ? "on" : "off"]" . += "Cell Charge: [S.cell ? "[round(S.cell.percent(), 0.1)]%" : "!invalid!"]" */ - var/mob/living/simple_animal/borer/B = has_brain_worms() //Wasp Begin - Borers + var/mob/living/simple_animal/borer/B = has_brain_worms() //WS Begin - Borers if(B && B.controlling) . += "Borer Body Health: [B.health]" - . += "Chemicals: [B.chemicals]" //Wasp End + . += "Chemicals: [B.chemicals]" //WS End if(mind) var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling) @@ -82,14 +82,14 @@ . += "Chemical Storage: [changeling.chem_charges]/[changeling.chem_storage]" . += "Absorbed DNA: [changeling.absorbedcount]" - // WaspStation Begin - Display Ethereal Charge + //WS Begin - Display Ethereal Charge if(istype(src)) var/datum/species/ethereal/eth_species = src.dna?.species if(istype(eth_species)) var/obj/item/organ/stomach/ethereal/stomach = src.getorganslot(ORGAN_SLOT_STOMACH) if(istype(stomach)) . += "Crystal Charge: [round((stomach.crystal_charge / ETHEREAL_CHARGE_SCALING_MULTIPLIER), 0.1)]%" - // WaspStation End + //WS End //NINJACODE if(istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)) //Only display if actually a ninja. @@ -1169,7 +1169,7 @@ remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown) remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying) return - var/health_deficiency = (maxHealth - health + staminaloss) // Waspstation Edit - Stamina and health damage stack + var/health_deficiency = (maxHealth - health + staminaloss) //WS Edit - Stamina and health damage stack if(health_deficiency >= 40) add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown, TRUE, multiplicative_slowdown = health_deficiency / 75) add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying, TRUE, multiplicative_slowdown = health_deficiency / 25) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 8a2d0713ffa..75b61fdc522 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -32,7 +32,7 @@ var/obj/item/clothing/C = bp if(C.body_parts_covered & def_zone.body_part) protection += C.armor.getRating(d_type) - protection += physiology.armor.getRating(d_type) * (100 - protection) / 100 // Wasp Edit - Makes armor multiplicative + protection += physiology.armor.getRating(d_type) * (100 - protection) / 100 //WS Edit - Makes armor multiplicative return protection /mob/living/carbon/human/on_hit(obj/projectile/P) @@ -491,11 +491,11 @@ var/obj/item/organ/heart/heart = getorganslot(ORGAN_SLOT_HEART) if(heart.Restart() && stat == CONSCIOUS) to_chat(src, "You feel your heart beating again!") - // Waspstation - Bootleg IPC revival + //WS - Bootleg IPC revival if(stat == DEAD && isipc(src) && can_be_revived()) if(shock_damage * siemens_coeff >= 1 && prob(25)) revive(FALSE, FALSE) - // Waspstation - END + //WS - END electrocution_animation(40) /mob/living/carbon/human/emp_act(severity) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 8efadac3f9d..c5882d079f2 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -41,10 +41,10 @@ dna.species.spec_life(src) // for mutantraces - //WaspStation Begin - Broken bones + //WS Begin - Broken bones if(stat != DEAD) handle_fractures() - //WaspStation End + //WS End //Update our name based on whether our face is obscured/disfigured name = get_visible_name() diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index d713b351ade..7e731f8f81b 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -779,7 +779,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(!H.dna.features["spider_mandibles"] || H.dna.features["spider_mandibles"] == "None" || H.head && (H.head.flags_inv & HIDEFACE) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEFACE)) || !HD || HD.status == BODYPART_ROBOTIC) bodyparts_to_add -= "spider_mandibles" - //Waspstation - Fix squids + //WS - Fix squids if("squid_face" in mutant_bodyparts) if(!H.dna.features["squid_face"] || H.dna.features["squid_face"] == "None" || H.head && (H.head.flags_inv & HIDEFACE) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEFACE)) || !HD || HD.status == BODYPART_ROBOTIC) bodyparts_to_add -= "squid_face" @@ -1012,11 +1012,11 @@ GLOBAL_LIST_EMPTY(roundstart_races) return FALSE if(H.num_legs < 2) return FALSE - if((DIGITIGRADE in species_traits) == (I.obj_flags != DIGITIGRADE_SHOE)) //WaspStation Start - Digitigrade Magboots + if((DIGITIGRADE in species_traits) == (I.obj_flags != DIGITIGRADE_SHOE)) //WS Start - Digitigrade Magboots if(!(DIGITIGRADE_COMPATIBLE & I.obj_flags)) if(!disable_warning) to_chat(H, "These shoes aren't compatible with your feet!") - return FALSE //WaspStation End - Digitigrade Magboots + return FALSE //WS End - Digitigrade Magboots return equip_delay_self_check(I, H, bypass_equip_delay_self) if(ITEM_SLOT_BELT) if(H.belt && !swap) diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 9777f2a9cd3..d373833e541 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -1,4 +1,4 @@ -#define ETHEREAL_EMAG_COLORS list("#00ffff", "#ffc0cb", "#9400D3", "#4B0082", "#0000FF", "#00FF00", "#FFFF00", "#FF7F00", "#FF0000") // WaspStation Edit -- Multitool Color Change +#define ETHEREAL_EMAG_COLORS list("#00ffff", "#ffc0cb", "#9400D3", "#4B0082", "#0000FF", "#00FF00", "#FFFF00", "#FF7F00", "#FF0000") //WS Edit -- Multitool Color Change /datum/species/ethereal name = "Ethereal" @@ -14,7 +14,7 @@ brutemod = 1.25 //They're weak to punches attack_type = BURN //burn bish damage_overlay_type = "" //We are too cool for regular damage overlays - species_traits = list(DYNCOLORS, AGENDER, NO_UNDERWEAR, HAIR, FACEHAIR) // Waspstation Edit - Gave Ethereals Beards + species_traits = list(DYNCOLORS, AGENDER, NO_UNDERWEAR, HAIR, FACEHAIR) //WS Edit - Gave Ethereals Beards changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT species_language_holder = /datum/language_holder/ethereal inherent_traits = list(TRAIT_NOHUNGER) @@ -29,8 +29,8 @@ hair_alpha = 140 var/current_color var/EMPeffect = FALSE - var/emag_effect = FALSE // WaspStation Edit -- Multitool Color Change - var/static/unhealthy_color = rgb(237, 164, 149) // WaspStation Edit -- Multitool Color Change + var/emag_effect = FALSE //WS Edit -- Multitool Color Change + var/static/unhealthy_color = rgb(237, 164, 149) //WS Edit -- Multitool Color Change loreblurb = "Ethereals are organic humanoid beings with a blood that has strange luminiscent and electrical properties. \ Ethereals are barred from most authority roles on Nanotrasen stations and are not protected by the AI's default Asimov laws." var/drain_time = 0 //used to keep ethereals from spam draining power sources @@ -49,7 +49,7 @@ return var/mob/living/carbon/human/ethereal = C default_color = "#[ethereal.dna.features["ethcolor"]]" - // WaspStation Removal -- Multitool Color Change + //WS Removal -- Multitool Color Change RegisterSignal(ethereal, COMSIG_ATOM_EMAG_ACT, .proc/on_emag_act) RegisterSignal(ethereal, COMSIG_ATOM_EMP_ACT, .proc/on_emp_act) ethereal_light = ethereal.mob_light() @@ -75,19 +75,19 @@ /datum/species/ethereal/spec_updatehealth(mob/living/carbon/human/H) . = ..() if(H.stat != DEAD && !EMPeffect) - // WaspStation Start -- Multitool Color Change + //WS Start -- Multitool Color Change if(!emag_effect) current_color = health_adjusted_color(H, default_color) set_ethereal_light(H, current_color) ethereal_light.set_light_on(TRUE) fixed_mut_color = copytext_char(current_color, 2) - // WaspStation End + //WS End else ethereal_light.set_light_on(FALSE) fixed_mut_color = rgb(128,128,128) H.update_body() -// WaspStation Start -- Multitool Color Change +//WS Start -- Multitool Color Change /datum/species/ethereal/proc/health_adjusted_color(mob/living/carbon/human/H, default_color) var/health_percent = max(H.health, 0) / 100 @@ -111,7 +111,7 @@ var/light_power = 1 + (1 * health_percent) ethereal_light.set_light_range_power_color(light_range, light_power, current_color) -// WaspStation End +//WS End /datum/species/ethereal/proc/on_emp_act(mob/living/carbon/human/H, severity) EMPeffect = TRUE @@ -124,9 +124,9 @@ addtimer(CALLBACK(src, .proc/stop_emp, H), 20 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 20 seconds /datum/species/ethereal/proc/on_emag_act(mob/living/carbon/human/H, mob/user) - if(emag_effect) // WaspStation Edit -- Multitool Color Change + if(emag_effect) //WS Edit -- Multitool Color Change return - emag_effect = TRUE // WaspStation Edit -- Multitool Color Change + emag_effect = TRUE //WS Edit -- Multitool Color Change if(user) to_chat(user, "You tap [H] on the back with your card.") H.visible_message("[H] starts flickering in an array of colors!") @@ -146,27 +146,27 @@ /datum/species/ethereal/proc/handle_emag(mob/living/carbon/human/H) - if(!emag_effect) // WaspStation Edit -- Multitool Color Change + if(!emag_effect) //WS Edit -- Multitool Color Change return - current_color = pick(ETHEREAL_EMAG_COLORS) // WaspStation Edit -- Multitool Color Change + current_color = pick(ETHEREAL_EMAG_COLORS) //WS Edit -- Multitool Color Change spec_updatehealth(H) addtimer(CALLBACK(src, .proc/handle_emag, H), 5) //Call ourselves every 0.5 seconds to change color /datum/species/ethereal/proc/stop_emag(mob/living/carbon/human/H) - emag_effect = FALSE // WaspStation Edit -- Multitool Color Change + emag_effect = FALSE //WS Edit -- Multitool Color Change spec_updatehealth(H) H.visible_message("[H] stops flickering and goes back to their normal state!") /datum/species/ethereal/proc/handle_charge(mob/living/carbon/human/H) brutemod = 1.25 switch(get_charge(H)) - // Waspstation Begin - Display Ethereal no charge icon + //WS Begin - Display Ethereal no charge icon if(ETHEREAL_CHARGE_NONE to ETHEREAL_CHARGE_LOWPOWER) if(get_charge(H) == ETHEREAL_CHARGE_NONE) H.throw_alert("ethereal_charge", /obj/screen/alert/etherealcharge, 3) else H.throw_alert("ethereal_charge", /obj/screen/alert/etherealcharge, 2) - // Waspstation End + //WS End if(H.health > 10.5) apply_damage(0.2, TOX, null, null, H) brutemod = 1.75 @@ -196,9 +196,9 @@ var/obj/item/organ/stomach/ethereal/stomach = H.getorganslot(ORGAN_SLOT_STOMACH) playsound(H, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5) H.cut_overlay(overcharge) - tesla_zap(H, 2, (stomach.crystal_charge / ETHEREAL_CHARGE_SCALING_MULTIPLIER) * 50, ZAP_OBJ_DAMAGE | ZAP_ALLOW_DUPLICATES) // Waspstation Edit -- Ethereal Charge Scaling + tesla_zap(H, 2, (stomach.crystal_charge / ETHEREAL_CHARGE_SCALING_MULTIPLIER) * 50, ZAP_OBJ_DAMAGE | ZAP_ALLOW_DUPLICATES) //WS Edit -- Ethereal Charge Scaling if(istype(stomach)) - stomach.adjust_charge(ETHEREAL_CHARGE_FULL - stomach.crystal_charge) // Waspstation Edit -- Ethereal Charge Scaling + stomach.adjust_charge(ETHEREAL_CHARGE_FULL - stomach.crystal_charge) //WS Edit -- Ethereal Charge Scaling to_chat(H, "You violently discharge energy!") H.visible_message("[H] violently discharges energy!") if(prob(10)) //chance of developing heart disease to dissuade overcharging oneself @@ -215,7 +215,7 @@ return stomach.crystal_charge return ETHEREAL_CHARGE_NONE -// WaspStation Start -- Multitool Color Change +//WS Start -- Multitool Color Change /datum/species/ethereal/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H) if(istype(I, /obj/item/multitool)) if(user.a_intent == INTENT_HARM) @@ -242,4 +242,4 @@ H.visible_message("[H] modulates \his EM frequency to [new_etherealcolor].") else . = ..() -// WaspStation End +//WS End diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 00508e98da2..ace5b47c6c3 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -89,7 +89,7 @@ species_traits = list(MUTCOLORS,EYECOLOR,LIPS,DIGITIGRADE) inherent_traits = list(TRAIT_CHUNKYFINGERS,TRAIT_NOBREATH) species_language_holder = /datum/language_holder/lizard/ash -//Wasp Edit Start - Kobold +//WS Edit Start - Kobold //Ashwalker subspecies: KOBOLD /datum/species/lizard/ashwalker/kobold name = "Kobold" @@ -102,4 +102,4 @@ /datum/species/lizard/ashwalker/kobold/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) . = ..() //call everything from species/on_species_gain() C.dna.add_mutation(DWARFISM) -//Wasp Edit End - Kobold +//WS Edit End - Kobold diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index c37cf00e61d..e8dcd73a987 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -15,8 +15,8 @@ liked_food = FRUIT | VEGETABLES | DAIRY | CLOTH disliked_food = GROSS toxic_food = MEAT | RAW - mutanteyes = /obj/item/organ/eyes/compound //WaspStation Edit - Compound eyes - mutanttongue = /obj/item/organ/tongue/moth // WaspStation Edit - Insectoid language + mutanteyes = /obj/item/organ/eyes/compound //WS Edit - Compound eyes + mutanttongue = /obj/item/organ/tongue/moth //WS Edit - Insectoid language changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT species_language_holder = /datum/language_holder/moth loreblurb = "Originating from the ruins of an unknown company's abandoned bluespace research facility, mothpeople are the mutated forms \ diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 976b15fc90b..fc9c169a226 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -166,7 +166,7 @@ if("SolGov Representative") //WS edit sgr O = new /datum/outfit/plasmaman/solgov - var/holder // Wasp Edit Begin - Plasma skirtsuit prefs + var/holder //WS Edit Begin - Plasma skirtsuit prefs switch(H.jumpsuit_style) if(PREF_SKIRT) holder = "[O.uniform]/skirt" @@ -177,7 +177,7 @@ holder = "[O.uniform]" if(text2path(holder)) - O.uniform = text2path(holder) // Wasp Edit End + O.uniform = text2path(holder) //WS Edit End H.equipOutfit(O, visualsOnly) H.internal = H.get_item_for_held_index(2) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 44b160e112c..d939433ae98 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -315,19 +315,19 @@ breath.set_temperature(bodytemperature) /mob/living/carbon/proc/get_breath_from_internal(volume_needed) - //Wasp Port Begin - Citadel Internals + //WS Port Begin - Citadel Internals var/obj/item/clothing/check var/internals = FALSE for(check in GET_INTERNAL_SLOTS(src)) if(check.clothing_flags & ALLOWINTERNALS) internals = TRUE - //Wasp Port End - Citadel Internals + //WS Port End - Citadel Internals if(internal) if(internal.loc != src) internal = null update_internals_hud_icon(0) - else if (!internals && !getorganslot(ORGAN_SLOT_BREATHING_TUBE)) //Wasp Port - Citadel Internals + else if (!internals && !getorganslot(ORGAN_SLOT_BREATHING_TUBE)) //WS Port - Citadel Internals internal = null update_internals_hud_icon(0) else diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm index c6c19083afb..202b1ee96bd 100644 --- a/code/modules/mob/living/carbon/status_procs.dm +++ b/code/modules/mob/living/carbon/status_procs.dm @@ -17,7 +17,7 @@ ADD_TRAIT(src, TRAIT_INCAPACITATED, STAMINA) ADD_TRAIT(src, TRAIT_IMMOBILIZED, STAMINA) ADD_TRAIT(src, TRAIT_FLOORED, STAMINA) - if((maxHealth - health + getStaminaLoss()) > 120) // Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems. // Waspstation Edit - Stamina stacks with health damage + if((maxHealth - health + getStaminaLoss()) > 120) // Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems. //WS Edit - Stamina stacks with health damage adjustStaminaLoss(30, FALSE) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index e833873d9c9..dabbd67e75a 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -14,7 +14,7 @@ * * Returns TRUE if damage applied */ -/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, break_modifier = 1)//WaspStation Edit - Breakable Bones +/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, break_modifier = 1)//WS Edit - Breakable Bones SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone) var/hit_percent = (100-blocked)/100 if(!damage || (!forced && hit_percent <= 0)) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 2b397c992d5..92e67ac56a5 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -852,12 +852,12 @@ altered_grab_state++ var/resist_chance = BASE_GRAB_RESIST_CHANCE // see defines/combat.dm resist_chance = max((resist_chance/altered_grab_state)-sqrt((getBruteLoss()+getFireLoss()+getOxyLoss()+getToxLoss()+getCloneLoss())*0.5+getStaminaLoss()), 0) //stamina loss is weighted twice as heavily as the other damage types in this calculation - //Waspstation - Yuggolith tentacle grip/slip + //WS - Yuggolith tentacle grip/slip if(issquidperson(pulledby)) resist_chance = resist_chance * 0.5 if(issquidperson(src)) resist_chance = resist_chance + (resist_chance * 0.5) - //Waspstation - End + //WS - End if(prob(resist_chance)) visible_message("[src] breaks free of [pulledby]'s grip!", \ "You break free of [pulledby]'s grip!", null, null, pulledby) diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index e2d1aa23547..16689832cba 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -156,7 +156,7 @@ var/list/ownedSoullinks //soullinks we are the owner of var/list/sharedSoullinks //soullinks we are a/the sharer of - var/is_busy = FALSE //Waspstation Edit - Curbstomping - Used for random actions that take time. ex: curbstomping. We need to make sure we can only do one of these at a time. + var/is_busy = FALSE //WS Edit - Curbstomping - Used for random actions that take time. ex: curbstomping. We need to make sure we can only do one of these at a time. /// List of changes to body temperature, used by desease symtoms like fever var/list/body_temp_changes = list() diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 4bd83d7391e..5fff902af7e 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( // Faction RADIO_KEY_SYNDICATE = RADIO_CHANNEL_SYNDICATE, RADIO_KEY_CENTCOM = RADIO_CHANNEL_CENTCOM, - RADIO_KEY_SOLGOV = RADIO_CHANNEL_SOLGOV, // Wasp Edit - SolGov Rep + RADIO_KEY_SOLGOV = RADIO_CHANNEL_SOLGOV, //WS Edit - SolGov Rep // Admin MODE_KEY_ADMIN = MODE_ADMIN, @@ -207,7 +207,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(pressure < ONE_ATMOSPHERE*0.4) //Thin air, let's italicise the message spans |= SPAN_ITALICS - message = process_chat_markup(message) // Waspstation edit - Chat markup + message = process_chat_markup(message) //WS edit - Chat markup send_speech(message, message_range, src, bubble_type, spans, language, message_mods) diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 3c9c0074b92..61432733800 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -5,7 +5,7 @@ // - Camera jack -/mob/living/silicon/pai/var/list/available_software = list( // Waspstation -- idk what to do about removing code so i'm just putting this note here to say, removes messanger and manifest, thet get it for free now +/mob/living/silicon/pai/var/list/available_software = list( //WS -- idk what to do about removing code so i'm just putting this note here to say, removes messanger and manifest, thet get it for free now //Nightvision //T-Ray //radiation eyes @@ -309,8 +309,8 @@ dat += "Directives
" dat += "Radio Configuration
" dat += "Screen Display
" - dat += "Digital Messenger
" // Waspstation Start -- pAIs get messanger and manifest for free - dat += "Crew Manifest
" // WaspStation end + dat += "Digital Messenger
" //WS Start -- pAIs get messanger and manifest for free + dat += "Crew Manifest
" //WS end //dat += "Text Messaging
" dat += "
" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 87309b103d7..d3fce7cd9d6 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -414,7 +414,7 @@ /mob/living/silicon/robot/regenerate_icons() return update_icons() -/* /mob/living/silicon/robot/update_icons() <--- Wasp - Moved to modular for borg icons +/* /mob/living/silicon/robot/update_icons() <--- WS - Moved to modular for borg icons /mob/living/silicon/robot/update_icons() cut_overlays() SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index b42508849ac..3de8feb9af0 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -33,7 +33,7 @@ var/allow_riding = TRUE var/canDispose = FALSE // Whether the borg can stuff itself into disposal - var/icon/cyborg_icon_override //Wasp Addition, need this shit to use VG icons + var/icon/cyborg_icon_override //WS Addition, need this shit to use VG icons /obj/item/robot_module/Initialize() . = ..() @@ -263,23 +263,23 @@ moduleselect_icon = "standard" hat_offset = -3 -//Wasp Begin - Can these all be modularized? Probably. +//WS Begin - Can these all be modularized? Probably. /obj/item/robot_module/standard/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc var/static/list/default_icons if(!default_icons) default_icons = list( "Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "robot"), - "Antique" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "robot_old"), - "Droid" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "droid"), - "Marina" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "marinaSD"), - "Sleek" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "sleekstandard"), - "servbot" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "servbot"), - "Spider" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "spider-standard"), - "Kodiak - 'Polar'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "kodiak-standard"), - "Noble" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "Noble-STD"), - "R34 - STR4a 'Durin'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "durin"), - "Booty" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "booty-blue") + "Antique" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "robot_old"), + "Droid" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "droid"), + "Marina" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "marinaSD"), + "Sleek" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "sleekstandard"), + "servbot" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "servbot"), + "Spider" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "spider-standard"), + "Kodiak - 'Polar'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "kodiak-standard"), + "Noble" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "Noble-STD"), + "R34 - STR4a 'Durin'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "durin"), + "Booty" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "booty-blue") ) default_icons = sortList(default_icons) var/default_borg_icon = show_radial_menu(R, R , default_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE) @@ -290,44 +290,44 @@ cyborg_base_icon = "robot_old" if("Droid") cyborg_base_icon = "droid" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "droid" if("Marina") cyborg_base_icon = "marinaSD" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "marinaSD" if("Sleek") cyborg_base_icon = "sleekstandard" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "sleekstandard" if("servbot") cyborg_base_icon = "servbot" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "servbot" if("Spider") cyborg_base_icon = "spider-standard" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "spider-standard" if("Kodiak - 'Polar'") cyborg_base_icon = "kodiak-standard" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "kodiak-standard" if("Noble") cyborg_base_icon = "Noble-STD" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "Noble-STD" if("R34 - STR4a 'Durin'") cyborg_base_icon = "durin" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "durin" if("Booty") cyborg_base_icon = "booty-blue" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "booty-blue" else return FALSE return ..() -//Wasp End +//WS End /obj/item/robot_module/medical name = "Medical" @@ -356,78 +356,78 @@ can_be_pushed = FALSE hat_offset = 3 -//Wasp Begin +//WS Begin /obj/item/robot_module/medical/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc var/static/list/med_icons if(!med_icons) med_icons = list( - "Antique" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "medbot"), - "Needles" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "needles"), + "Antique" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "medbot"), + "Needles" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "needles"), "Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "medical"), - "EVE" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "eve"), - "Droid" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "droid-medical"), - "Marina" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "marina"), - "Sleek" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "sleekmedic"), - "#17" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "servbot-medi"), - "Kodiak - 'Arachne'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "arachne"), - "Noble" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "Noble-MED"), - "R34 - MED6a 'Gibbs'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "gibbs"), - "Booty" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "booty-white") + "EVE" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "eve"), + "Droid" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "droid-medical"), + "Marina" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "marina"), + "Sleek" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "sleekmedic"), + "#17" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "servbot-medi"), + "Kodiak - 'Arachne'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "arachne"), + "Noble" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "Noble-MED"), + "R34 - MED6a 'Gibbs'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "gibbs"), + "Booty" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "booty-white") ) med_icons = sortList(med_icons) var/med_borg_icon = show_radial_menu(R, R , med_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE) switch(med_borg_icon) if("Antique") cyborg_base_icon = "medbot" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "medbot" if("Needles") cyborg_base_icon = "needles" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "needles" if("Default") cyborg_base_icon = "medical" if("EVE") cyborg_base_icon = "eve" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "eve" if("Droid") cyborg_base_icon = "droid-medical" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "droid-medical" if("Marina") cyborg_base_icon = "marina" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "marina" if("Sleek") cyborg_base_icon = "sleekmedic" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "sleekmedic" if("#17") cyborg_base_icon = "servbot-medi" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "servbot-medi" if("Kodiak - 'Arachne'") cyborg_base_icon = "arachne" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "arachne" if("Noble") cyborg_base_icon = "Noble-MED" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "Noble-MED" if("R34 - MED6a 'Gibbs'") cyborg_base_icon = "gibbs" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "gibbs" if("Booty") cyborg_base_icon = "booty-white" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "booty-white" else return FALSE return ..() -//Wasp End +//WS End /obj/item/robot_module/engineering name = "Engineering" @@ -461,78 +461,78 @@ magpulsing = TRUE hat_offset = -4 -//Wasp Begin +//WS Begin /obj/item/robot_module/engineering/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc var/static/list/engi_icons if(!engi_icons) engi_icons = list( - "Antique" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "engibot"), - "Engiseer" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "engiseer"), + "Antique" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "engibot"), + "Engiseer" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "engiseer"), "Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "engineer"), - "Wall-E" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "wall-e"), - "Droid" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "droid-engineer"), - "Marina" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "marinaEN"), - "Sleek" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "sleekengineer"), - "#25" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "servbot-engi"), - "Kodiak" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "kodiak-eng"), - "Noble" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "Noble-ENG"), - "R34 - ENG7a 'Conagher'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "conagher"), - "Booty" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "booty-yellow") + "Wall-E" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "wall-e"), + "Droid" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "droid-engineer"), + "Marina" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "marinaEN"), + "Sleek" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "sleekengineer"), + "#25" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "servbot-engi"), + "Kodiak" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "kodiak-eng"), + "Noble" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "Noble-ENG"), + "R34 - ENG7a 'Conagher'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "conagher"), + "Booty" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "booty-yellow") ) engi_icons = sortList(engi_icons) var/engi_borg_icon = show_radial_menu(R, R , engi_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE) switch(engi_borg_icon) if("Antique") cyborg_base_icon = "engibot" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "engibot" if("Engiseer") cyborg_base_icon = "engiseer" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key ="engiseer" if("Default") cyborg_base_icon = "engineer" if("Wall-E") cyborg_base_icon = "wall-e" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "wall-e" if("Droid") cyborg_base_icon = "droid-engineer" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "droid-engineer" if("Marina") cyborg_base_icon = "marinaEN" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "marinaEN" if("Sleek") cyborg_base_icon = "sleekengineer" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "sleekengineer" if("#25") cyborg_base_icon = "servbot-engi" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "servbot-engi" if("Kodiak") cyborg_base_icon = "kodiak-eng" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "kodiak-eng" if("Noble") cyborg_base_icon = "Noble-ENG" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "Noble-ENG" if("R34 - ENG7a 'Conagher'") cyborg_base_icon = "conagher" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "conagher" if("Booty") cyborg_base_icon = "booty-yellow" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "booty-yellow" else return FALSE return ..() -//Wasp End +//WS End /obj/item/robot_module/security name = "Security" @@ -549,73 +549,73 @@ can_be_pushed = FALSE hat_offset = 3 -//Wasp Begin +//WS Begin /obj/item/robot_module/security/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc var/static/list/sec_icons if(!sec_icons) sec_icons = list( - "Antique" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "secbot"), + "Antique" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "secbot"), "Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "sec"), - "Securitron" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "securitron"), - "Droid 'Black Knight'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "droid-security"), - "Marina" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "marinaSC"), - "Sleek" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "sleeksecurity"), - "#9" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "servbot-sec"), - "Kodiak" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "kodiak-sec"), - "Noble" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "Noble-SEC"), - "R34 - SEC10a 'Woody'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "woody"), - "Booty" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "booty-red") + "Securitron" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "securitron"), + "Droid 'Black Knight'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "droid-security"), + "Marina" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "marinaSC"), + "Sleek" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "sleeksecurity"), + "#9" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "servbot-sec"), + "Kodiak" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "kodiak-sec"), + "Noble" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "Noble-SEC"), + "R34 - SEC10a 'Woody'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "woody"), + "Booty" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "booty-red") ) sec_icons = sortList(sec_icons) var/sec_borg_icon = show_radial_menu(R, R , sec_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE) switch(sec_borg_icon) if("Antique") cyborg_base_icon = "secbot" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "secbot" if("Default") cyborg_base_icon = "sec" if("Securitron") cyborg_base_icon = "securitron" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "securitron" if("Droid 'Black Knight'") cyborg_base_icon = "droid-security" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "droid-security" if("Marina") cyborg_base_icon = "marinaSC" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "marinaSC" if("Sleek") cyborg_base_icon = "sleeksecurity" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "sleeksecurity" if("#9") cyborg_base_icon = "servbot-sec" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "servbot-sec" if("Kodiak") cyborg_base_icon = "kodiak-sec" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "kodiak-sec" if("Noble") cyborg_base_icon = "Noble-SEC" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "Noble-SEC" if("R34 - SEC10a 'Woody'") cyborg_base_icon = "woody" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "woody" if("Booty") cyborg_base_icon = "booty-red" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "booty-red" else return FALSE return ..() -//Wasp End +//WS End /obj/item/robot_module/security/do_transform_animation() ..() @@ -678,73 +678,73 @@ hat_offset = -5 clean_on_move = TRUE -//Wasp Begin +//WS Begin /obj/item/robot_module/janitor/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc var/static/list/jan_icons if(!jan_icons) jan_icons = list( - "Antique" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "janbot"), - "Mechaduster" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "mechaduster"), - "HAN-D" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "han-d"), + "Antique" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "janbot"), + "Mechaduster" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "mechaduster"), + "HAN-D" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "han-d"), "Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "janitor"), - "Droid - 'Mopbot'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "droid-janitor"), - "Marina" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "marinaJN"), - "Sleek" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "sleekjanitor"), - "#29" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "servbot-jani"), - "Noble" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "Noble-JAN"), - "R34 - CUS3a 'Flynn'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "flynn"), - "Booty" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "booty-green") + "Droid - 'Mopbot'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "droid-janitor"), + "Marina" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "marinaJN"), + "Sleek" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "sleekjanitor"), + "#29" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "servbot-jani"), + "Noble" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "Noble-JAN"), + "R34 - CUS3a 'Flynn'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "flynn"), + "Booty" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "booty-green") ) jan_icons = sortList(jan_icons) var/jan_borg_icon = show_radial_menu(R, R , jan_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE) switch(jan_borg_icon) if("Antique") cyborg_base_icon = "janbot" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "janbot" if("Mechaduster") cyborg_base_icon = "mechaduster" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "mechaduster" if("HAN-D") cyborg_base_icon = "han-d" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "han-d" if("Default") cyborg_base_icon = "janitor" if("Droid - 'Mopbot'") cyborg_base_icon = "droid-janitor" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "droid-janitor" if("Marina") cyborg_base_icon = "marinaJN" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "marinaJN" if("Sleek") cyborg_base_icon = "sleekjanitor" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "sleekjanitor" if("#29") cyborg_base_icon = "servbot-jani" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "servbot-jani" if("Noble") cyborg_base_icon = "Noble-JAN" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "Noble-JAN" if("R34 - CUS3a 'Flynn'") cyborg_base_icon = "flynn" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "flynn" if("Booty") cyborg_base_icon = "booty-green" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "booty-green" else return FALSE return ..() -//Wasp End +//WS End /obj/item/reagent_containers/spray/cyborg_drying name = "drying agent spray" @@ -829,7 +829,7 @@ if(O) O.reagents.add_reagent(/datum/reagent/consumable/enzyme, 2 * coeff) -//Wasp Edits Begin +//WS Edits Begin /obj/item/robot_module/butler/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc var/static/list/service_icons @@ -840,14 +840,14 @@ "Default - 'Bro'" = image(icon = 'icons/mob/robots.dmi', icon_state = "brobot"), "Default - 'Kent'" = image(icon = 'icons/mob/robots.dmi', icon_state = "kent"), "Default - 'Maximillion'" = image(icon = 'icons/mob/robots.dmi', icon_state = "tophat"), - "Default - 'Hydro'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "hydrobot"), - "Marina" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "marinaSV"), - "Sleek" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "sleekservice"), - "#27" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "servbot-service"), - "Kodiak - 'Teddy'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "kodiak-service"), - "Noble" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "Noble-SRV"), - "R34 - SRV9a 'Llyod'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "lloyd"), - "Booty" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "booty-flower") + "Default - 'Hydro'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "hydrobot"), + "Marina" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "marinaSV"), + "Sleek" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "sleekservice"), + "#27" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "servbot-service"), + "Kodiak - 'Teddy'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "kodiak-service"), + "Noble" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "Noble-SRV"), + "R34 - SRV9a 'Llyod'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "lloyd"), + "Booty" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "booty-flower") ) service_icons = sortList(service_icons) var/service_robot_icon = show_radial_menu(R, R , service_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE) @@ -864,7 +864,7 @@ hat_offset = INFINITY //He is already wearing a hat if("Default - 'Hydro'") cyborg_base_icon = "hydrobot" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "hydrobot" if("Default - 'Kent'") cyborg_base_icon = "kent" @@ -872,36 +872,36 @@ hat_offset = 3 if("Marina") cyborg_base_icon = "marinaSV" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "marinaSV" if("Sleek") cyborg_base_icon = "sleekservice" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "sleekservice" if("#27") cyborg_base_icon = "servbot-service" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "servbot-service" if("Kodiak - 'Teddy'") cyborg_base_icon = "kodiak-service" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "kodiak-service" if("Noble") cyborg_base_icon = "Noble-SRV" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "Noble-SRV" if("R34 - SRV9a 'Llyod'") cyborg_base_icon = "lloyd" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "lloyd" if("Booty") cyborg_base_icon = "booty-flower" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "booty-flower" else return FALSE return ..() -//Wasp Edits End +//WS Edits End /obj/item/robot_module/miner name = "Miner" @@ -924,68 +924,68 @@ hat_offset = 0 var/obj/item/t_scanner/adv_mining_scanner/cyborg/mining_scanner //built in memes. -//Wasp Begin +//WS Begin /obj/item/robot_module/miner/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc var/static/list/mining_icons if(!mining_icons) mining_icons = list( - "Antique" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "minerbot"), + "Antique" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "minerbot"), "Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "miner"), - "Wall-A" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "wall-a"), - "Droid" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "droid-miner"), - "Marina" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "marinaMN"), - "Sleek" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "sleekminer"), - "#31" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "servbot-miner"), - "Kodiak" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "kodiak-miner"), - "Noble" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "Noble-SUP"), - "R34 - MIN2a 'Ishimura'" = image(icon = 'waspstation/icons/mob/robots.dmi', icon_state = "ishimura") + "Wall-A" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "wall-a"), + "Droid" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "droid-miner"), + "Marina" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "marinaMN"), + "Sleek" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "sleekminer"), + "#31" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "servbot-miner"), + "Kodiak" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "kodiak-miner"), + "Noble" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "Noble-SUP"), + "R34 - MIN2a 'Ishimura'" = image(icon = 'whitesands/icons/mob/robots.dmi', icon_state = "ishimura") ) mining_icons = sortList(mining_icons) var/mining_borg_icon = show_radial_menu(R, R , mining_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE) switch(mining_borg_icon) if("Antique") cyborg_base_icon = "minerbot" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "minerbot" if("Default") cyborg_base_icon = "miner" if("Wall-A") cyborg_base_icon = "wall-a" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "wall-a" if("Droid") cyborg_base_icon = "droid-miner" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "droid-miner" if("Marina") cyborg_base_icon = "marinaMN" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "marinaMN" if("Sleek") cyborg_base_icon = "sleekminer" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "sleekminer" if("#31") cyborg_base_icon = "servbot-miner" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "servbot-miner" if("Kodiak") cyborg_base_icon = "kodiak-miner" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "kodiak-miner" if("Noble") cyborg_base_icon = "Noble-SUP" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "Noble-SUP" if("R34 - MIN2a 'Ishimura'") cyborg_base_icon = "ishimura" - cyborg_icon_override = 'waspstation/icons/mob/robots.dmi' + cyborg_icon_override = 'whitesands/icons/mob/robots.dmi' special_light_key = "ishimura" else return FALSE return ..() -//Wasp End +//WS End /obj/item/robot_module/miner/rebuild_modules() . = ..() diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index 638e78a584a..35140cd8e61 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -470,7 +470,7 @@ build_step++ return - // WaspStation Start -- hygienebot construction fix (Issue #301) + //WS Start -- hygienebot construction fix (Issue #301) if(ASSEMBLY_SECOND_STEP) if(istype(I, /obj/item/stack/ducts)) var/obj/item/stack/ducts/D = I @@ -487,4 +487,4 @@ H.name = created_name qdel(src) return TRUE - // WaspStation end + //WS end diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm index 7c411fc85ef..963ed7c3fc0 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm @@ -13,7 +13,7 @@ /obj/effect/mob_spawn/drone name = "drone shell" - mob_name = "drone" // Waspstation Edit - Adding missing var + mob_name = "drone" //WS Edit - Adding missing var desc = "A shell of a maintenance drone, an expendable robot built to perform station repairs." icon = 'icons/mob/drone.dmi' icon_state = "drone_maint_hat" //yes reuse the _hat state. @@ -23,7 +23,7 @@ roundstart = FALSE ///Type of drone that will be spawned mob_type = /mob/living/simple_animal/drone - short_desc = "You are a repair drone. Follow your laws and do not interfere with others." // Waspstation Edit - Adding missing var + short_desc = "You are a repair drone. Follow your laws and do not interfere with others." //WS Edit - Adding missing var /obj/effect/mob_spawn/drone/Initialize() . = ..() diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 29edd236f6b..1b2fe57ff15 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -1,4 +1,4 @@ -//Wasp Edit +//WS Edit GLOBAL_LIST_INIT(mouse_comestible, typecacheof(list( /obj/effect/decal/cleanable/food, /obj/effect/decal/cleanable/greenglow, @@ -17,7 +17,7 @@ GLOBAL_VAR_INIT(mouse_spawned, 0) GLOBAL_VAR_INIT(mouse_killed, 0) #define FOODPERMOUSE 35 -//Wasp Edit +//WS Edit /mob/living/simple_animal/mouse name = "mouse" @@ -31,7 +31,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0) emote_see = list("runs in a circle.", "shakes.") speak_chance = 1 turns_per_move = 5 - see_in_dark = 8 //wasp edit + see_in_dark = 8 //WS edit maxHealth = 5 health = 5 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/mouse = 1) @@ -46,14 +46,14 @@ GLOBAL_VAR_INIT(mouse_killed, 0) pass_flags = PASSTABLE | PASSGRILLE | PASSMOB mob_size = MOB_SIZE_TINY mob_biotypes = MOB_ORGANIC|MOB_BEAST - lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //Wasp Edit + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //WS Edit var/body_color //brown, gray and white, leave blank for random gold_core_spawnable = FRIENDLY_SPAWN - move_force = MOVE_FORCE_EXTREMELY_WEAK // Wasp Edit + move_force = MOVE_FORCE_EXTREMELY_WEAK //WS Edit var/chew_probability = 1 - var/full = FALSE // Wasp Edit - var/eating = FALSE // Wasp Edit - var/cheesed = FALSE // Wasp Edit + var/full = FALSE //WS Edit + var/eating = FALSE //WS Edit + var/cheesed = FALSE //WS Edit can_be_held = TRUE held_state = "mouse_gray" @@ -66,7 +66,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0) icon_living = "mouse_[body_color]" icon_dead = "mouse_[body_color]_dead" -//Wasp Begin +//WS Begin /mob/living/simple_animal/mouse/proc/splat() if(!key) src.health = 0 @@ -76,10 +76,10 @@ GLOBAL_VAR_INIT(mouse_killed, 0) adjustHealth(rand(7,12)) if(health <= 0) src.icon_dead = "mouse_[body_color]_splat" -//Wasp End +//WS End /mob/living/simple_animal/mouse/death(gibbed, toast) - GLOB.mouse_killed++ //Wasp Edit + GLOB.mouse_killed++ //WS Edit if(!ckey) ..(1) if(!gibbed) @@ -115,7 +115,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0) C.deconstruct() visible_message("[src] chews through the [C].") -//Wasp Begin +//WS Begin /mob/living/simple_animal/mouse/Move() . = ..() if(stat != CONSCIOUS) @@ -246,7 +246,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0) var/turf/T = get_turf(M) do_teleport(M, T, teleport_radius, channel = TELEPORT_CHANNEL_BLUESPACE) ..() -//Wasp End +//WS End /* * Mouse types diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 4225b19bd5a..293c9c7f7fc 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -713,7 +713,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians name = "holoparasite injector kit" /obj/item/storage/box/syndie_kit/guardian/PopulateContents() - new /obj/item/guardiancreator/tech/choose/dextrous(src) // WaspStation Edit - Dextrous Guardians + new /obj/item/guardiancreator/tech/choose/dextrous(src) //WS Edit - Dextrous Guardians new /obj/item/paper/guides/antag/guardian(src) /obj/item/guardiancreator/carp diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 0740389ff19..a45fd818f38 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -132,7 +132,7 @@ if(!search_objects) . = hearers(vision_range, targets_from) - src //Remove self, so we don't suicide - var/static/hostile_machines = typecacheof(list(/obj/machinery/porta_turret, /obj/mecha, /obj/spacepod)) // Wasp - add spacepod + var/static/hostile_machines = typecacheof(list(/obj/machinery/porta_turret, /obj/mecha, /obj/spacepod)) //WS - add spacepod for(var/HM in typecache_filter_list(range(vision_range, targets_from), hostile_machines)) if(can_see(targets_from, HM, vision_range)) @@ -561,7 +561,7 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega toggle_ai(AI_ON) /mob/living/simple_animal/hostile/proc/ListTargetsLazy(var/_Z)//Step 1, find out what we can see - var/static/hostile_machines = typecacheof(list(/obj/machinery/porta_turret, /obj/mecha, /obj/spacepod)) // Wasp - add spacepod + var/static/hostile_machines = typecacheof(list(/obj/machinery/porta_turret, /obj/mecha, /obj/spacepod)) //WS - add spacepod . = list() for (var/I in SSmobs.clients_by_zlevel[_Z]) var/mob/M = I diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index b6a0f708c0f..d471eebb097 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -1,5 +1,5 @@ /* - Waspstation Edit - Moved to modular folder + WS Edit - Moved to modular folder //A beast that fire freezing blasts. /mob/living/simple_animal/hostile/asteroid/basilisk diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index 27501062b36..7824ae6c5d8 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -1,5 +1,5 @@ /* - Waspstation Edit - Moved to modular folder + WS Edit - Moved to modular folder //A slow but strong beast that tries to stun using its tentacles /mob/living/simple_animal/hostile/asteroid/goliath diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 76ae8ce4a9d..b30a4c97ffd 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -287,7 +287,7 @@ H.dna.add_mutation(DWARFISM) /obj/effect/mob_spawn/human/corpse/damaged/legioninfested/Initialize() - var/type = pickweight(list("Miner" = 66, "Ashwalker" = 5, "Kobold" = 5, "Golem" = 10,"Clown" = 10, pick(list("Shadow", "YeOlde","Operative", "Cultist")) = 4)) //Wasp Edit - Kobold + var/type = pickweight(list("Miner" = 66, "Ashwalker" = 5, "Kobold" = 5, "Golem" = 10,"Clown" = 10, pick(list("Shadow", "YeOlde","Operative", "Cultist")) = 4)) //WS Edit - Kobold switch(type) if("Miner") mob_species = pickweight(list(/datum/species/human = 70, /datum/species/lizard = 26, /datum/species/fly = 2, /datum/species/plasmaman = 2)) @@ -330,7 +330,7 @@ r_pocket = /obj/item/kitchen/knife/combat/bone if(prob(30)) l_pocket = /obj/item/kitchen/knife/combat/bone - //Wasp Edit Start - Kobold + //WS Edit Start - Kobold if("Kobold") mob_species = /datum/species/lizard/ashwalker/kobold uniform = /obj/item/clothing/under/costume/gladiator/ash_walker @@ -348,7 +348,7 @@ r_pocket = /obj/item/kitchen/knife/combat/bone if(prob(30)) l_pocket = /obj/item/kitchen/knife/combat/bone - //Wasp Edit End - Kobold + //WS Edit End - Kobold if("Clown") name = pick(GLOB.clown_names) outfit = /datum/outfit/job/clown diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm index 150d9de4255..955af8e1983 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm @@ -14,22 +14,22 @@ a_intent = INTENT_HARM var/crusher_loot var/throw_message = "bounces off of" - var/throw_deflection = 20 // Waspstation edit - Whitesands + var/throw_deflection = 20 //WS edit - Whitesands var/fromtendril = FALSE see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE mob_size = MOB_SIZE_LARGE var/icon_aggro = null var/crusher_drop_mod = 25 - var/datum/armor/armor // Waspstation edit - Whitesands + var/datum/armor/armor //WS edit - Whitesands /mob/living/simple_animal/hostile/asteroid/Initialize(mapload) - if (islist(armor)) // Waspstation edit begin - Whitesands + if (islist(armor)) //WS edit begin - Whitesands armor = getArmor(arglist(armor)) else if (!armor) armor = getArmor() else if (!istype(armor, /datum/armor)) - stack_trace("Invalid type [armor.type] found in .armor during /mob/living/simple_animal/hostile/asteroid Initialize()") // Waspstation edit begin - Whitesands + stack_trace("Invalid type [armor.type] found in .armor during /mob/living/simple_animal/hostile/asteroid Initialize()") //WS edit begin - Whitesands . = ..() apply_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) @@ -45,17 +45,17 @@ return icon_state = icon_living -/mob/living/simple_animal/hostile/asteroid/getarmor(def_zone, type) // Waspstation edit begin - Whitesands +/mob/living/simple_animal/hostile/asteroid/getarmor(def_zone, type) //WS edit begin - Whitesands if(armor) return armor.getRating(type) - return 0 // If no armor // Waspstation edit end - + return 0 // If no armor //WS edit end + /mob/living/simple_animal/hostile/asteroid/bullet_act(obj/projectile/P)//Reduces damage from most projectiles to curb off-screen kills if(!stat) Aggro() - /* if(P.damage < 30 && P.damage_type != BRUTE) // Waspstation Edit Begin - Whitesands + /* if(P.damage < 30 && P.damage_type != BRUTE) //WS Edit Begin - Whitesands P.damage = (P.damage / 3) - visible_message("[P] has a reduced effect on [src]!") */ // Waspstation Edit End + visible_message("[P] has a reduced effect on [src]!") */ //WS Edit End ..() /mob/living/simple_animal/hostile/asteroid/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) //No floor tiling them to death, wiseguy @@ -63,7 +63,7 @@ var/obj/item/T = AM if(!stat) Aggro() - if(T.throwforce <= throw_deflection) // Waspstation Edit - Whitesands + if(T.throwforce <= throw_deflection) //WS Edit - Whitesands visible_message("The [T.name] [throw_message] [src.name]!") return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm index 65b660d00c9..439500699eb 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm @@ -12,12 +12,12 @@ var/obj/mecha/M = A if(M.occupant) return A - // Wasp start + //WS start else if(istype(A, /obj/spacepod)) var/obj/spacepod/M = A if(M.pilot || M.passengers.len) return A - // Wasp end + //WS end /mob/living/simple_animal/hostile/retaliate/ListTargets() if(!enemies.len) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 1770039ed70..57838e03404 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -433,12 +433,12 @@ var/obj/mecha/M = the_target if (M.occupant) return FALSE - // Wasp start + //WS start if(isspacepod(the_target)) var/obj/spacepod/SP = the_target if(SP.pilot || SP.passengers.len) return FALSE - // Wasp end + //WS end return TRUE /mob/living/simple_animal/handle_fire() diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 7f86f75825f..e0e993dbdf2 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -193,9 +193,9 @@ ///List of progress bars this mob is currently seeing for actions var/list/progressbars = null //for stacking do_after bars - //Wasp Begin - Holy fuck work for spacepods + //WS Begin - Holy fuck work for spacepods var/list/mousemove_intercept_objects - //Wasp End + //WS End ///For storing what do_after's someone has, in case we want to restrict them to only one of a certain do_after at a time var/list/do_afters diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 80bca59e3bd..5f470394992 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -475,10 +475,10 @@ if(dir != UP && dir != DOWN) return FALSE var/turf/target = get_step_multiz(src, dir) - if(incapacitated())//I'm so so sorry //Wasp Start - No more flying while dead + if(incapacitated())//I'm so so sorry //WS Start - No more flying while dead if(feedback) to_chat(src, "You can't do that right now!") - return FALSE //Wasp End + return FALSE //WS End if(!target) if(feedback) to_chat(src, "There's nowhere to go in that direction!") @@ -488,12 +488,12 @@ to_chat(src, "You couldn't move there!") return FALSE var/atom/movable/AM - if(pulling) //Wasp Start - Dragging across z-levels + if(pulling) //WS Start - Dragging across z-levels AM = pulling - AM.forceMove(target) //Wasp End + AM.forceMove(target) //WS End forceMove(target) - if(AM) //Wasp Start - Dragging across z-levels - start_pulling(AM) //Wasp End + if(AM) //WS Start - Dragging across z-levels + start_pulling(AM) //WS End return TRUE /// Can this mob move between z levels diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 8e3db171005..7a78002650c 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -33,8 +33,8 @@ return message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN)) - message = process_chat_markup(message) // Waspstation edit - Chat markup - + message = process_chat_markup(message) //WS edit - Chat markup + usr.emote("me",1,message,TRUE) ///Speak as a dead person (ghost etc) @@ -100,10 +100,10 @@ /mob/proc/lingcheck() return LINGHIVE_NONE -/// Wasp Begin - Check if the mob has a borer hivemind channel +///WS Begin - Check if the mob has a borer hivemind channel /mob/proc/borercheck() return FALSE -//Wasp end +//WS end ///The amount of items we are looking for in the message #define MESSAGE_MODS_LENGTH 6 diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm index 12df651eecd..bb2084ebfe2 100644 --- a/code/modules/ninja/suit/suit_initialisation.dm +++ b/code/modules/ninja/suit/suit_initialisation.dm @@ -37,10 +37,10 @@ GLOBAL_LIST_INIT(ninja_deinitialize_messages, list( s_busy = TRUE if(s_initialized) deinitialize() - STOP_PROCESSING(SSobj, src) // Waspstation Edit - Ninja Buttons Fix (Issue #339) + STOP_PROCESSING(SSobj, src) //WS Edit - Ninja Buttons Fix (Issue #339) else ninitialize() - START_PROCESSING(SSobj, src) // Waspstation Edit - Ninja Buttons Fix (Issue #339) + START_PROCESSING(SSobj, src) //WS Edit - Ninja Buttons Fix (Issue #339) /** * Initializes the ninja suit diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index d30e68db00d..ace02334d20 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -3,7 +3,7 @@ GLOBAL_LIST_EMPTY(alldepartments) /obj/machinery/photocopier/faxmachine name = "fax machine" - icon = 'waspstation/icons/obj/library.dmi' + icon = 'whitesands/icons/obj/library.dmi' icon_state = "fax" insert_anim = "faxsend" density = FALSE diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index e8d525f871b..8ef21966b78 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -38,10 +38,10 @@ #define APC_CHARGING 1 #define APC_FULLY_CHARGED 2 -// Waspstation Begin -- Ethereal Charge Scaling +//WS Begin -- Ethereal Charge Scaling #define APC_DRAIN_TIME 75 #define APC_POWER_GAIN (10 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) -// Waspstation End +//WS End // the Area Power Controller (APC), formerly Power Distribution Unit (PDU) // one per area, needs wire connection to power network through a terminal @@ -98,8 +98,8 @@ var/main_status = 0 powernet = 0 // set so that APCs aren't found as powernet nodes //Hackish, Horrible, was like this before I changed it :( var/malfhack = 0 //New var for my changes to AI malf. --NeoFite - var/malfhackhide = 0 // WaspStation Edit - Malf AI Rework - var/malfhackhidecooldown = 0 // WaspStation Edit - Malf AI Rework + var/malfhackhide = 0 //WS Edit - Malf AI Rework + var/malfhackhidecooldown = 0 //WS Edit - Malf AI Rework var/mob/living/silicon/ai/malfai = null //See above --NeoFite var/has_electronics = APC_ELECTRONICS_MISSING // 0 - none, 1 - plugged in, 2 - secured by screwdriver var/overload = 1 //used for the Blackout malf module @@ -378,7 +378,7 @@ update_state |= UPSTATE_OPENED1 if(opened==APC_COVER_REMOVED) update_state |= UPSTATE_OPENED2 - // WaspStation Edit - Malf AI Rework + //WS Edit - Malf AI Rework else if((obj_flags & EMAGGED)) update_state |= UPSTATE_BLUESCREEN else if(malfai) @@ -386,7 +386,7 @@ update_state |= UPSTATE_ALLGOOD else update_state |= UPSTATE_BLUESCREEN - // End WaspStation Edit - Malf AI Rework + // EndWS Edit - Malf AI Rework else if(panel_open) update_state |= UPSTATE_WIREEXP if(update_state <= 1) @@ -815,7 +815,7 @@ if(.) return - // Waspstation Begin -- Ethereal Charge Scaling + //WS Begin -- Ethereal Charge Scaling if(isethereal(user)) var/mob/living/carbon/human/H = user var/datum/species/ethereal/E = H.dna.species @@ -830,8 +830,8 @@ return E.drain_time = world.time + APC_DRAIN_TIME to_chat(H, "You start channeling some power through the APC into your body.") - while(do_after(user, APC_DRAIN_TIME, target = src)) //Wasp edit - E.drain_time = world.time + APC_DRAIN_TIME //Wasp edit + while(do_after(user, APC_DRAIN_TIME, target = src)) //WS edit + E.drain_time = world.time + APC_DRAIN_TIME //WS edit if(cell.charge <= (cell.maxcharge / 2) || (stomach.crystal_charge > charge_limit)) return if(istype(stomach)) @@ -851,8 +851,8 @@ return E.drain_time = world.time + APC_DRAIN_TIME to_chat(H, "You start channeling power through your body into the APC.") - while(do_after(user, APC_DRAIN_TIME, target = src)) //Wasp edit - E.drain_time = world.time + APC_DRAIN_TIME //Wasp edit + while(do_after(user, APC_DRAIN_TIME, target = src)) //WS edit + E.drain_time = world.time + APC_DRAIN_TIME //WS edit if(cell.charge >= (cell.maxcharge - APC_POWER_GAIN) || (stomach.crystal_charge < APC_POWER_GAIN)) return if(istype(stomach)) @@ -862,7 +862,7 @@ else to_chat(H, "You can't transfer power to the APC!") return - // Waspstation End + //WS End if(opened && (!issilicon(user))) if(cell) @@ -1048,9 +1048,9 @@ if("deoccupy") if(get_malf_status(usr)) malfvacate() - if("hide_hack") // WaspStation Edit - Malf AI Rework + if("hide_hack") //WS Edit - Malf AI Rework if(get_malf_status(usr)) - malfhidehack(usr) //End WaspStation Edit - Malf AI Rework + malfhidehack(usr) //EndWS Edit - Malf AI Rework if("reboot") failure_timer = 0 update_icon() @@ -1079,7 +1079,7 @@ if(get_malf_status(malf) != 1) return if(malf.malfhacking) - to_chat(malf, "You are already hacking or masking an APC!") // WaspStation Edit - Malf AI Rework + to_chat(malf, "You are already hacking or masking an APC!") //WS Edit - Malf AI Rework return to_chat(malf, "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.") malf.malfhack = src @@ -1089,7 +1089,7 @@ A = malf.throw_alert("hackingapc", /obj/screen/alert/hackingapc) A.target = src -// WaspStation Edit - Malf AI Rework +//WS Edit - Malf AI Rework /obj/machinery/power/apc/proc/malfhidehack(mob/living/silicon/ai/malf) if(!istype(malf)) return @@ -1132,7 +1132,7 @@ malfhackhidecooldown = 0 to_chat(malf, "The [src.area.name] APC has recovered from your masking and has returned to normal operating status." ) -// End WaspStation Edit - Malf AI Rework +// EndWS Edit - Malf AI Rework /obj/machinery/power/apc/proc/malfoccupy(mob/living/silicon/ai/malf) if(!istype(malf)) @@ -1540,10 +1540,10 @@ #undef APC_CHARGING #undef APC_FULLY_CHARGED -// Waspstation Begin -- Ethereal Charge Scaling +//WS Begin -- Ethereal Charge Scaling #undef APC_DRAIN_TIME #undef APC_POWER_GAIN -// Waspstation End +//WS End //update_overlay #undef APC_UPOVERLAY_CHARGEING0 diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 39358a17dcb..1241ea2dc62 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -1,8 +1,8 @@ -// Waspstation Begin -- Ethereal Charge Scaling +//WS Begin -- Ethereal Charge Scaling #define CELL_DRAIN_TIME 35 #define CELL_POWER_GAIN (3 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) #define CELL_POWER_DRAIN (37.5 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) -// Waspstation End +//WS End /obj/item/stock_parts/cell name = "power cell" @@ -154,7 +154,7 @@ if(prob(25)) corrupt() -// Waspstation Begin -- Ethereal Charge Scaling +//WS Begin -- Ethereal Charge Scaling /obj/item/stock_parts/cell/attack_self(mob/user) if(isethereal(user)) var/mob/living/carbon/human/H = user @@ -181,7 +181,7 @@ else to_chat(H, "You can't receive charge from [src]!") return -// Waspstation End +//WS End /obj/item/stock_parts/cell/blob_act(obj/structure/blob/B) SSexplosions.highobj += src @@ -236,28 +236,28 @@ /obj/item/stock_parts/cell/mini_egun name = "miniature energy gun power cell" maxcharge = 600 - rating = 0 //gun batteries now incompatible with RPED Waspstation edit + rating = 0 //gun batteries now incompatible with RPED WS edit /obj/item/stock_parts/cell/hos_gun name = "X-01 multiphase energy gun power cell" maxcharge = 1200 - rating = 0 //gun batteries now incompatible with RPED Waspstation edit + rating = 0 //gun batteries now incompatible with RPED WS edit /obj/item/stock_parts/cell/pulse //200 pulse shots name = "pulse rifle power cell" maxcharge = 400000 chargerate = 1500 - rating = 0 //gun batteries now incompatible with RPED Waspstation edit + rating = 0 //gun batteries now incompatible with RPED WS edit /obj/item/stock_parts/cell/pulse/carbine //25 pulse shots name = "pulse carbine power cell" maxcharge = 50000 - rating = 0 //gun batteries now incompatible with RPED Waspstation edit + rating = 0 //gun batteries now incompatible with RPED WS edit /obj/item/stock_parts/cell/pulse/pistol //10 pulse shots name = "pulse pistol power cell" maxcharge = 20000 - rating = 0 //gun batteries now incompatible with RPED Waspstation edit + rating = 0 //gun batteries now incompatible with RPED WS edit /obj/item/stock_parts/cell/high name = "high-capacity power cell" @@ -410,8 +410,8 @@ if(!A.lightswitch || !A.light_power) charge = 0 //For naturally depowered areas, we start with no power -// Waspstation Begin -- Ethereal Charge Scaling +//WS Begin -- Ethereal Charge Scaling #undef CELL_DRAIN_TIME #undef CELL_POWER_GAIN #undef CELL_POWER_DRAIN -// Waspstation End +//WS End diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 64f5c8cc331..04d7aabc2f4 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -61,7 +61,7 @@ if(delta_temperature > 0 && cold_air_heat_capacity > 0 && hot_air_heat_capacity > 0) - var/efficiency = 0.45 //Wasp Edit - Nerfed down to Cit's efficiency + var/efficiency = 0.45 //WS Edit - Nerfed down to Cit's efficiency var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index d5ec0b8adab..f9b6e5e9af5 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -12,8 +12,8 @@ #define BROKEN_SPARKS_MIN (3 MINUTES) #define BROKEN_SPARKS_MAX (9 MINUTES) -#define LIGHT_DRAIN_TIME 25 // Waspstation Edit -- Ethereal Charge Scaling -#define LIGHT_POWER_GAIN (1.75 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) // Waspstation Edit -- Ethereal Charge Scaling +#define LIGHT_DRAIN_TIME 25 //WS Edit -- Ethereal Charge Scaling +#define LIGHT_POWER_GAIN (1.75 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) //WS Edit -- Ethereal Charge Scaling /obj/item/wallframe/light_fixture name = "light fixture frame" @@ -684,13 +684,13 @@ if(E.drain_time > world.time) return to_chat(H, "You start channeling some power through the [fitting] into your body.") - E.drain_time = world.time + LIGHT_DRAIN_TIME // Waspstation Edit -- Ethereal Charge Scaling - while(do_after(user, LIGHT_DRAIN_TIME, target = src)) //Wasp edit - E.drain_time = world.time + LIGHT_DRAIN_TIME //Wasp edit + E.drain_time = world.time + LIGHT_DRAIN_TIME //WS Edit -- Ethereal Charge Scaling + while(do_after(user, LIGHT_DRAIN_TIME, target = src)) //WS edit + E.drain_time = world.time + LIGHT_DRAIN_TIME //WS edit var/obj/item/organ/stomach/ethereal/stomach = H.getorganslot(ORGAN_SLOT_STOMACH) if(istype(stomach)) to_chat(H, "You receive some charge from the [fitting].") - stomach.adjust_charge(LIGHT_POWER_GAIN) // Waspstation Edit -- Ethereal Charge Scaling + stomach.adjust_charge(LIGHT_POWER_GAIN) //WS Edit -- Ethereal Charge Scaling else to_chat(H, "You can't receive charge from the [fitting]!") return @@ -935,5 +935,5 @@ light_type = /obj/item/light/bulb fitting = "bulb" -#undef LIGHT_DRAIN_TIME // Waspstation Edit -- Ethereal Charge Scaling -#undef LIGHT_POWER_GAIN // Waspstation Edit -- Ethereal Charge Scaling +#undef LIGHT_DRAIN_TIME //WS Edit -- Ethereal Charge Scaling +#undef LIGHT_POWER_GAIN //WS Edit -- Ethereal Charge Scaling diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index bea390f5103..7c82aeb937b 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -25,7 +25,7 @@ QDEL_NULL(soundloop) return ..() -/*Wasp Edit - Smartwire Revert +/*WS Edit - Smartwire Revert /obj/machinery/power/port_gen/should_have_node() return anchored */ diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index e8a0a84993a..8f0ed348673 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -42,7 +42,7 @@ /obj/machinery/power/rad_collector/Destroy() return ..() -/* Wasp Edit - Smartwire Revert +/*WS Edit - Smartwire Revert /obj/machinery/power/rad_collector/should_have_node() return anchored */ diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index cfba81007f4..495ebc0b4be 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -26,7 +26,7 @@ var/locked = FALSE var/allow_switch_interact = TRUE - var/projectile_type = /obj/projectile/beam/emitter/hitscan //Wasp - Hitscan emitters + var/projectile_type = /obj/projectile/beam/emitter/hitscan //WS - Hitscan emitters var/projectile_sound = 'sound/weapons/emitter.ogg' var/datum/effect_system/spark_spread/sparks @@ -120,7 +120,7 @@ return FALSE return TRUE -/* Wasp Edit - Smartwire Revert +/*WS Edit - Smartwire Revert /obj/machinery/power/emitter/should_have_node() return welded */ @@ -275,7 +275,7 @@ welded = FALSE to_chat(user, "You cut [src] free from the floor.") disconnect_from_network() -// update_cable_icons_on_turf(get_turf(src)) - Wasp Edit - Smartwire Revert +// update_cable_icons_on_turf(get_turf(src)) - WS Edit - Smartwire Revert else if(anchored) if(!I.tool_start_check(user, amount=0)) @@ -287,7 +287,7 @@ welded = TRUE to_chat(user, "You weld [src] to the floor.") connect_to_network() -// update_cable_icons_on_turf(get_turf(src)) - Wasp Edit - Smartwire Revert +// update_cable_icons_on_turf(get_turf(src)) - WS Edit - Smartwire Revert else to_chat(user, "[src] needs to be wrenched to the floor!") diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index cff050fe2b2..5ba3c65d695 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -2,7 +2,7 @@ // stores power #define SMESRATE 0.05 // rate of internal charge to external power -#define SMESCHARGE 70 // ratio of battery storage to SMES storage // Wasp Edit - Removes magic number +#define SMESCHARGE 70 // ratio of battery storage to SMES storage //WS Edit - Removes magic number //Cache defines #define SMES_CLEVEL_1 1 @@ -72,11 +72,11 @@ for(var/obj/item/stock_parts/cell/PC in component_parts) MC += PC.maxcharge C += PC.charge - capacity = MC * SMESCHARGE // Wasp Edit - Removes magic number + capacity = MC * SMESCHARGE //WS Edit - Removes magic number if(!initial(charge) && !charge) - charge = C * SMESCHARGE // Wasp Edit - Prevents power duping + charge = C * SMESCHARGE //WS Edit - Prevents power duping -/* Wasp Edit - Smartwire Revert +/*WS Edit - Smartwire Revert /obj/machinery/power/smes/should_have_node() return TRUE */ diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index b6b64def9e3..1d781244810 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -39,7 +39,7 @@ unset_control() //remove from control computer return ..() -/* Wasp Edit - Smartwire Revert - Fucking swear don't TG Marge This +/*WS Edit - Smartwire Revert - Fucking swear don't TG Marge This /obj/machinery/power/solar/should_have_node() return TRUE */ diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index 45362d01e83..df5a3fd70c8 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -22,7 +22,7 @@ master = null return ..() -/* Wasp Edit - Smartwire Revert - Fucking swear don't TG Marge This +/*WS Edit - Smartwire Revert - Fucking swear don't TG Marge This /obj/machinery/power/terminal/should_have_node() return TRUE */ diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 4b4e68f8805..1a9f7750eb0 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -29,7 +29,7 @@ wires = new /datum/wires/tesla_coil(src) linked_techweb = SSresearch.science_tech -/* Wasp Edit - Smartwire Revert +/*WS Edit - Smartwire Revert /obj/machinery/power/tesla_coil/should_have_node() return anchored */ @@ -62,7 +62,7 @@ connect_to_network() else disconnect_from_network() -// update_cable_icons_on_turf(get_turf(src)) - Wasp Edit - Smartwire Revert +// update_cable_icons_on_turf(get_turf(src)) - WS Edit - Smartwire Revert /obj/machinery/power/tesla_coil/attackby(obj/item/W, mob/user, params) if(default_deconstruction_screwdriver(user, "coil_open[anchored]", "coil[anchored]", W)) diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm index 221e9a31d08..d997c5387a9 100644 --- a/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -27,7 +27,7 @@ /obj/item/ammo_box/magazine/m45 name = "handgun magazine (.45)" - icon = 'waspstation/icons/obj/ammo.dmi' + icon = 'whitesands/icons/obj/ammo.dmi' icon_state = "45-8" ammo_type = /obj/item/ammo_casing/c45 caliber = ".45" @@ -43,7 +43,7 @@ /obj/item/ammo_box/magazine/co9mm //WS edit begin - commander name = "Commander magazine (9mm)" desc = "A single stack M1911 reproduction magazine, modified to chamber 9mm." - icon = 'waspstation/icons/obj/ammo.dmi' + icon = 'whitesands/icons/obj/ammo.dmi' icon_state = "co9mm-8" ammo_type = /obj/item/ammo_casing/c9mm caliber = "9mm" diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm index ef3edf6610c..62e420be704 100644 --- a/code/modules/projectiles/boxes_magazines/external/smg.dm +++ b/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -1,6 +1,6 @@ /obj/item/ammo_box/magazine/wt550m9 name = "wt550 magazine (4.6x30mm)" - icon = 'waspstation/icons/obj/ammo.dmi' + icon = 'whitesands/icons/obj/ammo.dmi' icon_state = "46x30mmt-20" ammo_type = /obj/item/ammo_casing/c46x30mm caliber = "4.6x30mm" @@ -41,7 +41,7 @@ /obj/item/ammo_box/magazine/smgm9mm name = "SMG magazine (9mm)" - icon = 'waspstation/icons/obj/ammo.dmi' + icon = 'whitesands/icons/obj/ammo.dmi' icon_state = "smg9mm-42" ammo_type = /obj/item/ammo_casing/c9mm caliber = "9mm" diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 7c9b0d442b0..86af79dfcd0 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -23,7 +23,7 @@ var/vary_fire_sound = TRUE var/fire_sound_volume = 50 var/dry_fire_sound = 'sound/weapons/gun/general/dry_fire.ogg' - var/dry_fire_text = "click" //change this on non-gun things Wasp Edit - Dry firing + var/dry_fire_text = "click" //change this on non-gun things WS Edit - Dry firing var/suppressed = null //whether or not a message is displayed when fired var/can_suppress = FALSE var/suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' @@ -147,7 +147,7 @@ return TRUE /obj/item/gun/proc/shoot_with_empty_chamber(mob/living/user as mob|obj) - to_chat(user, "*[dry_fire_text]*") // Wasp Edit - Dry firing + to_chat(user, "*[dry_fire_text]*") //WS Edit - Dry firing playsound(src, dry_fire_sound, 30, TRUE) @@ -429,7 +429,7 @@ else if(bayonet && can_bayonet) //if it has a bayonet, and the bayonet can be removed return remove_gun_attachment(user, I, bayonet, "unfix") - /* WaspStation Edit - Fixes Pin Removal + /*WS Edit - Fixes Pin Removal else if(pin && user.is_holding(src)) user.visible_message("[user] attempts to remove [pin] from [src] with [I].", "You attempt to remove [pin] from [src]. (It will take [DisplayTimeText(FIRING_PIN_REMOVAL_DELAY)].)", null, 3) @@ -440,7 +440,7 @@ "You pry [pin] out with [I], destroying the pin in the process.", null, 3) QDEL_NULL(pin) return TRUE - WaspStation End */ + WS End */ /obj/item/gun/welder_act(mob/living/user, obj/item/I) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index f19f00be78c..2fc21cec23a 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -15,7 +15,7 @@ /obj/item/gun/ballistic/automatic/proto name = "\improper Nanotrasen Saber SMG" desc = "A prototype full auto 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors and a folding stock." - icon = 'waspstation/icons/obj/guns/projectile.dmi' + icon = 'whitesands/icons/obj/guns/projectile.dmi' icon_state = "saber" mag_type = /obj/item/ammo_box/magazine/smgm9mm pin = null @@ -84,7 +84,7 @@ /obj/item/gun/ballistic/automatic/wt550 name = "WT-550 Automatic Rifle" desc = "An outdated personal defence weapon. Uses 4.6x30mm rounds and is designated the WT-550 Automatic Rifle." - icon = 'waspstation/icons/obj/guns/projectile.dmi' + icon = 'whitesands/icons/obj/guns/projectile.dmi' icon_state = "wt550" item_state = "arg" mag_type = /obj/item/ammo_box/magazine/wt550m9 diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index de194008aee..4b0e6a127e4 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -35,7 +35,7 @@ /obj/item/gun/ballistic/automatic/pistol/m1911 name = "\improper M1911" desc = "A classic .45 handgun with a small magazine capacity." - icon = 'waspstation/icons/obj/guns/projectile.dmi' + icon = 'whitesands/icons/obj/guns/projectile.dmi' icon_state = "m1911" w_class = WEIGHT_CLASS_NORMAL mag_type = /obj/item/ammo_box/magazine/m45 diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm index cc2ffcdce51..3ce3d45c3f0 100644 --- a/code/modules/projectiles/guns/ballistic/toy.dm +++ b/code/modules/projectiles/guns/ballistic/toy.dm @@ -1,7 +1,7 @@ /obj/item/gun/ballistic/automatic/toy name = "foam force SMG" desc = "A prototype three-round burst toy submachine gun. Ages 8 and up." - icon = 'waspstation/icons/obj/guns/projectile.dmi' // waspstation edit: spritebase maintenance + icon = 'whitesands/icons/obj/guns/projectile.dmi' //WS edit: spritebase maintenance icon_state = "saber" item_state = "gun" mag_type = /obj/item/ammo_box/magazine/toy/smg diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index e7f2cc0cec7..dd4c9b20fa1 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -2,7 +2,7 @@ icon_state = "energy" name = "energy gun" desc = "A basic energy-based gun." - icon = 'waspstation/icons/obj/guns/energy.dmi' + icon = 'whitesands/icons/obj/guns/energy.dmi' var/obj/item/stock_parts/cell/gun/cell //What type of power cell this uses var/cell_type = /obj/item/stock_parts/cell/gun @@ -20,7 +20,7 @@ var/use_cyborg_cell = FALSE //whether the gun's cell drains the cyborg user's cell to recharge var/dead_cell = FALSE //set to true so the gun is given an empty cell - //WaspStation Begin - Gun Cells + //WS Begin - Gun Cells var/internal_cell = FALSE ///if the gun's cell cannot be replaced var/small_gun = FALSE ///if the gun is small and can only fit batteries that have less than a certain max charge var/big_gun = FALSE ///if the gun is big and can fit the comically large gun cell @@ -31,7 +31,7 @@ var/eject_sound = 'sound/weapons/gun/general/magazine_remove_full.ogg' //Sound of ejecting a cell. UPDATE PLEASE var/sound_volume = 40 //Volume of loading/unloading sounds var/load_sound_vary = TRUE //Should the load/unload sounds vary? - //WaspStation End + //WS End /obj/item/gun/energy/emp_act(severity) . = ..() @@ -90,7 +90,7 @@ if(charge_tick < charge_delay) return charge_tick = 0 - cell.give(1000) // WaspStation Edit - Egun energy cells + cell.give(1000) //WS Edit - Egun energy cells if(!chambered) //if empty chamber we try to charge a new shot recharge_newshot(TRUE) update_icon() diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm index 960fcbc013b..3d97947f840 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -2,7 +2,7 @@ name = "energy gun" desc = "A basic hybrid energy gun with two settings: disable and kill." icon_state = "energy" - icon = 'waspstation/icons/obj/guns/energy.dmi' //waspstation edit + icon = 'whitesands/icons/obj/guns/energy.dmi' //WS edit item_state = null //so the human update icon uses the icon_state instead. ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser) modifystate = 1 diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 26cc3a5fadf..407c54bafbc 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -15,7 +15,7 @@ can_bayonet = TRUE knife_x_offset = 20 knife_y_offset = 12 - internal_cell = TRUE //prevents you from giving it an OP cell - WaspStation Edit + internal_cell = TRUE //prevents you from giving it an OP cell - WS Edit var/overheat_time = 16 var/holds_charge = FALSE var/unique_frequency = FALSE // modified by KA modkits diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index 357b636cae9..c1ffa9041c7 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -1,7 +1,7 @@ /obj/item/gun/energy/pulse name = "pulse rifle" desc = "A heavy-duty, multifaceted energy rifle with three modes. Preferred by front-line combat personnel." - icon = 'waspstation/icons/obj/guns/energy.dmi' //waspstation edit + icon = 'whitesands/icons/obj/guns/energy.dmi' //WS edit icon_state = "pulse" item_state = null w_class = WEIGHT_CLASS_BULKY @@ -10,7 +10,7 @@ flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BACK ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) - internal_cell = TRUE //prevents you from giving it an OP cell - WaspStation Edit + internal_cell = TRUE //prevents you from giving it an OP cell - WS Edit cell_type = "/obj/item/stock_parts/cell/pulse" fire_rate = 3 automatic = 1 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 3a9074a2078..9c32d698ac4 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -1,7 +1,7 @@ /obj/item/gun/energy/ionrifle name = "ion rifle" desc = "A man-portable anti-armor weapon designed to disable mechanical threats at range." - icon = 'waspstation/icons/obj/guns/energy.dmi' //waspstation edit + icon = 'whitesands/icons/obj/guns/energy.dmi' //WS edit icon_state = "ionrifle" item_state = null //so the human update icon uses the icon_state instead. shaded_charge = FALSE @@ -138,7 +138,7 @@ usesound = list('sound/items/welder.ogg', 'sound/items/welder2.ogg') tool_behaviour = TOOL_WELDER toolspeed = 0.7 //plasmacutters can be used as welders, and are faster than standard welders - internal_cell = TRUE //so you don't cheese through the need for plasma - WASP EDIT + internal_cell = TRUE //so you don't cheese through the need for plasma - WS EDIT var/charge_weld = 25 //amount of charge used up to start action (multiplied by amount) and per progress_flash_divisor ticks of welding weapon_weight = WEAPON_LIGHT fire_rate = 3 @@ -313,7 +313,7 @@ /obj/item/gun/energy/temperature name = "temperature gun" - icon = 'waspstation/icons/obj/guns/energy.dmi' //waspstation edit + icon = 'whitesands/icons/obj/guns/energy.dmi' //WS edit icon_state = "freezegun" desc = "A gun that changes temperatures." ammo_type = list(/obj/item/ammo_casing/energy/temp, /obj/item/ammo_casing/energy/temp/hot) diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm index 3dec1030acb..add1ff888bd 100644 --- a/code/modules/projectiles/guns/misc/beam_rifle.dm +++ b/code/modules/projectiles/guns/misc/beam_rifle.dm @@ -28,7 +28,7 @@ weapon_weight = WEAPON_HEAVY w_class = WEIGHT_CLASS_BULKY ammo_type = list(/obj/item/ammo_casing/energy/beam_rifle/hitscan) - internal_cell = FALSE //prevents you from giving it an OP cell - WaspStation Edit //shut up dumb nerd + internal_cell = FALSE //prevents you from giving it an OP cell - WS Edit //shut up dumb nerd big_gun = TRUE cell_type = "/obj/item/stock_parts/cell/gun/large" canMouseDown = TRUE diff --git a/code/modules/projectiles/guns/misc/syringe_gun.dm b/code/modules/projectiles/guns/misc/syringe_gun.dm index 8b5c4598d6f..2acfaca16f2 100644 --- a/code/modules/projectiles/guns/misc/syringe_gun.dm +++ b/code/modules/projectiles/guns/misc/syringe_gun.dm @@ -116,8 +116,8 @@ icon_state = "blowgun" item_state = "blowgun" fire_sound = 'sound/items/syringeproj.ogg' - dry_fire_sound = null //dont got a trigger, no dry fire sound Wasp Edit - Dry firing - dry_fire_text = "pshoo" //heehee pshoo Wasp Edit - Dry firing + dry_fire_sound = null //dont got a trigger, no dry fire sound WS Edit - Dry firing + dry_fire_text = "pshoo" //heehee pshoo WS Edit - Dry firing /obj/item/gun/syringe/blowgun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) visible_message("[user] starts aiming with a blowgun!") diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 9316eb61538..a84bd72ccd7 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -72,7 +72,7 @@ var/muzzle_type var/impact_type - var/turf/last_angle_set_hitscan_store //Wasp Edit - last turf we stored a hitscan segment while changing angles. without this you'll have potentially hundreds of segments from a homing projectile or something. + var/turf/last_angle_set_hitscan_store //WS Edit - last turf we stored a hitscan segment while changing angles. without this you'll have potentially hundreds of segments from a homing projectile or something. //Fancy hitscan lighting effects! var/hitscan_light_intensity = 1.5 @@ -466,12 +466,12 @@ var/matrix/M = new M.Turn(Angle) transform = M - //Wasp Edit - Hitscan Emitters + //WS Edit - Hitscan Emitters if(fired && hitscan && trajectory && isloc(loc) && (loc != last_angle_set_hitscan_store)) last_angle_set_hitscan_store = loc var/datum/point/pcache = trajectory.copy_to() store_hitscan_collision(pcache) - //Wasp End + //WS End if(trajectory) trajectory.set_angle(new_angle) return TRUE @@ -518,7 +518,7 @@ beam_segments[beam_index] = null //record start. /obj/projectile/proc/process_hitscan() - var/safety = range * 10 //Wasp Edit - 3 to 10 - Hitscan Emitters + var/safety = range * 10 //WS Edit - 3 to 10 - Hitscan Emitters record_hitscan_start(RETURN_POINT_VECTOR_INCREMENT(src, Angle, MUZZLE_EFFECT_PIXEL_INCREMENT, 1)) while(loc && !QDELETED(src)) if(paused) @@ -600,7 +600,7 @@ return FALSE if(!ignore_source_check && firer) var/mob/M = firer - if((target == firer) || ((target == firer.loc) && (ismecha(firer.loc) || isspacepod(firer.loc))) || (target in firer.buckled_mobs) || (istype(M) && (M.buckled == target))) //cannot shoot yourself or your mech // Wasp - or your spacepod + if((target == firer) || ((target == firer.loc) && (ismecha(firer.loc) || isspacepod(firer.loc))) || (target in firer.buckled_mobs) || (istype(M) && (M.buckled == target))) //cannot shoot yourself or your mech //WS - or your spacepod return FALSE if(!ignore_loc && (loc != target.loc)) return FALSE @@ -706,7 +706,7 @@ /obj/projectile/proc/cleanup_beam_segments() QDEL_LIST_ASSOC(beam_segments) beam_segments = list() - QDEL_NULL(beam_index) //Wasp edit - Hitscan emitters + QDEL_NULL(beam_index) //WS edit - Hitscan emitters /obj/projectile/proc/finalize_hitscan_and_generate_tracers(impacting = TRUE) if(trajectory && beam_index) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 6f8f550af36..ce202ea2e39 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -40,7 +40,7 @@ impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser/wall /obj/projectile/beam/weak - damage = 7 // Waspstation Edit - Shotgun nerf + damage = 7 //WS Edit - Shotgun nerf /obj/projectile/beam/weak/penetrator armour_penetration = 50 diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index 26b968460b4..4fb37820da7 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -1,12 +1,12 @@ /obj/projectile/bullet/shotgun_slug name = "12g shotgun slug" - damage = 45 // Wasp Edit - Shotgun Nerf + damage = 45 //WS Edit - Shotgun Nerf /obj/projectile/bullet/shotgun_beanbag name = "beanbag slug" damage = 5 - stamina = 45 // Wasp Edit - Shotgun Nerf - armour_penetration = -10 // Wasp Edit - Shotgun Nerf + stamina = 45 //WS Edit - Shotgun Nerf + armour_penetration = -10 //WS Edit - Shotgun Nerf /obj/projectile/bullet/incendiary/shotgun name = "incendiary slug" @@ -57,20 +57,20 @@ return BULLET_ACT_HIT /obj/projectile/bullet/pellet - var/tile_dropoff = 1 // Wasp Edit - Shotgun Nerf - var/tile_dropoff_s = 0.8 // Wasp Edit - Shotgun Nerf + var/tile_dropoff = 1 //WS Edit - Shotgun Nerf + var/tile_dropoff_s = 0.8 //WS Edit - Shotgun Nerf /obj/projectile/bullet/pellet/shotgun_buckshot name = "buckshot pellet" - damage = 10 // Wasp Edit - Shotgun Nerf - armour_penetration = -20 // Wasp Edit - Shotgun Nerf + damage = 10 //WS Edit - Shotgun Nerf + armour_penetration = -20 //WS Edit - Shotgun Nerf /obj/projectile/bullet/pellet/shotgun_rubbershot name = "rubbershot pellet" - damage = 2 // Wasp Edit Begin - Shotgun Nerf + damage = 2 //WS Edit Begin - Shotgun Nerf stamina = 8 armour_penetration = -20 - tile_dropoff = 0.2 // Keep it at 10% per tile // Wasp Edit End + tile_dropoff = 0.2 // Keep it at 10% per tile //WS Edit End /obj/projectile/bullet/pellet/shotgun_incapacitate name = "incapacitating pellet" @@ -87,9 +87,9 @@ qdel(src) /obj/projectile/bullet/pellet/shotgun_improvised - tile_dropoff = 0.45 //Come on it does 4.5 damage don't be like that. // Wasp Edit - Shotgun nerf - damage = 4.5 // Wasp Edit - Shotgun nerf - armour_penetration = -20 // Wasp Edit - Shotgun nerf + tile_dropoff = 0.45 //Come on it does 4.5 damage don't be like that. //WS Edit - Shotgun nerf + damage = 4.5 //WS Edit - Shotgun nerf + armour_penetration = -20 //WS Edit - Shotgun nerf /obj/projectile/bullet/pellet/shotgun_improvised/Initialize() . = ..() diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm index 4aa44eff6d1..708f8e7c6dd 100644 --- a/code/modules/projectiles/projectile/energy/stun.dm +++ b/code/modules/projectiles/projectile/energy/stun.dm @@ -9,13 +9,13 @@ muzzle_type = /obj/effect/projectile/muzzle/stun impact_type = /obj/effect/projectile/impact/stun - var/confusion_amt = 10 // Wasp Edit Begin - Nerfs tasers + var/confusion_amt = 10 //WS Edit Begin - Nerfs tasers var/stamina_loss_amt = 60 var/apply_stun_delay = 2 SECONDS var/stun_time = 5 SECONDS var/attack_cooldown_check = 0 SECONDS - var/attack_cooldown = 2.5 SECONDS // Wasp Edit End + var/attack_cooldown = 2.5 SECONDS //WS Edit End /obj/projectile/energy/electrode/on_hit(atom/target, blocked = FALSE) . = ..() @@ -26,7 +26,7 @@ if(C.dna && C.dna.check_mutation(HULK)) C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk") else if((C.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(C, TRAIT_STUNIMMUNE)) - C.Jitter(20) // Wasp Edit Begin - Nerfs tasers + C.Jitter(20) //WS Edit Begin - Nerfs tasers C.confused = max(confusion_amt, C.confused) C.stuttering = max(8, C.stuttering) C.apply_damage(stamina_loss_amt, STAMINA, BODY_ZONE_CHEST) @@ -44,7 +44,7 @@ else target.Knockdown(stun_time) if(!target.IsKnockdown()) - to_chat(target, "Your muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]") // Wasp Edit End + to_chat(target, "Your muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]") //WS Edit End /obj/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 9fc3c7f47fe..c5df8c8c15d 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -361,7 +361,7 @@ if(!C) C = R.holder.my_atom - //Wasp begin - IPCs + //WS begin - IPCs if(ishuman(C)) var/mob/living/carbon/human/H = C //Check if this mob's species is set and can process this type of reagent @@ -387,7 +387,7 @@ R.holder.remove_reagent(R.type, R.metabolization_rate) continue //If you got this far, that means we can process whatever reagent this iteration is for. Handle things normally from here. - //Wasp End + //WS End if(C && R) diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index 349680287ae..539452eda7e 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -72,9 +72,9 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) var/datum/material/material - //WaspStation Begin + //WS Begin var/process_flags = ORGANIC // What can process this? ORGANIC, SYNTHETIC, or ORGANIC | SYNTHETIC?. We'll assume by default that it affects organics. - //WaspStation End + //WS End /datum/reagent/New() . = ..() diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index fdbc9317525..daa7adabbba 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -91,7 +91,7 @@ ..() return TRUE -/* WaspStation Begin - Medicine Fixes +/*WS Begin - Medicine Fixes /datum/reagent/medicine/C2/probital name = "Probital" @@ -134,7 +134,7 @@ ..() -WaspStation End */ +WS End */ /******BURN******/ /*Suffix: -uri*/ @@ -174,7 +174,7 @@ WaspStation End */ ..() return TRUE -/* WaspStation Begin - Fixes Medicines +/*WS Begin - Fixes Medicines /datum/reagent/medicine/C2/hercuri name = "Hercuri" @@ -210,7 +210,7 @@ WaspStation End */ M.adjust_bodytemperature(-10*TEMPERATURE_DAMAGE_COEFFICIENT*REM,50) //chilly chilly ..() -WaspStation End*/ +WS End*/ /******OXY******/ /*Suffix: -mol*/ @@ -329,7 +329,7 @@ WaspStation End*/ #define issyrinormusc(A) (istype(A,/datum/reagent/medicine/C2/syriniver) || istype(A,/datum/reagent/medicine/C2/musiver)) //musc is metab of syrin so let's make sure we're not purging either -/* WaspStation Begin - Medicine Fixes +/*WS Begin - Medicine Fixes /datum/reagent/medicine/C2/syriniver //Inject >> SYRINge name = "Syriniver" @@ -409,7 +409,7 @@ WaspStation End*/ #undef issyrinormusc -WaspStation End*/ +WS End*/ /******COMBOS******/ /*Suffix: Combo of healing, prob gonna get wack REAL fast*/ diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index b7da55cedaf..47970707833 100755 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -725,7 +725,7 @@ var/mob/living/carbon/C = M var/obj/item/organ/stomach/ethereal/stomach = C.getorganslot(ORGAN_SLOT_STOMACH) if(istype(stomach)) - stomach.adjust_charge(reac_volume * REM * ETHEREAL_CHARGE_SCALING_MULTIPLIER) // Waspstation Edit -- Ethereal Charge Scaling + stomach.adjust_charge(reac_volume * REM * ETHEREAL_CHARGE_SCALING_MULTIPLIER) //WS Edit -- Ethereal Charge Scaling /datum/reagent/consumable/liquidelectricity/on_mob_life(mob/living/carbon/M) if(prob(25) && !isethereal(M)) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index f2667d5ea5f..16e70f204c9 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -406,7 +406,7 @@ color = "#000000" metabolization_rate = 0.5 * REAGENTS_METABOLISM taste_description = "ash" - process_flags = ORGANIC //WaspStation Edit - IPCs + process_flags = ORGANIC //WS Edit - IPCs /datum/reagent/medicine/charcoal/on_mob_life(mob/living/carbon/M) M.adjustToxLoss(-2*REM, 0) @@ -429,7 +429,7 @@ reagent_state = LIQUID color = "#F1C40F" metabolization_rate = 0.5 * REAGENTS_METABOLISM - process_flags = SYNTHETIC //WaspStation Edit - IPCs + process_flags = SYNTHETIC //WS Edit - IPCs /datum/reagent/medicine/system_cleaner/on_mob_life(mob/living/M) M.adjustToxLoss(-2*REM, 0) @@ -444,7 +444,7 @@ description = "Repairs brain damage in synthetics." color = "#727272" taste_description = "metallic" - process_flags = SYNTHETIC //WaspStation Edit - IPCs + process_flags = SYNTHETIC //WS Edit - IPCs /datum/reagent/medicine/liquid_solder/on_mob_life(mob/living/M) M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3*REM) @@ -496,9 +496,9 @@ taste_description = "acid" /datum/reagent/medicine/calomel/on_mob_life(mob/living/carbon/M) - for(var/datum/reagent/R in M.reagents.reagent_list) // Waspstation Edit Begin - Actually purges all chems + for(var/datum/reagent/R in M.reagents.reagent_list) //WS Edit Begin - Actually purges all chems if(R != src) - M.reagents.remove_reagent(R.type,3) // Waspstation Edit End + M.reagents.remove_reagent(R.type,3) //WS Edit End if(M.health > 20) M.adjustToxLoss(1*REM, 0) . = 1 @@ -1171,7 +1171,7 @@ M.adjustToxLoss(-0.25*REM, 0) . = 1 ..() -/datum/reagent/medicine/tetracordrazine //waspstation edit: Yes +/datum/reagent/medicine/tetracordrazine //WS edit: Yes name = "Tetracordrazine" description = "A weak dilutant similar to Tricordrazine that slowly heals all damage types." reagent_state = LIQUID @@ -1215,7 +1215,7 @@ reagent_state = SOLID color = "#555555" overdose_threshold = 30 - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs //WS Edit - IPCs /datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/carbon/M) M.adjustBruteLoss(-5*REM, 0) //A ton of healing - this is a 50 telecrystal investment. @@ -1306,7 +1306,7 @@ ..() return TRUE -/* Wasp edit begin - Lavaland rework +/* WS edit begin - Lavaland rework /datum/reagent/medicine/lavaland_extract name = "Lavaland Extract" description = "An extract of lavaland atmospheric and mineral elements. Heals the user in small doses, but is extremely toxic otherwise." @@ -1325,7 +1325,7 @@ M.adjustToxLoss(3*REM, 0) ..() return TRUE -*/ // Wasp edit end +*/ //WS edit end //used for changeling's adrenaline power /datum/reagent/medicine/changelingadrenaline @@ -1611,7 +1611,7 @@ ..() . = 1 -/* /datum/reagent/medicine/hepanephrodaxon //Waspstation edit: Temporary removal of overloaded chem +/* /datum/reagent/medicine/hepanephrodaxon //WS edit: Temporary removal of overloaded chem name = "Hepanephrodaxon" description = "Used to repair the common tissues involved in filtration." taste_description = "glue" diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 4ae7b34d064..087c09076b0 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -130,7 +130,7 @@ glass_desc = "The father of all refreshments." shot_glass_icon_state = "shotglassclear" - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs //WS Edit - IPCs /* * Water reaction to turf @@ -326,7 +326,7 @@ name = "Hell Water" description = "YOUR FLESH! IT BURNS!" taste_description = "burning" - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/hellwater/on_mob_life(mob/living/carbon/M) M.fire_stacks = min(5,M.fire_stacks + 3) @@ -478,7 +478,7 @@ "Your appendages begin morphing." = MUT_MSG_EXTENDED, "You feel as though you're about to change at any moment!" = MUT_MSG_ABOUT2TURN) var/cycles_to_turn = 20 //the current_cycle threshold / iterations needed before one can transform - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/mutationtoxin/on_mob_life(mob/living/carbon/human/H) . = TRUE @@ -521,7 +521,7 @@ description = "A corruptive toxin." color = "#13BC5E" // rgb: 19, 188, 94 race = /datum/species/jelly/slime - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/mutationtoxin/unstable name = "Unstable Mutation Toxin" @@ -543,7 +543,7 @@ name = "Felinid Mutation Toxin" color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/human/felinid - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "something nyat good" /datum/reagent/mutationtoxin/lizard @@ -551,7 +551,7 @@ description = "A lizarding toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/lizard - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "dragon's breath but not as cool" /datum/reagent/mutationtoxin/fly @@ -559,7 +559,7 @@ description = "An insectifying toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/fly - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "trash" /datum/reagent/mutationtoxin/moth @@ -567,7 +567,7 @@ description = "A glowing toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/moth - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "clothing" /datum/reagent/mutationtoxin/pod @@ -575,7 +575,7 @@ description = "A vegetalizing toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/pod - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "flowers" /datum/reagent/mutationtoxin/jelly @@ -583,7 +583,7 @@ description = "A jellyfying toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/jelly - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "grandma's gelatin" /datum/reagent/mutationtoxin/jelly/on_mob_life(mob/living/carbon/human/H) @@ -606,7 +606,7 @@ description = "A crystal toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/golem/random - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "rocks" /datum/reagent/mutationtoxin/abductor @@ -614,7 +614,7 @@ description = "An alien toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/abductor - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "something out of this world... no, universe!" /datum/reagent/mutationtoxin/android @@ -622,7 +622,7 @@ description = "A robotic toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/android - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "circuitry and steel" /datum/reagent/mutationtoxin/ipc @@ -645,7 +645,7 @@ description = "A scary toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/skeleton - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "milk... and lots of it" /datum/reagent/mutationtoxin/zombie @@ -653,7 +653,7 @@ description = "An undead toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/zombie //Not the infectious kind. The days of xenobio zombie outbreaks are long past. - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "brai...nothing in particular" /datum/reagent/mutationtoxin/goofzombie @@ -668,7 +668,7 @@ description = "An ashen toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/lizard/ashwalker - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "savagery" //DANGEROUS RACES @@ -677,7 +677,7 @@ description = "A dark toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/shadow - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "the night" /datum/reagent/mutationtoxin/plasma @@ -685,7 +685,7 @@ description = "A plasma-based toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/plasmaman - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "plasma" #undef MUT_MSG_IMMEDIATE @@ -858,7 +858,7 @@ reagent_state = GAS color = "#808080" // rgb: 128, 128, 128 taste_description = "acid" - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/fluorine/on_mob_life(mob/living/carbon/M) M.adjustToxLoss(1*REM, 0) @@ -962,9 +962,9 @@ var/irradiation_level = 1 material = /datum/material/uranium - //WaspStation Begin - IPCs - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs - //WaspStation End + //WS Begin - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs + //WS End /datum/reagent/uranium/on_mob_life(mob/living/carbon/M) M.apply_effect(irradiation_level/M.metabolism_efficiency,EFFECT_IRRADIATE,0) @@ -986,7 +986,7 @@ color = "#00CC00" // ditto taste_description = "the colour blue and regret" irradiation_level = 2*REM - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs material = null /datum/reagent/bluespace @@ -997,9 +997,9 @@ taste_description = "fizzling blue" material = /datum/material/bluespace - //WaspStation Begin - IPCs - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs - //WaspStation End + //WS Begin - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs + //WS End /datum/reagent/bluespace/expose_mob(mob/living/M, method=TOUCH, reac_volume) if(method == TOUCH || method == VAPOR) @@ -1040,7 +1040,7 @@ glass_icon_state = "dr_gibb_glass" glass_name = "glass of welder fuel" glass_desc = "Unless you're an industrial tool, this is probably not safe for consumption." - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/fuel/expose_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with welding fuel to make them easy to ignite! if(method == TOUCH || method == VAPOR) @@ -1259,7 +1259,7 @@ /datum/reagent/stimulum name = "Stimulum" - description = "An unstable experimental gas that greatly increases the energy of those that inhale it." // Waspstation Edit -- No longer references toxin damage. + description = "An unstable experimental gas that greatly increases the energy of those that inhale it." //WS Edit -- No longer references toxin damage. reagent_state = GAS metabolization_rate = REAGENTS_METABOLISM * 0.5 // Because stimulum/nitryl/freon are handled through gas breathing, metabolism must be lower for breathcode to keep up color = "E1A116" @@ -1277,7 +1277,7 @@ /datum/reagent/stimulum/on_mob_life(mob/living/carbon/M) M.adjustStaminaLoss(-2*REM, 0) - //M.adjustToxLoss(current_cycle*0.1*REM, 0) // 1 toxin damage per cycle at cycle 10 //Waspstation Edit -- Stimulum no longer hurts you + //M.adjustToxLoss(current_cycle*0.1*REM, 0) // 1 toxin damage per cycle at cycle 10 //WS Edit -- Stimulum no longer hurts you ..() /datum/reagent/nitryl @@ -1470,7 +1470,7 @@ reagent_state = LIQUID color = "#2D2D2D" taste_description = "oil" - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/stable_plasma name = "Stable Plasma" @@ -1479,7 +1479,7 @@ color = "#2D2D2D" taste_description = "bitterness" taste_mult = 1.5 - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/stable_plasma/on_mob_life(mob/living/carbon/C) C.adjustPlasma(10) diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index 39f5e9b0eb3..04ebba2bc9c 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -5,7 +5,7 @@ reagent_state = SOLID color = "#550000" taste_description = "sweet tasting metal" - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/thermite/expose_turf(turf/T, reac_volume) if(reac_volume >= 1) @@ -36,7 +36,7 @@ color = "#FFC8C8" metabolization_rate = 4 taste_description = "burning" - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/clf3/on_mob_life(mob/living/carbon/M) M.adjust_fire_stacks(2) @@ -153,7 +153,7 @@ color = "#FA00AF" taste_description = "burning" self_consuming = TRUE - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/phlogiston/expose_mob(mob/living/M, method=TOUCH, reac_volume) M.adjust_fire_stacks(1) @@ -176,7 +176,7 @@ color = "#FA00AF" taste_description = "burning" self_consuming = TRUE - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/napalm/on_mob_life(mob/living/carbon/M) M.adjust_fire_stacks(1) @@ -194,7 +194,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM taste_description = "bitterness" self_consuming = TRUE - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/cryostylane/on_mob_life(mob/living/carbon/M) //TODO: code freezing into an ice cube @@ -215,7 +215,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM taste_description = "bitterness" self_consuming = TRUE - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/pyrosium/on_mob_life(mob/living/carbon/M) if(M.reagents.has_reagent(/datum/reagent/oxygen)) @@ -232,7 +232,7 @@ taste_description = "charged metal" self_consuming = TRUE var/shock_timer = 0 - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/teslium/on_mob_life(mob/living/carbon/M) shock_timer++ diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 4e92e4c40f1..05ca8b06cd7 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -62,9 +62,9 @@ toxpwr = 3 material = /datum/material/plasma - //WaspStation Begin - IPCs - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs - //WaspStation End + //WS Begin - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs + //WS End /datum/reagent/toxin/plasma/on_mob_life(mob/living/carbon/C) if(holder.has_reagent(/datum/reagent/medicine/epinephrine)) @@ -410,7 +410,7 @@ color = "#787878" metabolization_rate = 0.125 * REAGENTS_METABOLISM toxpwr = 0 - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/toxin/polonium/on_mob_life(mob/living/carbon/M) M.radiation += 4 @@ -751,7 +751,7 @@ metabolization_rate = 0.6 * REAGENTS_METABOLISM toxpwr = 0.5 taste_description = "spinning" - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/M) if(M.hud_used) @@ -779,7 +779,7 @@ metabolization_rate = 0.8 * REAGENTS_METABOLISM toxpwr = 0.25 taste_description = "skewing" - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/toxin/skewium/on_mob_life(mob/living/carbon/M) if(M.hud_used) @@ -834,7 +834,7 @@ var/acidpwr = 10 //the amount of protection removed from the armour taste_description = "acid" self_consuming = TRUE - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs /datum/reagent/toxin/acid/expose_mob(mob/living/carbon/C, method=TOUCH, reac_volume) if(!istype(C)) diff --git a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm index d7f8334dd84..dbe3398e3f0 100644 --- a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm +++ b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm @@ -12,17 +12,17 @@ required_reagents = list(/datum/reagent/phenol = 1, /datum/reagent/oxygen = 1, /datum/reagent/nitrogen = 1) -/* WaspStation Begin - Fixes medicines +/*WS Begin - Fixes medicines /datum/chemical_reaction/probital results = list(/datum/reagent/medicine/C2/probital = 4) required_reagents = list(/datum/reagent/copper = 1, /datum/reagent/acetone = 2, /datum/reagent/phosphorus = 1) -WaspStation End */ +WS End */ /*****BURN*****/ -/* WaspStation Begin - No CobbyChems +/*WS Begin - No CobbyChems /datum/chemical_reaction/lenturi results = list(/datum/reagent/medicine/C2/lenturi = 5) @@ -34,7 +34,7 @@ WaspStation End */ results = list(/datum/reagent/medicine/C2/aiuri = 4) required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/toxin/acid = 1, /datum/reagent/hydrogen = 2) -/* WaspStation Begin - Fixes medicines +/*WS Begin - Fixes medicines /datum/chemical_reaction/hercuri results = list(/datum/reagent/medicine/C2/hercuri = 5) @@ -42,11 +42,11 @@ WaspStation End */ required_temp = 47 is_cold_recipe = TRUE -WaspStation End */ +WS End */ /*****OXY*****/ -/* WaspStation Begin - No CobbyChems +/*WS Begin - No CobbyChems /datum/chemical_reaction/convermol results = list(/datum/reagent/medicine/C2/convermol = 3) @@ -67,7 +67,7 @@ WaspStation End */ results = list(/datum/reagent/medicine/C2/seiver = 3) required_reagents = list(/datum/reagent/nitrogen = 1, /datum/reagent/potassium = 1, /datum/reagent/aluminium = 1) -/* WaspStation Begin - No CobbyChems +/*WS Begin - No CobbyChems /datum/chemical_reaction/multiver results = list(/datum/reagent/medicine/C2/multiver = 2) diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm index b1b25e8ed04..ca18d17a9a4 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -48,13 +48,13 @@ results = list(/datum/reagent/medicine/mine_salve = 15) required_reagents = list(/datum/reagent/toxin/plasma = 5, /datum/reagent/iron = 5, /datum/reagent/consumable/sugar = 1) // A sheet of plasma, a twinkie and a sheet of metal makes four of these -/* WaspStation Begin - No Cobbychmes +/*WS Begin - No Cobbychmes /datum/chemical_reaction/instabitaluri results = list(/datum/reagent/medicine/C2/instabitaluri = 3) required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/carbon = 1, /datum/reagent/medicine/C2/libital = 1) -WaspStation End */ +WS End */ /datum/chemical_reaction/calomel results = list(/datum/reagent/medicine/calomel = 2) @@ -154,11 +154,11 @@ WaspStation End */ results = list(/datum/reagent/medicine/regen_jelly = 2) required_reagents = list(/datum/reagent/medicine/omnizine = 1, /datum/reagent/toxin/slimejelly = 1) -/*WaspStation Begin +/*WS Begin /datum/chemical_reaction/higadrite results = list(/datum/reagent/medicine/higadrite = 3) required_reagents = list(/datum/reagent/phenol = 2, /datum/reagent/lithium = 1) -WaspStation End*/ +WS End*/ /datum/chemical_reaction/morphine results = list(/datum/reagent/medicine/morphine = 2) required_reagents = list(/datum/reagent/carbon = 2, /datum/reagent/hydrogen = 2, /datum/reagent/consumable/ethanol = 1, /datum/reagent/oxygen = 1) @@ -173,13 +173,13 @@ WaspStation End*/ results = list(/datum/reagent/medicine/psicodine = 5) required_reagents = list( /datum/reagent/medicine/mannitol = 2, /datum/reagent/water = 2, /datum/reagent/impedrezene = 1) -/* WaspStation Begin - No Cobby +/*WS Begin - No Cobby /datum/chemical_reaction/granibitaluri results = list(/datum/reagent/medicine/granibitaluri = 3) required_reagents = list(/datum/reagent/acetone = 1, /datum/reagent/phenol = 1, /datum/reagent/nitrogen = 1) required_catalysts = list(/datum/reagent/iron = 5) -WaspStation End */ +WS End */ /datum/chemical_reaction/medsuture required_reagents = list(/datum/reagent/cellulose = 10, /datum/reagent/toxin/formaldehyde = 20, /datum/reagent/medicine/polypyr = 15) //This might be a bit much, reagent cost should be reviewed after implementation. diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 0a93cc84b41..8ebe5a3fcfc 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -48,7 +48,7 @@ var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) new /obj/item/stack/sheet/mineral/gold(location) - + /datum/chemical_reaction/adamantinesolidification required_reagents = list(/datum/reagent/gold = 5, /datum/reagent/consumable/frostoil = 5, /datum/reagent/liquidadamantine = 10) mob_react = FALSE @@ -400,7 +400,7 @@ results = list(/datum/reagent/colorful_reagent = 5) required_reagents = list(/datum/reagent/stable_plasma = 1, /datum/reagent/uranium/radium = 1, /datum/reagent/drug/space_drugs = 1, /datum/reagent/medicine/cryoxadone = 1, /datum/reagent/consumable/triple_citrus = 1) -/* WaspStation Begin - No CobbyChems +/*WS Begin - No CobbyChems /datum/chemical_reaction/life required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/medicine/C2/instabitaluri = 1, /datum/reagent/blood = 1) @@ -413,7 +413,7 @@ required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/medicine/C2/instabitaluri = 1, /datum/reagent/consumable/sugar = 1) required_temp = 374 -WaspStation End */ +WS End */ /datum/chemical_reaction/life_friendly/on_reaction(datum/reagents/holder, created_volume) chemical_mob_spawn(holder, rand(1, round(created_volume, 1)), "Life (friendly)", FRIENDLY_SPAWN) @@ -515,8 +515,8 @@ WaspStation End */ /datum/chemical_reaction/pax results = list(/datum/reagent/pax = 3) required_reagents = list(/datum/reagent/toxin/mindbreaker = 1, /datum/reagent/medicine/synaptizine = 1, /datum/reagent/water = 1) - - + + //////////////////EXPANDED MUTATION TOXINS///////////////////// /datum/chemical_reaction/yuck @@ -597,7 +597,7 @@ WaspStation End */ /datum/chemical_reaction/mutationtoxin/felinid results = list(/datum/reagent/mutationtoxin/felinid = 1) required_reagents = list(/datum/reagent/mutationtoxin/unstable = 1, /datum/reagent/toxin/fentanyl = 10, /datum/reagent/impedrezene = 10) - + /datum/chemical_reaction/mutationtoxin/fly results = list(/datum/reagent/mutationtoxin/fly = 1) required_reagents = list(/datum/reagent/mutationtoxin/unstable = 1, /datum/reagent/toxin/mutagen = 10) @@ -605,7 +605,7 @@ WaspStation End */ /datum/chemical_reaction/mutationtoxin/moth results = list(/datum/reagent/mutationtoxin/moth = 1) required_reagents = list(/datum/reagent/mutationtoxin/unstable = 1, /datum/reagent/toxin/lipolicide = 10) //I know it's the opposite of what moths like, but I am out of ideas for this. - + /datum/chemical_reaction/mutationtoxin/pod results = list(/datum/reagent/mutationtoxin/pod = 1) required_reagents = list(/datum/reagent/mutationtoxin/unstable = 1, /datum/reagent/plantnutriment/eznutriment = 10) @@ -617,7 +617,7 @@ WaspStation End */ /datum/chemical_reaction/mutationtoxin/abductor results = list(/datum/reagent/mutationtoxin/abductor = 1) required_reagents = list(/datum/reagent/mutationtoxin/unstable = 1, /datum/reagent/medicine/morphine = 10, /datum/reagent/toxin/mutetoxin = 10) - + /datum/chemical_reaction/mutationtoxin/squid results = list(/datum/reagent/mutationtoxin/squid = 1) required_reagents = list(/datum/reagent/mutationtoxin/unstable = 1, /datum/reagent/consumable/sodiumchloride = 10, /datum/reagent/water = 20) @@ -625,7 +625,7 @@ WaspStation End */ /datum/chemical_reaction/mutationtoxin/ipc results = list(/datum/reagent/mutationtoxin/ipc = 1) required_reagents = list(/datum/reagent/mutationtoxin/unstable = 1, /datum/reagent/teslium = 20) - + //////////////Mutatuion toxins made out of advanced toxin///////////// /datum/chemical_reaction/mutationtoxin/skeleton @@ -645,11 +645,11 @@ WaspStation End */ /datum/chemical_reaction/mutationtoxin/ash results = list(/datum/reagent/mutationtoxin/ash = 1) required_reagents = list(/datum/reagent/aslimetoxin = 1, /datum/reagent/mutationtoxin/lizard = 1, /datum/reagent/ash = 10, /datum/reagent/consumable/entpoly = 5) - + /datum/chemical_reaction/mutationtoxin/shadow results = list(/datum/reagent/mutationtoxin/shadow = 1) required_reagents = list(/datum/reagent/aslimetoxin = 1, /datum/reagent/liquid_dark_matter = 30, /datum/reagent/water/holywater = 10) //You need a tiny bit of thinking how to mix it - + /datum/chemical_reaction/mutationtoxin/plasma results = list(/datum/reagent/mutationtoxin/plasma = 1) required_reagents = list(/datum/reagent/aslimetoxin = 1, /datum/reagent/toxin/plasma = 60, /datum/reagent/uranium = 20) diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 49cd7c13a8c..018fb28e4aa 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -75,7 +75,7 @@ /datum/chemical_reaction/reagent_explosion/rdx_explosion3 required_reagents = list(/datum/reagent/rdx = 1 , /datum/reagent/teslium = 1) modifier = 6 - strengthdiv = 3 + strengthdiv = 3 /datum/chemical_reaction/reagent_explosion/rdx_explosion3/on_reaction(datum/reagents/holder, created_volume) var/fire_range = round(created_volume/25) // I saw why edge has such a hardon for RDX @@ -162,7 +162,7 @@ C.adjust_fire_stacks(5) C.IgniteMob() -/* WaspStation Edit - No Cobby +/*WS Edit - No Cobby /datum/chemical_reaction/gunpowder results = list(/datum/reagent/gunpowder = 3) required_reagents = list(/datum/reagent/saltpetre = 1, /datum/reagent/medicine/C2/multiver = 1, /datum/reagent/sulfur = 1) @@ -174,7 +174,7 @@ modifier = 1 mix_message = "Sparks start flying around the blackpowder!" -WaspStation End*/ +WS End*/ /datum/chemical_reaction/reagent_explosion/gunpowder_explosion/on_reaction(datum/reagents/holder, created_volume) addtimer(CALLBACK(src, .proc/explode, holder, created_volume), rand(5,10) SECONDS) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 070247c5083..28ff20ef867 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -262,7 +262,7 @@ list_reagents = list(/datum/reagent/medicine/potass_iodide = 15) rename_with_volume = TRUE -/* WaspStation Begin - No Cobbychem +/*WS Begin - No Cobbychem /obj/item/reagent_containers/pill/C2/probital name = "Probital pill" @@ -271,7 +271,7 @@ list_reagents = list(/datum/reagent/medicine/C2/probital = 5, /datum/reagent/medicine/granibitaluri = 10) rename_with_volume = TRUE -WaspStation End */ +WS End */ /obj/item/reagent_containers/pill/iron name = "iron pill" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 0d40a0029e9..299a63724c4 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -406,7 +406,7 @@ item_state = "sprayer_med_blue" M.update_inv_hands() -/* WaspStation Begin - No Cobby +/*WS Begin - No Cobby /obj/item/reagent_containers/spray/hercuri name = "medical spray (hercuri)" @@ -414,4 +414,4 @@ icon_state = "sprayer_large" list_reagents = list(/datum/reagent/medicine/C2/hercuri = 100) -WaspStation End */ +WS End */ diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index e62fcdcc43e..98cfbe8fc44 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -46,7 +46,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) if(.) operating = TRUE update_icon() - begin_processing() // Waspstation Edit - Auto Conveyor Fix (Issue #331) + begin_processing() //WS Edit - Auto Conveyor Fix (Issue #331) // create a conveyor /obj/machinery/conveyor/Initialize(mapload, newdir, newid) diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm index 119fd8abc88..033f3f15b67 100644 --- a/code/modules/religion/religion_sects.dm +++ b/code/modules/religion/religion_sects.dm @@ -151,7 +151,7 @@ var/did_we_charge = FALSE var/obj/item/organ/stomach/ethereal/eth_stomach = H.getorganslot(ORGAN_SLOT_STOMACH) if(istype(eth_stomach)) - eth_stomach.adjust_charge(3 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) // Waspstation Edit -- Ethereal Charge Scaling + eth_stomach.adjust_charge(3 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) //WS Edit -- Ethereal Charge Scaling did_we_charge = TRUE //if we're not targetting a robot part we stop early diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 88b1263d189..19aefc2ec0d 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -155,7 +155,7 @@ id = "cable_coil" build_type = AUTOLATHE materials = list(/datum/material/iron = 10, /datum/material/glass = 5) - build_path = /obj/item/stack/cable_coil/random //Wasp Edit - Smartwire Revert + build_path = /obj/item/stack/cable_coil/random //WS Edit - Smartwire Revert category = list("initial","Tools","Tool Designs") maxstack = MAXCOIL departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE @@ -763,7 +763,7 @@ category = list("initial", "Misc") //hacked autolathe recipes -// Waspstation - emagged recipies +//WS - emagged recipies /datum/design/flamethrower name = "Flamethrower" id = "flamethrower" diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 73a65358366..96d8f67a3f1 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -521,7 +521,7 @@ construction_time = 100 category = list("Exosuit Equipment") -//Wasp Edit Begin - Smartwire Revert - Donut TG Marge this +//WS Edit Begin - Smartwire Revert - Donut TG Marge this /datum/design/mech_cable_layer name = "Exosuit Engineering Equipment (Cable Layer)" id = "mech_cable_layer" @@ -530,7 +530,7 @@ materials = list(/datum/material/iron=10000) construction_time = 100 category = list("Exosuit Equipment") -//Wasp Edit End - Smartwire Revert - Donut TG Marge this +//WS Edit End - Smartwire Revert - Donut TG Marge this /datum/design/mech_generator name = "Exosuit Equipment (Plasma Generator)" @@ -862,4 +862,4 @@ build_path = /obj/item/organ/cyberimp/arm/power_cord materials = list(MAT_IRON=2000, MAT_GLASS=1000) construction_time = 100 - category = list("IPC Components") + category = list("IPC Components") diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index fd7b8e24b3f..532a59dbe47 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -284,7 +284,7 @@ build_path = /obj/item/ammo_box/magazine/wt550m9/wtic departmental_flags = DEPARTMENTAL_FLAG_SECURITY -//Waspstation edit - free lethals +//WS edit - free lethals /datum/design/commanderammo name = "Commander magazine (9mm)" @@ -374,7 +374,7 @@ category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY -//Wasp Edit - Energy Gun power cells +//WS Edit - Energy Gun power cells /datum/design/gun_cell name = "Weapon Power Cell" desc = "A power cell for weapons holds 10 MJ of energy." @@ -407,4 +407,4 @@ build_path = /obj/item/stock_parts/cell/gun/large/empty category = list("Misc","Weapons") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY -//Wasp end +//WS end diff --git a/code/modules/research/machinery/protolathe.dm b/code/modules/research/machinery/protolathe.dm index 0aee4916038..88c4e3d7bed 100644 --- a/code/modules/research/machinery/protolathe.dm +++ b/code/modules/research/machinery/protolathe.dm @@ -16,7 +16,7 @@ "Ammo", "Firing Pins", "Computer Parts", - "Spacepod Designs" // Wasp + "Spacepod Designs" //WS ) production_animation = "protolathe_n" allowed_buildtypes = PROTOLATHE diff --git a/code/modules/research/machinery/techfab.dm b/code/modules/research/machinery/techfab.dm index 6dfc1f00444..daea5385bdd 100644 --- a/code/modules/research/machinery/techfab.dm +++ b/code/modules/research/machinery/techfab.dm @@ -27,7 +27,7 @@ "Research Machinery", "Misc. Machinery", "Computer Parts", - "Spacepod Designs" // Wasp + "Spacepod Designs" //WS ) console_link = FALSE production_animation = "protolathe_n" diff --git a/code/modules/research/nanites/nanite_programs/buffing.dm b/code/modules/research/nanites/nanite_programs/buffing.dm index ee230637a48..7d82324a8de 100644 --- a/code/modules/research/nanites/nanite_programs/buffing.dm +++ b/code/modules/research/nanites/nanite_programs/buffing.dm @@ -36,7 +36,7 @@ /datum/nanite_program/hardening name = "Dermal Hardening" desc = "The nanites form a mesh under the host's skin, protecting them from melee and bullet impacts." - use_rate = 1.0 // Waspstation Edit - Increases nanite armor power use + use_rate = 1.0 //WS Edit - Increases nanite armor power use rogue_types = list(/datum/nanite_program/skin_decay) //TODO on_hit effect that turns skin grey for a moment @@ -45,35 +45,35 @@ . = ..() if(ishuman(host_mob)) var/mob/living/carbon/human/H = host_mob - H.physiology.armor.melee += 30 // Waspstation Edit - nerfs nanite armor - H.physiology.armor.bullet += 30 // Waspstation Edit + H.physiology.armor.melee += 30 //WS Edit - nerfs nanite armor + H.physiology.armor.bullet += 30 //WS Edit /datum/nanite_program/hardening/disable_passive_effect() . = ..() if(ishuman(host_mob)) var/mob/living/carbon/human/H = host_mob - H.physiology.armor.melee -= 30 // Waspstation Edit - nerfs nanite armor - H.physiology.armor.bullet -= 30 // Waspstation Edit + H.physiology.armor.melee -= 30 //WS Edit - nerfs nanite armor + H.physiology.armor.bullet -= 30 //WS Edit /datum/nanite_program/refractive name = "Dermal Refractive Surface" desc = "The nanites form a membrane above the host's skin, reducing the effect of laser and energy impacts." - use_rate = 1.0 // Waspstation Edit - Increases nanite armor power use + use_rate = 1.0 //WS Edit - Increases nanite armor power use rogue_types = list(/datum/nanite_program/skin_decay) /datum/nanite_program/refractive/enable_passive_effect() . = ..() if(ishuman(host_mob)) var/mob/living/carbon/human/H = host_mob - H.physiology.armor.laser += 30 // Waspstation Edit - nerfs nanite armor - H.physiology.armor.energy += 30 // Waspstation Edit + H.physiology.armor.laser += 30 //WS Edit - nerfs nanite armor + H.physiology.armor.energy += 30 //WS Edit /datum/nanite_program/refractive/disable_passive_effect() . = ..() if(ishuman(host_mob)) var/mob/living/carbon/human/H = host_mob - H.physiology.armor.laser -= 30 // Waspstation Edit - nerfs nanite armor - H.physiology.armor.energy -= 30 // Waspstation Edit + H.physiology.armor.laser -= 30 //WS Edit - nerfs nanite armor + H.physiology.armor.energy -= 30 //WS Edit /datum/nanite_program/coagulating name = "Rapid Coagulation" diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index c2c2e951e2d..f04aa14cc12 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -41,7 +41,7 @@ starting_node = TRUE display_name = "Basic Exosuit Equipment" description = "Various tools fit for basic mech units" - design_ids = list("mech_drill", "mech_mscanner", "mech_extinguisher", "mech_cable_layer") //Wasp Edit - Reverted Smartwire + design_ids = list("mech_drill", "mech_mscanner", "mech_extinguisher", "mech_cable_layer") //WS Edit - Reverted Smartwire /datum/techweb_node/basic_tools id = "basic_tools" @@ -49,7 +49,7 @@ display_name = "Basic Tools" description = "Basic mechanical, electronic, surgical and botanical tools." design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", - "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "floor_painter", "decal_painter", "plunger", "spraycan") //WaspStation Edit - Floor Painters + "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "floor_painter", "decal_painter", "plunger", "spraycan") //WS Edit - Floor Painters /datum/techweb_node/basic_medical id = "basic_medical" diff --git a/code/modules/ruins/lavalandruin_code/kinggoat.dm b/code/modules/ruins/lavalandruin_code/kinggoat.dm index 17a7d5bdd1e..22b845e03c9 100644 --- a/code/modules/ruins/lavalandruin_code/kinggoat.dm +++ b/code/modules/ruins/lavalandruin_code/kinggoat.dm @@ -40,7 +40,7 @@ item_state = "c20r" w_class = WEIGHT_CLASS_BULKY ammo_type = list(/obj/item/ammo_casing/energy/goat) - internal_cell = TRUE //prevents you from giving it an OP cell - WaspStation Edit + internal_cell = TRUE //prevents you from giving it an OP cell - WS Edit cell_type = /obj/item/stock_parts/cell clumsy_check = 0 selfcharge = 1 diff --git a/code/modules/ruins/lavalandruin_code/syndicate_base.dm b/code/modules/ruins/lavalandruin_code/syndicate_base.dm index 6eb14f0edcf..5a2373cb86a 100644 --- a/code/modules/ruins/lavalandruin_code/syndicate_base.dm +++ b/code/modules/ruins/lavalandruin_code/syndicate_base.dm @@ -4,7 +4,7 @@ name = "\improper SyndiChem" desc = "A vending machine full of grenades and grenade accessories. Sponsored by DonkCo(tm)." req_access = list(ACCESS_SYNDICATE) - products = list(/obj/item/stack/cable_coil/random = 5, //Wasp Edit - Random added from Smartwire Revert + products = list(/obj/item/stack/cable_coil/random = 5, //WS Edit - Random added from Smartwire Revert /obj/item/assembly/igniter = 20, /obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 5, diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm index 9aa252f99e1..bdc0bfb1d14 100644 --- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm @@ -85,7 +85,7 @@ /obj/structure/lavaland/ash_walker/proc/remake_walker(var/datum/mind/oldmind, var/oldname) var/mob/living/carbon/human/M = new /mob/living/carbon/human(get_step(loc, pick(GLOB.alldirs))) - M.set_species(/datum/species/lizard/ashwalker/kobold) //Wasp Edit - Kobold + M.set_species(/datum/species/lizard/ashwalker/kobold) //WS Edit - Kobold M.real_name = oldname M.underwear = "Nude" M.update_body() @@ -100,7 +100,7 @@ visible_message("One of the eggs swells to an unnatural size and tumbles free. It's ready to hatch!") meat_counter -= ASH_WALKER_SPAWN_THRESHOLD -/obj/structure/lavaland/ash_walker/attackby(obj/item/I, mob/living/user, params) //Wasp Edit - Movable Tendril +/obj/structure/lavaland/ash_walker/attackby(obj/item/I, mob/living/user, params) //WS Edit - Movable Tendril if(user.mind.assigned_role == "Ash Walker") to_chat(user, "You would never think of harming the great Tendril of the Necropolis!") return diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm index 856ce4c7aa9..fa7d222b6ca 100644 --- a/code/modules/shuttle/shuttle_rotate.dm +++ b/code/modules/shuttle/shuttle_rotate.dm @@ -46,7 +46,7 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate /************************************Structure rotate procs************************************/ -//Wasp Edit Begin - Smartwire Revert Do not TG MARG this +//WS Edit Begin - Smartwire Revert Do not TG MARG this /obj/structure/cable/shuttleRotate(rotation, params) params &= ~ROTATE_DIR . = ..() @@ -61,7 +61,7 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate d1 = d2 d2 = temp update_icon() -//Wasp Edit End - Smartwire Revert Do not TG MARG this +//WS Edit End - Smartwire Revert Do not TG MARG this //Fixes dpdir on shuttle rotation /obj/structure/disposalpipe/shuttleRotate(rotation, params) diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm index a531e7cc694..9e70f3dfc44 100644 --- a/code/modules/surgery/healing.dm +++ b/code/modules/surgery/healing.dm @@ -10,7 +10,7 @@ target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) possible_locs = list(BODY_ZONE_CHEST) - // requires_bodypart_type = FALSE // Wasptation - IPC surgery fixes + // requires_bodypart_type = FALSE //WStation - IPC surgery fixes replaced_by = /datum/surgery ignore_clothes = TRUE var/healing_step_type diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm index f24047b1df5..64b9091cfcd 100644 --- a/code/modules/surgery/organ_manipulation.dm +++ b/code/modules/surgery/organ_manipulation.dm @@ -102,7 +102,7 @@ "[user] begins to insert [tool] into [target]'s [parse_zone(target_zone)].", "[user] begins to insert something into [target]'s [parse_zone(target_zone)].") - //WaspStation Begin - IPCs + //WS Begin - IPCs if(istype(tool, /obj/item/mmi))//this whole thing is only used for robotic surgery in organ_mani_robotic.dm :* current_type = "posibrain" @@ -132,17 +132,17 @@ to_chat(user, "[I] seems to have been chewed on, you can't use this!") return -1 - //WaspStation End + //WS End else if(implement_type in implements_extract) current_type = "extract" var/list/organs = target.getorganszone(target_zone) - var/mob/living/simple_animal/borer/B = target.has_brain_worms() //Wasp Begin - Borers + var/mob/living/simple_animal/borer/B = target.has_brain_worms() //WS Begin - Borers if(target.has_brain_worms()) user.visible_message("[user] begins to extract [B] from [target]'s [parse_zone(target_zone)].", "You begin to extract [B] from [target]'s [parse_zone(target_zone)]...") - return TRUE //Wasp End + return TRUE //WS End if(!organs.len) to_chat(user, "There are no removable organs in [target]'s [parse_zone(target_zone)]!") @@ -195,7 +195,7 @@ "[user] inserts something into [target]'s [parse_zone(target_zone)]!") else if(current_type == "extract") - //Wasp begin - borers + //WS begin - borers var/mob/living/simple_animal/borer/B = target.has_brain_worms() if(B && B.victim == target) user.visible_message("[user] successfully extracts [B] from [target]'s [parse_zone(target_zone)]!", @@ -203,7 +203,7 @@ log_combat(user, target, "surgically removed [B] from", addition="INTENT: [uppertext(user.a_intent)]") B.leave_victim() return FALSE - //Wasp end + //WS end if(I && I.owner == target) display_results(user, target, "You successfully extract [I] from [target]'s [parse_zone(target_zone)].", "[user] successfully extracts [I] from [target]'s [parse_zone(target_zone)]!", diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm index d94183723d6..ea3b9d5cefd 100644 --- a/code/modules/surgery/organs/ears.dm +++ b/code/modules/surgery/organs/ears.dm @@ -154,7 +154,7 @@ /obj/item/organ/ears/robot name = "auditory sensors" - icon = 'waspstation/icons/obj/surgery.dmi' + icon = 'whitesands/icons/obj/surgery.dmi' icon_state = "robotic_ears" desc = "A pair of microphones intended to be installed in an IPC head, that grant the ability to hear." zone = "head" diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 145ff3c0c11..44182bd1106 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -29,14 +29,14 @@ var/useable = TRUE var/list/food_reagents = list(/datum/reagent/consumable/nutriment = 5) - //WaspStation Begin - IPCS + //WS Begin - IPCS var/vital = 0 //Was this organ implanted/inserted/etc, if true will not be removed during species change. var/external = FALSE //whether to call Remove() when qdeling the organ. var/remove_on_qdel = TRUE var/synthetic = FALSE // To distinguish between organic and synthetic organs - //WaspStation End + //WS End /obj/item/organ/Initialize() . = ..() diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 7f764538a39..78291debb21 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -118,7 +118,7 @@ ..() /obj/item/organ/stomach/ethereal/proc/charge(datum/source, amount, repairs) - adjust_charge((amount * ETHEREAL_CHARGE_SCALING_MULTIPLIER) / 70 ) // Waspstation Edit -- Ethereal Charge Scaling + adjust_charge((amount * ETHEREAL_CHARGE_SCALING_MULTIPLIER) / 70 ) //WS Edit -- Ethereal Charge Scaling /obj/item/organ/stomach/ethereal/proc/on_electrocute(datum/source, shock_damage, siemens_coeff = 1, flags = NONE) if(flags & SHOCK_ILLUSION) @@ -129,11 +129,11 @@ /obj/item/organ/stomach/ethereal/proc/adjust_charge(amount) crystal_charge = clamp(crystal_charge + amount, ETHEREAL_CHARGE_NONE, ETHEREAL_CHARGE_DANGEROUS) -// WaspStation Begin - IPCs +//WS Begin - IPCs /obj/item/organ/stomach/cell name = "micro-cell" - icon = 'waspstation/icons/obj/surgery.dmi' + icon = 'whitesands/icons/obj/surgery.dmi' icon_state = "microcell" w_class = WEIGHT_CLASS_NORMAL zone = "chest" @@ -151,4 +151,4 @@ owner.nutrition = 250 to_chat(owner, "Alert: EMP Detected. Cycling battery.") -// WaspStation End +//WS End diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 93d53e1cda2..7d6186d73cb 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -57,7 +57,7 @@ modifies_speech = TRUE /obj/item/organ/tongue/lizard/handle_speech(datum/source, list/speech_args) - if(speech_args[SPEECH_LANGUAGE] == /datum/language/draconic) //Wasp edit - lizard tongues don't hiss when speaking Draconic + if(speech_args[SPEECH_LANGUAGE] == /datum/language/draconic) //WS edit - lizard tongues don't hiss when speaking Draconic return var/static/regex/lizard_hiss = new("s+", "g") var/static/regex/lizard_hiSS = new("S+", "g") diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 4b5e05d720b..d03991b9ac3 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -71,16 +71,16 @@ custom_materials = list(/datum/material/iron=10000, /datum/material/glass=6000) flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL | EYE_STAB - force = 10 // Wasp Edit - Makes drill weaker than circular saw + force = 10 //WS Edit - Makes drill weaker than circular saw w_class = WEIGHT_CLASS_NORMAL attack_verb = list("drilled") - sharpness = IS_SHARP // Wasp Edit - Makes the Drill sharp + sharpness = IS_SHARP //WS Edit - Makes the Drill sharp tool_behaviour = TOOL_DRILL toolspeed = 1 -/obj/item/surgicaldrill/Initialize() // Wasp Edit Start - Trying to butcher with a drill is a bad idea +/obj/item/surgicaldrill/Initialize() //WS Edit Start - Trying to butcher with a drill is a bad idea . = ..() - AddComponent(/datum/component/butchering, 300 * toolspeed, 30, 0, 'sound/weapons/circsawhit.ogg') // Only technically works - Wasp Edit End + AddComponent(/datum/component/butchering, 300 * toolspeed, 30, 0, 'sound/weapons/circsawhit.ogg') // Only technically works - WS Edit End /obj/item/surgicaldrill/suicide_act(mob/user) user.visible_message("[user] rams [src] into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!") diff --git a/code/modules/unit_tests/plantgrowth_tests.dm b/code/modules/unit_tests/plantgrowth_tests.dm index 311df3c8884..2dfb92fbf9c 100644 --- a/code/modules/unit_tests/plantgrowth_tests.dm +++ b/code/modules/unit_tests/plantgrowth_tests.dm @@ -9,7 +9,7 @@ states |= icon_states('icons/obj/hydroponics/growing_mushrooms.dmi') states |= icon_states('icons/obj/hydroponics/growing_vegetables.dmi') states |= icon_states('goon/icons/obj/hydroponics.dmi') - states |= icon_states('waspstation/icons/obj/lavaland/newlavalandplants.dmi') // WS edit - New sprite dmi + states |= icon_states('whitesands/icons/obj/lavaland/newlavalandplants.dmi') // WS edit - New sprite dmi var/list/paths = subtypesof(/obj/item/seeds) - /obj/item/seeds - typesof(/obj/item/seeds/sample) - /obj/item/seeds/lavaland for(var/seedpath in paths) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 2ac5918ac96..9ab2c88caa9 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -95,7 +95,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) var/refund_amount = 0 // specified refund amount in case there needs to be a TC penalty for refunds. var/refundable = FALSE var/surplus = 100 // Chance of being included in the surplus crate. - var/surplus_nullcrates // Chance of being included in null crates. null = pull from surplus. WaspStation Edit + var/surplus_nullcrates // Chance of being included in null crates. null = pull from surplus. WS Edit var/cant_discount = FALSE var/limited_stock = -1 //Setting this above zero limits how many times this item can be bought by the same traitor in a round, -1 is unlimited var/list/include_modes = list() // Game modes to allow this item in. @@ -107,12 +107,12 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) var/list/restricted_species //Limits items to a specific species. Hopefully. var/illegal_tech = TRUE // Can this item be deconstructed to unlock certain techweb research nodes? -//WaspStation Begin - NULLcrates +//WS Begin - NULLcrates /datum/uplink_item/New() . = ..() if(isnull(surplus_nullcrates)) surplus_nullcrates = surplus -//WaspStation End +//WS End /datum/uplink_item/proc/get_discount() return pick(4;0.75,2;0.5,1;0.25) @@ -685,7 +685,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/stealthy_weapons/holster name = "Syndicate Holster" desc = "A useful little device that allows for inconspicuous carrying of guns using chameleon technology. It also allows for badass gun-spinning." - item = /obj/item/clothing/accessory/holster/chameleon // WaspStation Edit - Holsters are Accessories + item = /obj/item/clothing/accessory/holster/chameleon //WS Edit - Holsters are Accessories cost = 1 // Ammunition @@ -1385,7 +1385,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/disk/nuclear/fake cost = 1 surplus = 1 - surplus_nullcrates = 0 // WaspStation Edit - NULLcrates + surplus_nullcrates = 0 //WS Edit - NULLcrates /datum/uplink_item/device_tools/frame name = "F.R.A.M.E. PDA Cartridge" @@ -1977,7 +1977,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/toy/cards/deck/syndicate cost = 1 surplus = 40 - surplus_nullcrates = 0 //WaspStation Edit - NULLcrates + surplus_nullcrates = 0 //WS Edit - NULLcrates /datum/uplink_item/badass/syndiecigs name = "Syndicate Smokes" diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 8404371a9ea..5a4065a8144 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -717,7 +717,7 @@ GLOBAL_LIST_EMPTY(vending_products) var/list/data = list( path = replacetext(replacetext("[R.product_path]", "/obj/item/", ""), "/", "-"), name = R.name, - price = R.custom_premium_price || extra_price, // WaspStation Edit - vendor incorrect contraband price fix + price = R.custom_premium_price || extra_price, //WS Edit - vendor incorrect contraband price fix max_amount = R.max_amount, ref = REF(R), premium = TRUE diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index d75cb2c344c..0b39bff8686 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -27,7 +27,7 @@ /obj/item/clothing/head/kitty = 1, /obj/item/clothing/under/dress/skirt = 1, /obj/item/clothing/head/beret = 1, - /obj/item/clothing/head/cowboy = 1, //Waspstation - Yee Haw + /obj/item/clothing/head/cowboy = 1, //WS - Yee Haw /obj/item/clothing/accessory/waistcoat = 1, /obj/item/clothing/under/suit/black = 1, /obj/item/clothing/head/that = 1, diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm index be33a0188f4..a79c28a51cf 100644 --- a/code/modules/vending/cigarette.dm +++ b/code/modules/vending/cigarette.dm @@ -14,7 +14,7 @@ /obj/item/lighter/greyscale = 4, /obj/item/storage/fancy/rollingpapers = 5) contraband = list(/obj/item/clothing/mask/vape = 5, - /obj/item/clothing/mask/vape/cigar = 3) //Waspstation edit - E-Cigars + /obj/item/clothing/mask/vape/cigar = 3) //WS edit - E-Cigars premium = list(/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3, /obj/item/storage/box/gum/nicotine = 2, /obj/item/lighter = 3, diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 5b199a1b47c..d1021b7aa7e 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -76,7 +76,7 @@ /obj/item/clothing/suit/jacket/letterman = 2, /obj/item/clothing/suit/jacket/letterman_red = 2, /obj/item/clothing/glasses/regular = 2, - /obj/item/clothing/glasses/cheapsuns = 2, // Wasp Edit - Cheap sunglasses + /obj/item/clothing/glasses/cheapsuns = 2, //WS Edit - Cheap sunglasses /obj/item/clothing/glasses/regular/jamjar = 1, /obj/item/clothing/glasses/orange = 1, /obj/item/clothing/glasses/red = 1, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 6a7bd1aa4c3..92fbbd9790e 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -53,7 +53,7 @@ /obj/item/storage/backpack/duffelbag/med = 4, /obj/item/storage/backpack/medic = 4, /obj/item/storage/backpack/satchel/med = 4, - /obj/item/clothing/head/beret/med = 4, //Wasp edit - berets + /obj/item/clothing/head/beret/med = 4, //WS edit - berets /obj/item/clothing/suit/hooded/wintercoat/medical = 4, /obj/item/clothing/under/rank/medical/doctor/nurse = 4, /obj/item/clothing/head/nursehat = 4, @@ -88,8 +88,8 @@ /obj/item/clothing/under/rank/engineering/engineer = 3, /obj/item/clothing/under/rank/engineering/engineer/skirt = 3, /obj/item/clothing/under/rank/engineering/engineer/hazard = 3, - /obj/item/clothing/head/beret/eng = 3, // Waspstation edit - Berets - /obj/item/clothing/head/beret/eng/hazard = 3, //Waspstation edit - Berets + /obj/item/clothing/head/beret/eng = 3, //WS edit - Berets + /obj/item/clothing/head/beret/eng/hazard = 3, //WS edit - Berets /obj/item/clothing/suit/hazardvest = 3, /obj/item/clothing/shoes/workboots = 3, /obj/item/clothing/head/hardhat = 3, @@ -111,7 +111,7 @@ /obj/item/storage/backpack/duffelbag/engineering = 2, /obj/item/storage/backpack/satchel/eng = 2, /obj/item/storage/backpack/industrial = 2, - /obj/item/clothing/head/beret/atmos = 3, // Waspstation edit - Berets + /obj/item/clothing/head/beret/atmos = 3, //WS edit - Berets /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3, /obj/item/clothing/under/rank/engineering/atmospheric_technician = 3, /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 3, @@ -156,7 +156,7 @@ /obj/item/clothing/suit/toggle/labcoat = 2, /obj/item/clothing/shoes/sneakers/black = 2, /obj/item/clothing/gloves/fingerless = 2, - /obj/item/clothing/head/beret/sci = 2, // Waspstation edit - Berets + /obj/item/clothing/head/beret/sci = 2, //WS edit - Berets /obj/item/clothing/head/soft/black = 2, /obj/item/clothing/mask/bandana/skull = 2 ) @@ -183,7 +183,7 @@ /obj/item/clothing/suit/toggle/labcoat/science = 3, /obj/item/clothing/shoes/sneakers/white = 3, /obj/item/radio/headset/headset_sci = 3, - /obj/item/clothing/head/beret/sci = 3, // Waspstation edit - Berets + /obj/item/clothing/head/beret/sci = 3, //WS edit - Berets /obj/item/clothing/mask/gas = 3) refill_canister = /obj/item/vending_refill/wardrobe/science_wardrobe payment_department = ACCOUNT_SCI @@ -198,7 +198,7 @@ vend_reply = "Thank you for using the Hydrobe!" products = list(/obj/item/storage/backpack/botany = 2, /obj/item/storage/backpack/satchel/hyd = 2, - /obj/item/clothing/head/beret/service = 2, //Wasp edit - Berets + /obj/item/clothing/head/beret/service = 2, //WS edit - Berets /obj/item/clothing/suit/hooded/wintercoat/hydro = 2, /obj/item/clothing/suit/apron = 2, /obj/item/clothing/suit/apron/overalls = 3, @@ -225,7 +225,7 @@ /obj/item/pen/blue = 2, /obj/item/pen/fourcolor = 1, /obj/item/pen/fountain = 2, - /obj/item/clothing/head/beret/service = 1, //Wasp edit - berets + /obj/item/clothing/head/beret/service = 1, //WS edit - berets /obj/item/clothing/accessory/pocketprotector = 2, /obj/item/clothing/under/rank/civilian/curator/skirt = 2, /obj/item/clothing/under/rank/command/captain/suit/skirt = 2, @@ -247,7 +247,7 @@ vend_reply = "Thank you for using the BarDrobe!" products = list(/obj/item/clothing/head/that = 2, /obj/item/radio/headset/headset_srv = 2, - /obj/item/clothing/head/beret/service = 2, //Wasp edit - Berets + /obj/item/clothing/head/beret/service = 2, //WS edit - Berets /obj/item/clothing/under/suit/sl = 2, /obj/item/clothing/under/rank/civilian/bartender = 2, /obj/item/clothing/under/rank/civilian/bartender/purple = 2, @@ -281,7 +281,7 @@ vend_reply = "Thank you for using the ChefDrobe!" products = list(/obj/item/clothing/under/suit/waiter = 2, /obj/item/radio/headset/headset_srv = 2, - /obj/item/clothing/head/beret/service = 2, //Wasp edit - berets + /obj/item/clothing/head/beret/service = 2, //WS edit - berets /obj/item/clothing/accessory/waistcoat = 2, /obj/item/clothing/suit/apron/chef = 3, /obj/item/clothing/head/soft/mime = 2, @@ -290,7 +290,7 @@ /obj/item/clothing/suit/toggle/chef = 1, /obj/item/clothing/under/rank/civilian/chef = 1, /obj/item/clothing/under/rank/civilian/chef/skirt = 2, - ///obj/item/clothing/under/rank/chef = 3,//WaspStation edit - Better security jumpsuit sprites + ///obj/item/clothing/under/rank/chef = 3,//WS edit - Better security jumpsuit sprites /obj/item/clothing/head/chefhat = 1, /obj/item/clothing/under/rank/civilian/cookjorts = 2, /obj/item/clothing/shoes/cookflops = 2, @@ -309,7 +309,7 @@ vend_reply = "Thank you for using the JaniDrobe!" products = list(/obj/item/clothing/under/rank/civilian/janitor = 2, /obj/item/cartridge/janitor = 2, - /obj/item/clothing/head/beret/service = 2, //Wasp edit - berets + /obj/item/clothing/head/beret/service = 2, //WS edit - berets /obj/item/clothing/under/rank/civilian/janitor/skirt = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, @@ -374,7 +374,7 @@ vend_reply = "Thank you for using the ChapDrobe!" products = list(/obj/item/choice_beacon/holy = 1, /obj/item/storage/backpack/cultpack = 1, - /obj/item/clothing/head/beret/service = 1, //Wasp edit - berets + /obj/item/clothing/head/beret/service = 1, //WS edit - berets /obj/item/clothing/accessory/pocketprotector/cosmetology = 1, /obj/item/clothing/under/rank/civilian/chaplain = 1, /obj/item/clothing/under/rank/civilian/chaplain/skirt = 2, @@ -410,7 +410,7 @@ vend_reply = "Thank you for using the ChemDrobe!" products = list(/obj/item/clothing/under/rank/medical/chemist = 2, /obj/item/clothing/under/rank/medical/chemist/skirt = 2, - /obj/item/clothing/head/beret/chem = 2, // Waspstation edit - Berets + /obj/item/clothing/head/beret/chem = 2, //WS edit - Berets /obj/item/clothing/shoes/sneakers/white = 2, /obj/item/clothing/suit/toggle/labcoat/chemist = 2, /obj/item/storage/backpack/chemistry = 2, @@ -430,7 +430,7 @@ vend_reply = "Thank you for using the GeneDrobe!" products = list(/obj/item/clothing/under/rank/medical/geneticist = 2, /obj/item/clothing/under/rank/medical/geneticist/skirt = 2, - /obj/item/clothing/head/beret/med = 2, //Wasp edit - berets + /obj/item/clothing/head/beret/med = 2, //WS edit - berets /obj/item/clothing/shoes/sneakers/white = 2, /obj/item/clothing/suit/toggle/labcoat/genetics = 2, /obj/item/storage/backpack/genetics = 2, @@ -448,7 +448,7 @@ vend_reply = "Thank you for using the ViroDrobe" products = list(/obj/item/clothing/under/rank/medical/virologist = 2, /obj/item/clothing/under/rank/medical/virologist/skirt = 2, - /obj/item/clothing/head/beret/viro = 2, //Wasp edit - Berets + /obj/item/clothing/head/beret/viro = 2, //WS edit - Berets /obj/item/clothing/shoes/sneakers/white = 2, /obj/item/clothing/suit/toggle/labcoat/virologist = 2, /obj/item/clothing/mask/surgical = 2, diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm index eb09bcce4a6..25097cab76a 100644 --- a/code/modules/vending/youtool.dm +++ b/code/modules/vending/youtool.dm @@ -4,7 +4,7 @@ icon_state = "tool" icon_deny = "tool-deny" light_mask = "tool-light-mask" - products = list(/obj/item/stack/cable_coil/random = 10, //Wasp Edit - Random added from Smartwire Revert + products = list(/obj/item/stack/cable_coil/random = 10, //WS Edit - Random added from Smartwire Revert /obj/item/crowbar = 5, /obj/item/weldingtool = 3, /obj/item/wirecutters = 5, diff --git a/config/config.txt b/config/config.txt index a040f1e0f9a..39e75ebbeec 100644 --- a/config/config.txt +++ b/config/config.txt @@ -263,7 +263,7 @@ CHECK_RANDOMIZER # RULESURL https://wiki.white-sands.space/Rules ## Github address -# GITHUBURL https://github.com/WaspStation/WaspStation-1.0 +# GITHUBURL https://github.com/Whitesands13/Whitesands ## Discord address # DISCORDURL https://discord.gg/BUM8uRc diff --git a/config/game_options.txt b/config/game_options.txt index 6a0938a4611..87943fdeece 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -22,7 +22,7 @@ OOC_DURING_ROUND ## Comment this out if you want to disable emojis EMOJIS -## CHAT MARKUP (Waspstation edit) ### +## CHAT MARKUP (WS edit) ### ## Comment this out if you do not wish to enable chat markup. CHAT_MARKUP diff --git a/goon/README.md b/goon/README.md index afe435f79b1..d865030b586 100644 --- a/goon/README.md +++ b/goon/README.md @@ -1,3 +1,3 @@ -# WaspStation Custom Directory +# White Sands Custom Directory -This directory exists to house custom code changes that can be properly seperated from the codebase and placed here. All files that can be placed here should. The includes.dm file should be used to tick new code files to avoid messing up the dme. Any code changes outside this folder should be made with this comment for one line changes `// waspstation -- ` and `//waspstation begin -- ` & `//waspstation end` for multiline changes. Both of these are *shamelessly* stolen from Austation which stole them from HippieStation. +This directory exists to house custom code changes that can be properly seperated from the codebase and placed here. All files that can be placed here should. The includes.dm file should be used to tick new code files to avoid messing up the dme. Any code changes outside this folder should be made with this comment for one line changes `//WS -- ` and `//WS begin -- ` & `//WS end` for multiline changes. Both of these are *shamelessly* stolen from Austation which stole them from HippieStation. diff --git a/html/changelog.html b/html/changelog.html index 7dd0e891c8b..106bec66ccd 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -25,7 +25,7 @@
White Sands 13 Development Changelog
-

+

Join our Discord! @@ -34,10 +34,10 @@ diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index ba0188150fe..4ab958d280f 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -39385,7 +39385,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: AACs should stop rapidly breaking the topic limits. 2020-10-04: MarkSuckerberg: - - code_imp: Documentation of most things now available here. + - code_imp: Documentation of most things now available here. - bugfix: You can no longer duplicate bluespace bodybags. Shadowtail117: - bugfix: Vape clouds (from medium/high-voltage vapes) no longer create reagents @@ -39523,7 +39523,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. triplezeta: - balance: specialist bags are normal sized again 2020-11-13: - Multiple Authors: + Multiple Authors: - rscadd: Lights are a lot less laggy due to being overlays. - rscadd: Some lights are now directional. - rscadd: Runechat now shows emotes. diff --git a/html/templates/header.html b/html/templates/header.html index e13828099f1..5fbdcbc61d3 100644 --- a/html/templates/header.html +++ b/html/templates/header.html @@ -25,7 +25,7 @@ @@ -34,10 +34,10 @@
- Current Project Maintainers
 - Recent GitHub contributors
 + Current Project Maintainers
 + Recent GitHub contributors
 Thanks to: /tg/ Station 13, Beestation 13, Oraclestation 13, Baystation 12, /vg/station, NTstation, CDK Station devs, FacepunchStation, GoonStation devs, the original Space Station 13 developers, and the countless others who have contributed to the game, issue tracker or wiki. -
Have a bug to report? Visit our Issue Tracker.
 +
Have a bug to report? Visit our Issue Tracker.
 Please search first to ensure that the bug has not already been reported.
White Sands 13 Development Changelog
-

+

Join our Discord!
diff --git a/tgstation.dme b/tgstation.dme index 9aa91c9956b..184840454d4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -124,21 +124,21 @@ #include "code\__DEFINES\dcs\flags.dm" #include "code\__DEFINES\dcs\helpers.dm" #include "code\__DEFINES\dcs\signals.dm" -#include "code\__DEFINES\wasp_after_defines\icon_smoothing.dm" -#include "code\__DEFINES\~wasp_defines\_defines.dm" -#include "code\__DEFINES\~wasp_defines\atmospherics.dm" -#include "code\__DEFINES\~wasp_defines\bone_flags.dm" -#include "code\__DEFINES\~wasp_defines\jobs.dm" -#include "code\__DEFINES\~wasp_defines\machines.dm" -#include "code\__DEFINES\~wasp_defines\maths.dm" -#include "code\__DEFINES\~wasp_defines\metacoin.dm" -#include "code\__DEFINES\~wasp_defines\movespeed_modification.dm" -#include "code\__DEFINES\~wasp_defines\obj_flags.dm" -#include "code\__DEFINES\~wasp_defines\overmap.dm" -#include "code\__DEFINES\~wasp_defines\shuttles.dm" -#include "code\__DEFINES\~wasp_defines\spacepods.dm" -#include "code\__DEFINES\~wasp_defines\status_effects.dm" -#include "code\__DEFINES\~wasp_defines\traits.dm" +#include "code\__DEFINES\whitesands_after_defines\icon_smoothing.dm" +#include "code\__DEFINES\~whitesands_defines\_defines.dm" +#include "code\__DEFINES\~whitesands_defines\atmospherics.dm" +#include "code\__DEFINES\~whitesands_defines\bone_flags.dm" +#include "code\__DEFINES\~whitesands_defines\jobs.dm" +#include "code\__DEFINES\~whitesands_defines\machines.dm" +#include "code\__DEFINES\~whitesands_defines\maths.dm" +#include "code\__DEFINES\~whitesands_defines\metacoin.dm" +#include "code\__DEFINES\~whitesands_defines\movespeed_modification.dm" +#include "code\__DEFINES\~whitesands_defines\obj_flags.dm" +#include "code\__DEFINES\~whitesands_defines\overmap.dm" +#include "code\__DEFINES\~whitesands_defines\shuttles.dm" +#include "code\__DEFINES\~whitesands_defines\spacepods.dm" +#include "code\__DEFINES\~whitesands_defines\status_effects.dm" +#include "code\__DEFINES\~whitesands_defines\traits.dm" #include "code\__HELPERS\_lists.dm" #include "code\__HELPERS\_logging.dm" #include "code\__HELPERS\_string_lists.dm" @@ -3195,295 +3195,295 @@ #include "interface\menu.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" -#include "waspstation\code\__DEFINES\DCM.dm" -#include "waspstation\code\__DEFINES\DNA.dm" -#include "waspstation\code\__DEFINES\keybinding.dm" -#include "waspstation\code\__DEFINES\language.dm" -#include "waspstation\code\__HELPERS\text.dm" -#include "waspstation\code\_globalvars\game_modes.dm" -#include "waspstation\code\_globalvars\lists\mapping.dm" -#include "waspstation\code\_onclick\adjacent.dm" -#include "waspstation\code\_onclick\hud\ghost.dm" -#include "waspstation\code\controllers\configuration\entries\game_options.dm" -#include "waspstation\code\controllers\configuration\entries\general.dm" -#include "waspstation\code\controllers\subsystem\autotransfer.dm" -#include "waspstation\code\controllers\subsystem\job.dm" -#include "waspstation\code\controllers\subsystem\jukeboxes.dm" -#include "waspstation\code\controllers\subsystem\minimaps.dm" -#include "waspstation\code\controllers\subsystem\overmap.dm" -#include "waspstation\code\controllers\subsystem\textobfs.dm" -#include "waspstation\code\datums\ai_laws.dm" -#include "waspstation\code\datums\dcmnet.dm" -#include "waspstation\code\datums\ert.dm" -#include "waspstation\code\datums\quixotejump.dm" -#include "waspstation\code\datums\shuttles.dm" -#include "waspstation\code\datums\world_topic.dm" -#include "waspstation\code\datums\achievements\scores.dm" -#include "waspstation\code\datums\brain_damage\brain_trauma.dm" -#include "waspstation\code\datums\brain_damage\phobia.dm" -#include "waspstation\code\datums\components\outline.dm" -#include "waspstation\code\datums\components\taped.dm" -#include "waspstation\code\datums\components\crafting\recipes.dm" -#include "waspstation\code\datums\components\storage\concrete\pockets.dm" -#include "waspstation\code\datums\diseases\coronavirus.dm" -#include "waspstation\code\datums\diseases\legionvirus.dm" -#include "waspstation\code\datums\keybinding\movement.dm" -#include "waspstation\code\datums\mood_events\drug_events.dm" -#include "waspstation\code\datums\mood_events\generic_negative_events.dm" -#include "waspstation\code\datums\mutations\dorfism.dm" -#include "waspstation\code\datums\ruins\jungle.dm" -#include "waspstation\code\datums\ruins\space.dm" -#include "waspstation\code\datums\ruins\station.dm" -#include "waspstation\code\datums\ruins\whitesands.dm" -#include "waspstation\code\datums\status_effects\debuffs.dm" -#include "waspstation\code\datums\traits\_quirk.dm" -#include "waspstation\code\game\area\Space_Station_13_areas.dm" -#include "waspstation\code\game\area\areas\shuttles.dm" -#include "waspstation\code\game\area\areas\ruins\space.dm" -#include "waspstation\code\game\gamemodes\objectives.dm" -#include "waspstation\code\game\gamemodes\changeling\changeling.dm" -#include "waspstation\code\game\machinery\cloning.dm" -#include "waspstation\code\game\machinery\cryopod.dm" -#include "waspstation\code\game\machinery\exp_cloner.dm" -#include "waspstation\code\game\machinery\Sleeper.dm" -#include "waspstation\code\game\machinery\suit_storage_unit.dm" -#include "waspstation\code\game\machinery\computer\cloning.dm" -#include "waspstation\code\game\machinery\doors\poddoor.dm" -#include "waspstation\code\game\machinery\doors\spacepod.dm" -#include "waspstation\code\game\machinery\porta_turret\portable_turret.dm" -#include "waspstation\code\game\machinery\shuttle\custom_shuttle.dm" -#include "waspstation\code\game\machinery\shuttle\shuttle_engine.dm" -#include "waspstation\code\game\machinery\shuttle\shuttle_engine_types.dm" -#include "waspstation\code\game\machinery\shuttle\shuttle_heater.dm" -#include "waspstation\code\game\objects\effects\countdown.dm" -#include "waspstation\code\game\objects\effects\landmarks.dm" -#include "waspstation\code\game\objects\effects\spiderperson_web.dm" -#include "waspstation\code\game\objects\effects\decals\cleanable\food.dm" -#include "waspstation\code\game\objects\effects\decals\cleanable\misc.dm" -#include "waspstation\code\game\objects\effects\decals\turfdecal\markings.dm" -#include "waspstation\code\game\objects\effects\decals\turfdecal\prefabdecals.dm" -#include "waspstation\code\game\objects\effects\spawners\lootdrop.dm" -#include "waspstation\code\game\objects\effects\spawners\structure.dm" -#include "waspstation\code\game\objects\effects\temporary_visuals\projectiles\impact.dm" -#include "waspstation\code\game\objects\effects\temporary_visuals\projectiles\muzzle.dm" -#include "waspstation\code\game\objects\effects\temporary_visuals\projectiles\tracer.dm" -#include "waspstation\code\game\objects\items\airlock_painter.dm" -#include "waspstation\code\game\objects\items\cards_ids.dm" -#include "waspstation\code\game\objects\items\cosmetics.dm" -#include "waspstation\code\game\objects\items\desk_flags.dm" -#include "waspstation\code\game\objects\items\ecigar.dm" -#include "waspstation\code\game\objects\items\manuals.dm" -#include "waspstation\code\game\objects\items\pinpointer.dm" -#include "waspstation\code\game\objects\items\shuttle_creator.dm" -#include "waspstation\code\game\objects\items\circuitboards\computer_circuitboards.dm" -#include "waspstation\code\game\objects\items\circuitboards\deepcore.dm" -#include "waspstation\code\game\objects\items\circuitboards\machine_circuitboards.dm" -#include "waspstation\code\game\objects\items\devices\crowbar.dm" -#include "waspstation\code\game\objects\items\devices\multitool.dm" -#include "waspstation\code\game\objects\items\devices\PDA_types.dm" -#include "waspstation\code\game\objects\items\devices\screwdriver.dm" -#include "waspstation\code\game\objects\items\devices\weldingtool.dm" -#include "waspstation\code\game\objects\items\devices\wirecutters.dm" -#include "waspstation\code\game\objects\items\devices\wrench.dm" -#include "waspstation\code\game\objects\items\devices\radio\encryptionkey.dm" -#include "waspstation\code\game\objects\items\devices\radio\headset.dm" -#include "waspstation\code\game\objects\items\devices\radio\intercom.dm" -#include "waspstation\code\game\objects\items\melee\energy.dm" -#include "waspstation\code\game\objects\items\melee\misc.dm" -#include "waspstation\code\game\objects\items\stacks\medical.dm" -#include "waspstation\code\game\objects\items\stacks\tape.dm" -#include "waspstation\code\game\objects\items\storage\backpack.dm" -#include "waspstation\code\game\objects\items\storage\bags.dm" -#include "waspstation\code\game\objects\items\storage\boxes.dm" -#include "waspstation\code\game\objects\items\storage\fancy.dm" -#include "waspstation\code\game\objects\items\storage\firstaid.dm" -#include "waspstation\code\game\objects\structures\curtains.dm" -#include "waspstation\code\game\objects\structures\crates_lockers\closets\secure\security.dm" -#include "waspstation\code\game\turf\_whitesands.dm" -#include "waspstation\code\game\turf\closed\wall\whitesands.dm" -#include "waspstation\code\game\turf\open\floor\whitesands.dm" -#include "waspstation\code\game\turfs\closed\_closed.dm" -#include "waspstation\code\game\turfs\open\floor\hull.dm" -#include "waspstation\code\game\turfs\open\floor\medians.dm" -#include "waspstation\code\modules\admin\topic.dm" -#include "waspstation\code\modules\admin\verbs\mapping.dm" -#include "waspstation\code\modules\admin\verbs\mentors_edit.dm" -#include "waspstation\code\modules\admin\verbs\modify_antag_tokens.dm" -#include "waspstation\code\modules\antagonists\_common\antag_spawner.dm" -#include "waspstation\code\modules\antagonists\borer\borer.dm" -#include "waspstation\code\modules\antagonists\borer\borer_chems.dm" -#include "waspstation\code\modules\antagonists\borer\borer_html.dm" -#include "waspstation\code\modules\antagonists\borer\borer_say.dm" -#include "waspstation\code\modules\antagonists\borer\syndiborer.dm" -#include "waspstation\code\modules\antagonists\ert\ert.dm" -#include "waspstation\code\modules\atmospherics\gasmixtures\immutable_mixtures.dm" -#include "waspstation\code\modules\atmospherics\machinery\components\binary_devices\relief_valve.dm" -#include "waspstation\code\modules\atmospherics\machinery\components\unary_devices\relief_valve.dm" -#include "waspstation\code\modules\atmospherics\machinery\portable\canister.dm" -#include "waspstation\code\modules\awaymissions\corpse.dm" -#include "waspstation\code\modules\awaymissions\mission_code\speedway.dm" -#include "waspstation\code\modules\buildmode\submodes\map_export.dm" -#include "waspstation\code\modules\cargo\packs.dm" -#include "waspstation\code\modules\cargo\blackmarket\blackmarket_items\weapons.dm" -#include "waspstation\code\modules\cargo\bounties\engineering.dm" -#include "waspstation\code\modules\cargo\exports\large_objects.dm" -#include "waspstation\code\modules\client\antag_tokens.dm" -#include "waspstation\code\modules\client\loadout\loadout.dm" -#include "waspstation\code\modules\client\loadout\loadout_accessories.dm" -#include "waspstation\code\modules\client\loadout\loadout_eyewear.dm" -#include "waspstation\code\modules\client\loadout\loadout_general.dm" -#include "waspstation\code\modules\client\loadout\loadout_hat.dm" -#include "waspstation\code\modules\client\loadout\loadout_ooc.dm" -#include "waspstation\code\modules\client\loadout\loadout_suit.dm" -#include "waspstation\code\modules\client\loadout\loadout_uniform.dm" -#include "waspstation\code\modules\client\verbs\minimap.dm" -#include "waspstation\code\modules\clothing\glasses\_glasses.dm" -#include "waspstation\code\modules\clothing\glasses\hud.dm" -#include "waspstation\code\modules\clothing\gloves\tapegloves.dm" -#include "waspstation\code\modules\clothing\head\berets.dm" -#include "waspstation\code\modules\clothing\head\cargo.dm" -#include "waspstation\code\modules\clothing\head\cowboy.dm" -#include "waspstation\code\modules\clothing\head\helmet.dm" -#include "waspstation\code\modules\clothing\head\misc_special.dm" -#include "waspstation\code\modules\clothing\neck\ties.dm" -#include "waspstation\code\modules\clothing\outfits\SolGov.dm" -#include "waspstation\code\modules\clothing\shoes\_shoes.dm" -#include "waspstation\code\modules\clothing\shoes\magboots.dm" -#include "waspstation\code\modules\clothing\spacesuits\hardsuits.dm" -#include "waspstation\code\modules\clothing\spacesuits\syndi.dm" -#include "waspstation\code\modules\clothing\suits\armor.dm" -#include "waspstation\code\modules\clothing\suits\coats.dm" -#include "waspstation\code\modules\clothing\suits\jobs.dm" -#include "waspstation\code\modules\clothing\suits\labcoat.dm" -#include "waspstation\code\modules\clothing\under\accessories.dm" -#include "waspstation\code\modules\clothing\under\SolGov.dm" -#include "waspstation\code\modules\clothing\under\syndicate.dm" -#include "waspstation\code\modules\clothing\under\jobs\cargo.dm" -#include "waspstation\code\modules\clothing\under\jobs\centcom.dm" -#include "waspstation\code\modules\clothing\under\jobs\command.dm" -#include "waspstation\code\modules\clothing\under\jobs\engineering.dm" -#include "waspstation\code\modules\clothing\under\jobs\medical.dm" -#include "waspstation\code\modules\clothing\under\jobs\rnd.dm" -#include "waspstation\code\modules\clothing\under\jobs\security.dm" -#include "waspstation\code\modules\clothing\under\jobs\service.dm" -#include "waspstation\code\modules\events\borers.dm" -#include "waspstation\code\modules\food_and_drinks\food\snacks_meat.dm" -#include "waspstation\code\modules\food_and_drinks\food\snacks_pastry.dm" -#include "waspstation\code\modules\food_and_drinks\food\snacks_salad.dm" -#include "waspstation\code\modules\food_and_drinks\food\snacks_soup.dm" -#include "waspstation\code\modules\food_and_drinks\kitchen_machinery\catgrill.dm" -#include "waspstation\code\modules\food_and_drinks\kitchen_machinery\smartfridge.dm" -#include "waspstation\code\modules\food_and_drinks\recipes\drinks_recipes.dm" -#include "waspstation\code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm" -#include "waspstation\code\modules\food_and_drinks\recipes\tablecraft\recipes_pastry.dm" -#include "waspstation\code\modules\food_and_drinks\recipes\tablecraft\recipes_salad.dm" -#include "waspstation\code\modules\food_and_drinks\recipes\tablecraft\recipes_soup.dm" -#include "waspstation\code\modules\jobs\job.dm" -#include "waspstation\code\modules\jobs\job_types\_alt_titles.dm" -#include "waspstation\code\modules\jobs\job_types\brigphys.dm" -#include "waspstation\code\modules\jobs\job_types\solgov_rep.dm" -#include "waspstation\code\modules\language\dwarven.dm" -#include "waspstation\code\modules\language\language_holder.dm" -#include "waspstation\code\modules\language\mouse.dm" -#include "waspstation\code\modules\language\spider.dm" -#include "waspstation\code\modules\library\lib_items.dm" -#include "waspstation\code\modules\mapping\map_template.dm" -#include "waspstation\code\modules\mapping\minimaps.dm" -#include "waspstation\code\modules\mapping\writer.dm" -#include "waspstation\code\modules\metacoin\metacoin.dm" -#include "waspstation\code\modules\mining\ores_coins.dm" -#include "waspstation\code\modules\mining\deepcore\_deepcore.dm" -#include "waspstation\code\modules\mining\deepcore\drill.dm" -#include "waspstation\code\modules\mining\deepcore\equipment.dm" -#include "waspstation\code\modules\mining\deepcore\hopper.dm" -#include "waspstation\code\modules\mining\deepcore\hub.dm" -#include "waspstation\code\modules\mining\deepcore\ore_vein.dm" -#include "waspstation\code\modules\mining\equipment\explorer_gear.dm" -#include "waspstation\code\modules\mining\lavaland\ash_flora.dm" -#include "waspstation\code\modules\mob\emote.dm" -#include "waspstation\code\modules\mob\say_vr.dm" -#include "waspstation\code\modules\mob\living\brain\posibrain.dm" -#include "waspstation\code\modules\mob\living\carbon\human\human.dm" -#include "waspstation\code\modules\mob\living\carbon\human\life.dm" -#include "waspstation\code\modules\mob\living\carbon\human\species_types\dwarves.dm" -#include "waspstation\code\modules\mob\living\carbon\human\species_types\spider.dm" -#include "waspstation\code\modules\mob\living\carbon\human\species_types\squidpeople.dm" -#include "waspstation\code\modules\mob\living\silicon\ai\ai.dm" -#include "waspstation\code\modules\mob\living\silicon\robot\update_icons.dm" -#include "waspstation\code\modules\mob\living\simple_animal\corpse.dm" -#include "waspstation\code\modules\mob\living\simple_animal\friendly\gator.dm" -#include "waspstation\code\modules\mob\living\simple_animal\friendly\snake.dm" -#include "waspstation\code\modules\mob\living\simple_animal\hostile\hostile.dm" -#include "waspstation\code\modules\mob\living\simple_animal\hostile\zombie.dm" -#include "waspstation\code\modules\mob\living\simple_animal\hostile\mining_mobs\basilisk.dm" -#include "waspstation\code\modules\mob\living\simple_animal\hostile\mining_mobs\goliath.dm" -#include "waspstation\code\modules\mob\living\simple_animal\hostile\whitesands\survivors.dm" -#include "waspstation\code\modules\movespeed\modifiers\mobs.dm" -#include "waspstation\code\modules\movespeed\modifiers\reagents.dm" -#include "waspstation\code\modules\overmap\_overmap.dm" -#include "waspstation\code\modules\overmap\events.dm" -#include "waspstation\code\modules\overmap\helm.dm" -#include "waspstation\code\modules\overmap\nav.dm" -#include "waspstation\code\modules\overmap\ships\_ships.dm" -#include "waspstation\code\modules\overmap\ships\simulated.dm" -#include "waspstation\code\modules\paperwork\pen.dm" -#include "waspstation\code\modules\power\cell.dm" -#include "waspstation\code\modules\power\antimatter\containment_jar.dm" -#include "waspstation\code\modules\power\antimatter\control.dm" -#include "waspstation\code\modules\power\antimatter\shielding.dm" -#include "waspstation\code\modules\projectiles\ammunition\ballistic\rifle.dm" -#include "waspstation\code\modules\projectiles\ammunition\ballistic\smg.dm" -#include "waspstation\code\modules\projectiles\boxes_magazines\containers.dm" -#include "waspstation\code\modules\projectiles\boxes_magazines\pistol.dm" -#include "waspstation\code\modules\projectiles\boxes_magazines\external\rifle.dm" -#include "waspstation\code\modules\projectiles\boxes_magazines\external\smg.dm" -#include "waspstation\code\modules\projectiles\boxes_magazines\internal\_derringer.dm" -#include "waspstation\code\modules\projectiles\boxes_magazines\internal\rifle.dm" -#include "waspstation\code\modules\projectiles\boxes_magazines\internal\shotgun.dm" -#include "waspstation\code\modules\projectiles\guns\ballistic\automatic.dm" -#include "waspstation\code\modules\projectiles\guns\ballistic\derringer.dm" -#include "waspstation\code\modules\projectiles\guns\ballistic\rifle.dm" -#include "waspstation\code\modules\projectiles\guns\ballistic\shotgun.dm" -#include "waspstation\code\modules\projectiles\guns\energy\energy_gun.dm" -#include "waspstation\code\modules\projectiles\guns\energy\laser.dm" -#include "waspstation\code\modules\projectiles\guns\energy\pulse.dm" -#include "waspstation\code\modules\projectiles\projectile\beams.dm" -#include "waspstation\code\modules\projectiles\projectile\bullets\rifle.dm" -#include "waspstation\code\modules\projectiles\projectile\bullets\smg.dm" -#include "waspstation\code\modules\reagents\chemistry\reagents\alcohol_reagents.dm" -#include "waspstation\code\modules\reagents\chemistry\reagents\food_reagents.dm" -#include "waspstation\code\modules\reagents\chemistry\reagents\medicine_reagents.dm" -#include "waspstation\code\modules\reagents\chemistry\reagents\other_reagents.dm" -#include "waspstation\code\modules\reagents\chemistry\reagents\toxin_reagents.dm" -#include "waspstation\code\modules\reagents\chemistry\recipes\medicine.dm" -#include "waspstation\code\modules\reagents\chemistry\recipes\others.dm" -#include "waspstation\code\modules\reagents\chemistry\recipes\pyrotechnics.dm" -#include "waspstation\code\modules\reagents\reagent_containers\bottle.dm" -#include "waspstation\code\modules\reagents\reagent_containers\hypospray.dm" -#include "waspstation\code\modules\reagents\reagent_containers\hypovial.dm" -#include "waspstation\code\modules\reagents\reagent_containers\pill.dm" -#include "waspstation\code\modules\reagents\reagent_containers\syringes.dm" -#include "waspstation\code\modules\research\designs\autolathe_designs.dm" -#include "waspstation\code\modules\research\designs\comp_board_designs.dm" -#include "waspstation\code\modules\research\designs\machine_designs.dm" -#include "waspstation\code\modules\research\designs\mechfabricator_designs.dm" -#include "waspstation\code\modules\research\designs\spacepod_designs.dm" -#include "waspstation\code\modules\research\designs\tool_designs.dm" -#include "waspstation\code\modules\research\techweb\all_nodes.dm" -#include "waspstation\code\modules\shuttle\emergency.dm" -#include "waspstation\code\modules\shuttle\shuttle.dm" -#include "waspstation\code\modules\spacepods\construction.dm" -#include "waspstation\code\modules\spacepods\equipment.dm" -#include "waspstation\code\modules\spacepods\parts.dm" -#include "waspstation\code\modules\spacepods\physics.dm" -#include "waspstation\code\modules\spacepods\prebuilt.dm" -#include "waspstation\code\modules\spacepods\spacepod.dm" -#include "waspstation\code\modules\surgery\ipc_revive.dm" -#include "waspstation\code\modules\surgery\mechanical.dm" -#include "waspstation\code\modules\surgery\organs\eyes.dm" -#include "waspstation\code\modules\surgery\organs\liver.dm" -#include "waspstation\code\modules\surgery\organs\moth_wings.dm" -#include "waspstation\code\modules\surgery\organs\tongue.dm" -#include "waspstation\code\modules\uplink\uplink_items.dm" -#include "waspstation\code\modules\vehicles\pimpin_ride.dm" +#include "whitesands\code\__DEFINES\DCM.dm" +#include "whitesands\code\__DEFINES\DNA.dm" +#include "whitesands\code\__DEFINES\keybinding.dm" +#include "whitesands\code\__DEFINES\language.dm" +#include "whitesands\code\__HELPERS\text.dm" +#include "whitesands\code\_globalvars\game_modes.dm" +#include "whitesands\code\_globalvars\lists\mapping.dm" +#include "whitesands\code\_onclick\adjacent.dm" +#include "whitesands\code\_onclick\hud\ghost.dm" +#include "whitesands\code\controllers\configuration\entries\game_options.dm" +#include "whitesands\code\controllers\configuration\entries\general.dm" +#include "whitesands\code\controllers\subsystem\autotransfer.dm" +#include "whitesands\code\controllers\subsystem\job.dm" +#include "whitesands\code\controllers\subsystem\jukeboxes.dm" +#include "whitesands\code\controllers\subsystem\minimaps.dm" +#include "whitesands\code\controllers\subsystem\overmap.dm" +#include "whitesands\code\controllers\subsystem\textobfs.dm" +#include "whitesands\code\datums\ai_laws.dm" +#include "whitesands\code\datums\dcmnet.dm" +#include "whitesands\code\datums\ert.dm" +#include "whitesands\code\datums\quixotejump.dm" +#include "whitesands\code\datums\shuttles.dm" +#include "whitesands\code\datums\world_topic.dm" +#include "whitesands\code\datums\achievements\scores.dm" +#include "whitesands\code\datums\brain_damage\brain_trauma.dm" +#include "whitesands\code\datums\brain_damage\phobia.dm" +#include "whitesands\code\datums\components\outline.dm" +#include "whitesands\code\datums\components\taped.dm" +#include "whitesands\code\datums\components\crafting\recipes.dm" +#include "whitesands\code\datums\components\storage\concrete\pockets.dm" +#include "whitesands\code\datums\diseases\coronavirus.dm" +#include "whitesands\code\datums\diseases\legionvirus.dm" +#include "whitesands\code\datums\keybinding\movement.dm" +#include "whitesands\code\datums\mood_events\drug_events.dm" +#include "whitesands\code\datums\mood_events\generic_negative_events.dm" +#include "whitesands\code\datums\mutations\dorfism.dm" +#include "whitesands\code\datums\ruins\jungle.dm" +#include "whitesands\code\datums\ruins\space.dm" +#include "whitesands\code\datums\ruins\station.dm" +#include "whitesands\code\datums\ruins\whitesands.dm" +#include "whitesands\code\datums\status_effects\debuffs.dm" +#include "whitesands\code\datums\traits\_quirk.dm" +#include "whitesands\code\game\area\Space_Station_13_areas.dm" +#include "whitesands\code\game\area\areas\shuttles.dm" +#include "whitesands\code\game\area\areas\ruins\space.dm" +#include "whitesands\code\game\gamemodes\objectives.dm" +#include "whitesands\code\game\gamemodes\changeling\changeling.dm" +#include "whitesands\code\game\machinery\cloning.dm" +#include "whitesands\code\game\machinery\cryopod.dm" +#include "whitesands\code\game\machinery\exp_cloner.dm" +#include "whitesands\code\game\machinery\Sleeper.dm" +#include "whitesands\code\game\machinery\suit_storage_unit.dm" +#include "whitesands\code\game\machinery\computer\cloning.dm" +#include "whitesands\code\game\machinery\doors\poddoor.dm" +#include "whitesands\code\game\machinery\doors\spacepod.dm" +#include "whitesands\code\game\machinery\porta_turret\portable_turret.dm" +#include "whitesands\code\game\machinery\shuttle\custom_shuttle.dm" +#include "whitesands\code\game\machinery\shuttle\shuttle_engine.dm" +#include "whitesands\code\game\machinery\shuttle\shuttle_engine_types.dm" +#include "whitesands\code\game\machinery\shuttle\shuttle_heater.dm" +#include "whitesands\code\game\objects\effects\countdown.dm" +#include "whitesands\code\game\objects\effects\landmarks.dm" +#include "whitesands\code\game\objects\effects\spiderperson_web.dm" +#include "whitesands\code\game\objects\effects\decals\cleanable\food.dm" +#include "whitesands\code\game\objects\effects\decals\cleanable\misc.dm" +#include "whitesands\code\game\objects\effects\decals\turfdecal\markings.dm" +#include "whitesands\code\game\objects\effects\decals\turfdecal\prefabdecals.dm" +#include "whitesands\code\game\objects\effects\spawners\lootdrop.dm" +#include "whitesands\code\game\objects\effects\spawners\structure.dm" +#include "whitesands\code\game\objects\effects\temporary_visuals\projectiles\impact.dm" +#include "whitesands\code\game\objects\effects\temporary_visuals\projectiles\muzzle.dm" +#include "whitesands\code\game\objects\effects\temporary_visuals\projectiles\tracer.dm" +#include "whitesands\code\game\objects\items\airlock_painter.dm" +#include "whitesands\code\game\objects\items\cards_ids.dm" +#include "whitesands\code\game\objects\items\cosmetics.dm" +#include "whitesands\code\game\objects\items\desk_flags.dm" +#include "whitesands\code\game\objects\items\ecigar.dm" +#include "whitesands\code\game\objects\items\manuals.dm" +#include "whitesands\code\game\objects\items\pinpointer.dm" +#include "whitesands\code\game\objects\items\shuttle_creator.dm" +#include "whitesands\code\game\objects\items\circuitboards\computer_circuitboards.dm" +#include "whitesands\code\game\objects\items\circuitboards\deepcore.dm" +#include "whitesands\code\game\objects\items\circuitboards\machine_circuitboards.dm" +#include "whitesands\code\game\objects\items\devices\crowbar.dm" +#include "whitesands\code\game\objects\items\devices\multitool.dm" +#include "whitesands\code\game\objects\items\devices\PDA_types.dm" +#include "whitesands\code\game\objects\items\devices\screwdriver.dm" +#include "whitesands\code\game\objects\items\devices\weldingtool.dm" +#include "whitesands\code\game\objects\items\devices\wirecutters.dm" +#include "whitesands\code\game\objects\items\devices\wrench.dm" +#include "whitesands\code\game\objects\items\devices\radio\encryptionkey.dm" +#include "whitesands\code\game\objects\items\devices\radio\headset.dm" +#include "whitesands\code\game\objects\items\devices\radio\intercom.dm" +#include "whitesands\code\game\objects\items\melee\energy.dm" +#include "whitesands\code\game\objects\items\melee\misc.dm" +#include "whitesands\code\game\objects\items\stacks\medical.dm" +#include "whitesands\code\game\objects\items\stacks\tape.dm" +#include "whitesands\code\game\objects\items\storage\backpack.dm" +#include "whitesands\code\game\objects\items\storage\bags.dm" +#include "whitesands\code\game\objects\items\storage\boxes.dm" +#include "whitesands\code\game\objects\items\storage\fancy.dm" +#include "whitesands\code\game\objects\items\storage\firstaid.dm" +#include "whitesands\code\game\objects\structures\curtains.dm" +#include "whitesands\code\game\objects\structures\crates_lockers\closets\secure\security.dm" +#include "whitesands\code\game\turf\_whitesands.dm" +#include "whitesands\code\game\turf\closed\wall\whitesands.dm" +#include "whitesands\code\game\turf\open\floor\whitesands.dm" +#include "whitesands\code\game\turfs\closed\_closed.dm" +#include "whitesands\code\game\turfs\open\floor\hull.dm" +#include "whitesands\code\game\turfs\open\floor\medians.dm" +#include "whitesands\code\modules\admin\topic.dm" +#include "whitesands\code\modules\admin\verbs\mapping.dm" +#include "whitesands\code\modules\admin\verbs\mentors_edit.dm" +#include "whitesands\code\modules\admin\verbs\modify_antag_tokens.dm" +#include "whitesands\code\modules\antagonists\_common\antag_spawner.dm" +#include "whitesands\code\modules\antagonists\borer\borer.dm" +#include "whitesands\code\modules\antagonists\borer\borer_chems.dm" +#include "whitesands\code\modules\antagonists\borer\borer_html.dm" +#include "whitesands\code\modules\antagonists\borer\borer_say.dm" +#include "whitesands\code\modules\antagonists\borer\syndiborer.dm" +#include "whitesands\code\modules\antagonists\ert\ert.dm" +#include "whitesands\code\modules\atmospherics\gasmixtures\immutable_mixtures.dm" +#include "whitesands\code\modules\atmospherics\machinery\components\binary_devices\relief_valve.dm" +#include "whitesands\code\modules\atmospherics\machinery\components\unary_devices\relief_valve.dm" +#include "whitesands\code\modules\atmospherics\machinery\portable\canister.dm" +#include "whitesands\code\modules\awaymissions\corpse.dm" +#include "whitesands\code\modules\awaymissions\mission_code\speedway.dm" +#include "whitesands\code\modules\buildmode\submodes\map_export.dm" +#include "whitesands\code\modules\cargo\packs.dm" +#include "whitesands\code\modules\cargo\blackmarket\blackmarket_items\weapons.dm" +#include "whitesands\code\modules\cargo\bounties\engineering.dm" +#include "whitesands\code\modules\cargo\exports\large_objects.dm" +#include "whitesands\code\modules\client\antag_tokens.dm" +#include "whitesands\code\modules\client\loadout\loadout.dm" +#include "whitesands\code\modules\client\loadout\loadout_accessories.dm" +#include "whitesands\code\modules\client\loadout\loadout_eyewear.dm" +#include "whitesands\code\modules\client\loadout\loadout_general.dm" +#include "whitesands\code\modules\client\loadout\loadout_hat.dm" +#include "whitesands\code\modules\client\loadout\loadout_ooc.dm" +#include "whitesands\code\modules\client\loadout\loadout_suit.dm" +#include "whitesands\code\modules\client\loadout\loadout_uniform.dm" +#include "whitesands\code\modules\client\verbs\minimap.dm" +#include "whitesands\code\modules\clothing\glasses\_glasses.dm" +#include "whitesands\code\modules\clothing\glasses\hud.dm" +#include "whitesands\code\modules\clothing\gloves\tapegloves.dm" +#include "whitesands\code\modules\clothing\head\berets.dm" +#include "whitesands\code\modules\clothing\head\cargo.dm" +#include "whitesands\code\modules\clothing\head\cowboy.dm" +#include "whitesands\code\modules\clothing\head\helmet.dm" +#include "whitesands\code\modules\clothing\head\misc_special.dm" +#include "whitesands\code\modules\clothing\neck\ties.dm" +#include "whitesands\code\modules\clothing\outfits\SolGov.dm" +#include "whitesands\code\modules\clothing\shoes\_shoes.dm" +#include "whitesands\code\modules\clothing\shoes\magboots.dm" +#include "whitesands\code\modules\clothing\spacesuits\hardsuits.dm" +#include "whitesands\code\modules\clothing\spacesuits\syndi.dm" +#include "whitesands\code\modules\clothing\suits\armor.dm" +#include "whitesands\code\modules\clothing\suits\coats.dm" +#include "whitesands\code\modules\clothing\suits\jobs.dm" +#include "whitesands\code\modules\clothing\suits\labcoat.dm" +#include "whitesands\code\modules\clothing\under\accessories.dm" +#include "whitesands\code\modules\clothing\under\SolGov.dm" +#include "whitesands\code\modules\clothing\under\syndicate.dm" +#include "whitesands\code\modules\clothing\under\jobs\cargo.dm" +#include "whitesands\code\modules\clothing\under\jobs\centcom.dm" +#include "whitesands\code\modules\clothing\under\jobs\command.dm" +#include "whitesands\code\modules\clothing\under\jobs\engineering.dm" +#include "whitesands\code\modules\clothing\under\jobs\medical.dm" +#include "whitesands\code\modules\clothing\under\jobs\rnd.dm" +#include "whitesands\code\modules\clothing\under\jobs\security.dm" +#include "whitesands\code\modules\clothing\under\jobs\service.dm" +#include "whitesands\code\modules\events\borers.dm" +#include "whitesands\code\modules\food_and_drinks\food\snacks_meat.dm" +#include "whitesands\code\modules\food_and_drinks\food\snacks_pastry.dm" +#include "whitesands\code\modules\food_and_drinks\food\snacks_salad.dm" +#include "whitesands\code\modules\food_and_drinks\food\snacks_soup.dm" +#include "whitesands\code\modules\food_and_drinks\kitchen_machinery\catgrill.dm" +#include "whitesands\code\modules\food_and_drinks\kitchen_machinery\smartfridge.dm" +#include "whitesands\code\modules\food_and_drinks\recipes\drinks_recipes.dm" +#include "whitesands\code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm" +#include "whitesands\code\modules\food_and_drinks\recipes\tablecraft\recipes_pastry.dm" +#include "whitesands\code\modules\food_and_drinks\recipes\tablecraft\recipes_salad.dm" +#include "whitesands\code\modules\food_and_drinks\recipes\tablecraft\recipes_soup.dm" +#include "whitesands\code\modules\jobs\job.dm" +#include "whitesands\code\modules\jobs\job_types\_alt_titles.dm" +#include "whitesands\code\modules\jobs\job_types\brigphys.dm" +#include "whitesands\code\modules\jobs\job_types\solgov_rep.dm" +#include "whitesands\code\modules\language\dwarven.dm" +#include "whitesands\code\modules\language\language_holder.dm" +#include "whitesands\code\modules\language\mouse.dm" +#include "whitesands\code\modules\language\spider.dm" +#include "whitesands\code\modules\library\lib_items.dm" +#include "whitesands\code\modules\mapping\map_template.dm" +#include "whitesands\code\modules\mapping\minimaps.dm" +#include "whitesands\code\modules\mapping\writer.dm" +#include "whitesands\code\modules\metacoin\metacoin.dm" +#include "whitesands\code\modules\mining\ores_coins.dm" +#include "whitesands\code\modules\mining\deepcore\_deepcore.dm" +#include "whitesands\code\modules\mining\deepcore\drill.dm" +#include "whitesands\code\modules\mining\deepcore\equipment.dm" +#include "whitesands\code\modules\mining\deepcore\hopper.dm" +#include "whitesands\code\modules\mining\deepcore\hub.dm" +#include "whitesands\code\modules\mining\deepcore\ore_vein.dm" +#include "whitesands\code\modules\mining\equipment\explorer_gear.dm" +#include "whitesands\code\modules\mining\lavaland\ash_flora.dm" +#include "whitesands\code\modules\mob\emote.dm" +#include "whitesands\code\modules\mob\say_vr.dm" +#include "whitesands\code\modules\mob\living\brain\posibrain.dm" +#include "whitesands\code\modules\mob\living\carbon\human\human.dm" +#include "whitesands\code\modules\mob\living\carbon\human\life.dm" +#include "whitesands\code\modules\mob\living\carbon\human\species_types\dwarves.dm" +#include "whitesands\code\modules\mob\living\carbon\human\species_types\spider.dm" +#include "whitesands\code\modules\mob\living\carbon\human\species_types\squidpeople.dm" +#include "whitesands\code\modules\mob\living\silicon\ai\ai.dm" +#include "whitesands\code\modules\mob\living\silicon\robot\update_icons.dm" +#include "whitesands\code\modules\mob\living\simple_animal\corpse.dm" +#include "whitesands\code\modules\mob\living\simple_animal\friendly\gator.dm" +#include "whitesands\code\modules\mob\living\simple_animal\friendly\snake.dm" +#include "whitesands\code\modules\mob\living\simple_animal\hostile\hostile.dm" +#include "whitesands\code\modules\mob\living\simple_animal\hostile\zombie.dm" +#include "whitesands\code\modules\mob\living\simple_animal\hostile\mining_mobs\basilisk.dm" +#include "whitesands\code\modules\mob\living\simple_animal\hostile\mining_mobs\goliath.dm" +#include "whitesands\code\modules\mob\living\simple_animal\hostile\whitesands\survivors.dm" +#include "whitesands\code\modules\movespeed\modifiers\mobs.dm" +#include "whitesands\code\modules\movespeed\modifiers\reagents.dm" +#include "whitesands\code\modules\overmap\_overmap.dm" +#include "whitesands\code\modules\overmap\events.dm" +#include "whitesands\code\modules\overmap\helm.dm" +#include "whitesands\code\modules\overmap\nav.dm" +#include "whitesands\code\modules\overmap\ships\_ships.dm" +#include "whitesands\code\modules\overmap\ships\simulated.dm" +#include "whitesands\code\modules\paperwork\pen.dm" +#include "whitesands\code\modules\power\cell.dm" +#include "whitesands\code\modules\power\antimatter\containment_jar.dm" +#include "whitesands\code\modules\power\antimatter\control.dm" +#include "whitesands\code\modules\power\antimatter\shielding.dm" +#include "whitesands\code\modules\projectiles\ammunition\ballistic\rifle.dm" +#include "whitesands\code\modules\projectiles\ammunition\ballistic\smg.dm" +#include "whitesands\code\modules\projectiles\boxes_magazines\containers.dm" +#include "whitesands\code\modules\projectiles\boxes_magazines\pistol.dm" +#include "whitesands\code\modules\projectiles\boxes_magazines\external\rifle.dm" +#include "whitesands\code\modules\projectiles\boxes_magazines\external\smg.dm" +#include "whitesands\code\modules\projectiles\boxes_magazines\internal\_derringer.dm" +#include "whitesands\code\modules\projectiles\boxes_magazines\internal\rifle.dm" +#include "whitesands\code\modules\projectiles\boxes_magazines\internal\shotgun.dm" +#include "whitesands\code\modules\projectiles\guns\ballistic\automatic.dm" +#include "whitesands\code\modules\projectiles\guns\ballistic\derringer.dm" +#include "whitesands\code\modules\projectiles\guns\ballistic\rifle.dm" +#include "whitesands\code\modules\projectiles\guns\ballistic\shotgun.dm" +#include "whitesands\code\modules\projectiles\guns\energy\energy_gun.dm" +#include "whitesands\code\modules\projectiles\guns\energy\laser.dm" +#include "whitesands\code\modules\projectiles\guns\energy\pulse.dm" +#include "whitesands\code\modules\projectiles\projectile\beams.dm" +#include "whitesands\code\modules\projectiles\projectile\bullets\rifle.dm" +#include "whitesands\code\modules\projectiles\projectile\bullets\smg.dm" +#include "whitesands\code\modules\reagents\chemistry\reagents\alcohol_reagents.dm" +#include "whitesands\code\modules\reagents\chemistry\reagents\food_reagents.dm" +#include "whitesands\code\modules\reagents\chemistry\reagents\medicine_reagents.dm" +#include "whitesands\code\modules\reagents\chemistry\reagents\other_reagents.dm" +#include "whitesands\code\modules\reagents\chemistry\reagents\toxin_reagents.dm" +#include "whitesands\code\modules\reagents\chemistry\recipes\medicine.dm" +#include "whitesands\code\modules\reagents\chemistry\recipes\others.dm" +#include "whitesands\code\modules\reagents\chemistry\recipes\pyrotechnics.dm" +#include "whitesands\code\modules\reagents\reagent_containers\bottle.dm" +#include "whitesands\code\modules\reagents\reagent_containers\hypospray.dm" +#include "whitesands\code\modules\reagents\reagent_containers\hypovial.dm" +#include "whitesands\code\modules\reagents\reagent_containers\pill.dm" +#include "whitesands\code\modules\reagents\reagent_containers\syringes.dm" +#include "whitesands\code\modules\research\designs\autolathe_designs.dm" +#include "whitesands\code\modules\research\designs\comp_board_designs.dm" +#include "whitesands\code\modules\research\designs\machine_designs.dm" +#include "whitesands\code\modules\research\designs\mechfabricator_designs.dm" +#include "whitesands\code\modules\research\designs\spacepod_designs.dm" +#include "whitesands\code\modules\research\designs\tool_designs.dm" +#include "whitesands\code\modules\research\techweb\all_nodes.dm" +#include "whitesands\code\modules\shuttle\emergency.dm" +#include "whitesands\code\modules\shuttle\shuttle.dm" +#include "whitesands\code\modules\spacepods\construction.dm" +#include "whitesands\code\modules\spacepods\equipment.dm" +#include "whitesands\code\modules\spacepods\parts.dm" +#include "whitesands\code\modules\spacepods\physics.dm" +#include "whitesands\code\modules\spacepods\prebuilt.dm" +#include "whitesands\code\modules\spacepods\spacepod.dm" +#include "whitesands\code\modules\surgery\ipc_revive.dm" +#include "whitesands\code\modules\surgery\mechanical.dm" +#include "whitesands\code\modules\surgery\organs\eyes.dm" +#include "whitesands\code\modules\surgery\organs\liver.dm" +#include "whitesands\code\modules\surgery\organs\moth_wings.dm" +#include "whitesands\code\modules\surgery\organs\tongue.dm" +#include "whitesands\code\modules\uplink\uplink_items.dm" +#include "whitesands\code\modules\vehicles\pimpin_ride.dm" // END_INCLUDE diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index dd2427a9803..122de6001b1 100755 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -52,7 +52,7 @@ if grep -i 'centcomm' _maps/**/*.dmm; then echo "ERROR: Misspelling(s) of CENTCOM detected in maps, please remove the extra M(s)." st=1 fi; -#Wasp begin - SolGov +#WS begin - SolGov if grep 'Solgov' code/**/*.dm; then echo "ERROR: Misspelling(s) of SolGov detected in code, please check capitalization." st=1 @@ -61,7 +61,7 @@ if grep 'Solgov' _maps/**/*.dmm; then echo "ERROR: Misspelling(s) of SolGov detected in maps, please check capitalization." st=1 fi; -#Wasp end +#WS end if ls _maps/*.json | grep -P "[A-Z]"; then echo "Uppercase in a map json detected, these must be all lowercase." st=1 diff --git a/waspstation/README.md b/waspstation/README.md deleted file mode 100644 index 94385780608..00000000000 --- a/waspstation/README.md +++ /dev/null @@ -1,42 +0,0 @@ -# WaspStation Custom File Directory - -## What it is - -This directory exists to house custom code changes that can be properly seperated from the codebase and placed here. All files that can be placed here should. The less code in any folder that isn't this one, the fewer conflicts will exist in future updates. Concept and readme shamelessly stolen from Hippiestation. - -## What it means to modularize - -Something is modular when it exists independent from the rest of the code. This means that by simply adding something modular to the DME file, it will exist in-game. It is not always possible to completely modularize something, but if standards are followed correctly, then there should be few to none conflicts with /tg/station in the future. - -## How to stay modularized - -- Single line changes should have `// WaspStation Edit -- reason` at the end of the exact line that was edited -- Multi line changes start with `// WaspStation Start -- reason` and end with `// WaspStation end`. The reason MUST be included in the change in all cases, so that future coders looking at the line will know why it is needed. -- The reason should generally be about what it was before, or what the change is. -- Commenting out some /tg/ code must be done by putting `/* WaspStation start -- reason` one line before the commented out code, with said line having only the comment itself, and `WaspStation end */` one line after the commented out code, always in an empty line. -- Some examples: - -```dm -var/obj/O = new(wasp) // waspstation -- added argument wasp to new -``` - -```dm -/* waspstation start -- mirrored in our file -/proc/del_everything - del(world) - del(O) - del(everything) -waspstation end */ -``` - -### Icons, code, and sounds - -Icons are notorious for conflicts. Because of this, **ALL NEW ICONS** must go in the "waspstation/icons" folder. There are to be no exceptions to this rule. Sounds don't cause conflicts, but for the sake of organization they are to go in the "waspstation/sounds" folder. No exceptions, either. Unless absolutely necessary, code should go in the "waspstation/code" folder. Small changes outside of the folder should be done with "hook" procs. Larger changes should simply mirror the file in the "waspstation/code" folder. - -If a multiline addition needs to be made outside of the "waspstation" folder, then it should be done by adding a proc called "hook" proc. This proc will be defined inside of the "waspstation" folder. By doing this, a large number of things can be done by adding just one line of code outside of the folder! If possible, also add a comment in the wasp file pointing at the file and proc where the "hook" proc is called, it can be helpful during upstream merges and such. - -If a file must be completely changed, re-create it with the changes inside of the "waspstation/code" folder. **Make sure to follow the file's path correctly** (i.e. code/modules/clothing/clothing.dm.) Then, remove the original file from the tgstation.dme and add the new one. - -### Defines - -Defines only work if they come before the code in which they are used. Because of this, please put all defines in the `code/__DEFINES/~waspstation_defines' path. Use an existing file, or create a new one if necessary. diff --git a/waspstation/code/_globalvars/lists/mapping.dm b/waspstation/code/_globalvars/lists/mapping.dm deleted file mode 100644 index 91d3a397967..00000000000 --- a/waspstation/code/_globalvars/lists/mapping.dm +++ /dev/null @@ -1 +0,0 @@ -GLOBAL_LIST_EMPTY(stationroom_landmarks) //Wasp - List of all spawns for stationrooms diff --git a/waspstation/code/modules/clothing/neck/ties.dm b/waspstation/code/modules/clothing/neck/ties.dm deleted file mode 100644 index 39d1ea47c7f..00000000000 --- a/waspstation/code/modules/clothing/neck/ties.dm +++ /dev/null @@ -1,29 +0,0 @@ -/obj/item/clothing/neck/tie/orange - name = "orange tie" - icon = 'waspstation/icons/obj/clothing/neck.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/neck.dmi' - icon_state = "orangetie" - -/obj/item/clothing/neck/tie/light_blue - name = "light blue tie" - icon = 'waspstation/icons/obj/clothing/neck.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/neck.dmi' - icon_state = "lightbluetie" - -/obj/item/clothing/neck/tie/purple - name = "purple tie" - icon = 'waspstation/icons/obj/clothing/neck.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/neck.dmi' - icon_state = "purpletie" - -/obj/item/clothing/neck/tie/green - name = "green tie" - icon = 'waspstation/icons/obj/clothing/neck.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/neck.dmi' - icon_state = "greentie" - -/obj/item/clothing/neck/tie/brown - name = "brown tie" - icon = 'waspstation/icons/obj/clothing/neck.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/neck.dmi' - icon_state = "browntie" diff --git a/whitesands/README.md b/whitesands/README.md new file mode 100644 index 00000000000..572482a6da8 --- /dev/null +++ b/whitesands/README.md @@ -0,0 +1,42 @@ +# White Sands Custom File Directory + +## What it is + +This directory exists to house custom code changes that can be properly seperated from the codebase and placed here. All files that can be placed here should. The less code in any folder that isn't this one, the fewer conflicts will exist in future updates. Concept and readme shamelessly stolen from Hippiestation. + +## What it means to modularize + +Something is modular when it exists independent from the rest of the code. This means that by simply adding something modular to the DME file, it will exist in-game. It is not always possible to completely modularize something, but if standards are followed correctly, then there should be few to none conflicts with /tg/station in the future. + +## How to stay modularized + +- Single line changes should have `//WS Edit -- reason` at the end of the exact line that was edited +- Multi line changes start with `//WS Start -- reason` and end with `//WS end`. The reason MUST be included in the change in all cases, so that future coders looking at the line will know why it is needed. +- The reason should generally be about what it was before, or what the change is. +- Commenting out some /tg/ code must be done by putting `/*WS start -- reason` one line before the commented out code, with said line having only the comment itself, and `WS end */` one line after the commented out code, always in an empty line. +- Some examples: + +```dm +var/obj/O = new(thing) //WS -- added argument thing to new +``` + +```dm +/*WS start -- mirrored in our file +/proc/del_everything + del(world) + del(O) + del(everything) +WS end */ +``` + +### Icons, code, and sounds + +Icons are notorious for conflicts. Because of this, **ALL NEW ICONS** must go in the "whitesands/icons" folder. There are to be no exceptions to this rule. Sounds don't cause conflicts, but for the sake of organization they are to go in the "whitesands/sounds" folder. No exceptions, either. Unless absolutely necessary, code should go in the "whitesands/code" folder. Small changes outside of the folder should be done with "hook" procs. Larger changes should simply mirror the file in the "whitesands/code" folder. + +If a multiline addition needs to be made outside of the "whitesands" folder, then it should be done by adding a proc called "hook" proc. This proc will be defined inside of the "whitesands" folder. By doing this, a large number of things can be done by adding just one line of code outside of the folder! If possible, also add a comment in the modularized file pointing at the file and proc where the "hook" proc is called, it can be helpful during upstream merges and such. + +If a file must be completely changed, re-create it with the changes inside of the "whitesands/code" folder. **Make sure to follow the file's path correctly** (i.e. code/modules/clothing/clothing.dm.) Then, remove the original file from the tgstation.dme and add the new one. + +### Defines + +Defines only work if they come before the code in which they are used. Because of this, please put all defines in the `code/__DEFINES/~whitesands_defines' path. Use an existing file, or create a new one if necessary. diff --git a/waspstation/code/__DEFINES/DCM.dm b/whitesands/code/__DEFINES/DCM.dm similarity index 100% rename from waspstation/code/__DEFINES/DCM.dm rename to whitesands/code/__DEFINES/DCM.dm diff --git a/waspstation/code/__DEFINES/DNA.dm b/whitesands/code/__DEFINES/DNA.dm similarity index 100% rename from waspstation/code/__DEFINES/DNA.dm rename to whitesands/code/__DEFINES/DNA.dm diff --git a/waspstation/code/__DEFINES/keybinding.dm b/whitesands/code/__DEFINES/keybinding.dm similarity index 100% rename from waspstation/code/__DEFINES/keybinding.dm rename to whitesands/code/__DEFINES/keybinding.dm diff --git a/waspstation/code/__DEFINES/language.dm b/whitesands/code/__DEFINES/language.dm similarity index 100% rename from waspstation/code/__DEFINES/language.dm rename to whitesands/code/__DEFINES/language.dm diff --git a/waspstation/code/__HELPERS/text.dm b/whitesands/code/__HELPERS/text.dm similarity index 100% rename from waspstation/code/__HELPERS/text.dm rename to whitesands/code/__HELPERS/text.dm diff --git a/waspstation/code/_globalvars/game_modes.dm b/whitesands/code/_globalvars/game_modes.dm similarity index 100% rename from waspstation/code/_globalvars/game_modes.dm rename to whitesands/code/_globalvars/game_modes.dm diff --git a/whitesands/code/_globalvars/lists/mapping.dm b/whitesands/code/_globalvars/lists/mapping.dm new file mode 100644 index 00000000000..4279403ec54 --- /dev/null +++ b/whitesands/code/_globalvars/lists/mapping.dm @@ -0,0 +1 @@ +GLOBAL_LIST_EMPTY(stationroom_landmarks) //WS - List of all spawns for stationrooms diff --git a/waspstation/code/_onclick/adjacent.dm b/whitesands/code/_onclick/adjacent.dm similarity index 100% rename from waspstation/code/_onclick/adjacent.dm rename to whitesands/code/_onclick/adjacent.dm diff --git a/waspstation/code/_onclick/hud/ghost.dm b/whitesands/code/_onclick/hud/ghost.dm similarity index 87% rename from waspstation/code/_onclick/hud/ghost.dm rename to whitesands/code/_onclick/hud/ghost.dm index 6c8b8bccda4..b6516dd421e 100644 --- a/waspstation/code/_onclick/hud/ghost.dm +++ b/whitesands/code/_onclick/hud/ghost.dm @@ -1,6 +1,6 @@ /obj/screen/ghost/spawner_menu name = "Spawner Menu" - icon = 'waspstation/icons/mob/screen_ghost.dmi' + icon = 'whitesands/icons/mob/screen_ghost.dmi' icon_state = "spawner_menu" /obj/screen/ghost/spawner_menu/Click() @@ -11,7 +11,7 @@ /datum/hud/ghost/New(mob/owner) ..() var/obj/screen/using - + using = new /obj/screen/ghost/spawner_menu() using.screen_loc = ui_ghost_spawner_menu static_inventory += using diff --git a/waspstation/code/controllers/configuration/entries/game_options.dm b/whitesands/code/controllers/configuration/entries/game_options.dm similarity index 100% rename from waspstation/code/controllers/configuration/entries/game_options.dm rename to whitesands/code/controllers/configuration/entries/game_options.dm diff --git a/waspstation/code/controllers/configuration/entries/general.dm b/whitesands/code/controllers/configuration/entries/general.dm similarity index 100% rename from waspstation/code/controllers/configuration/entries/general.dm rename to whitesands/code/controllers/configuration/entries/general.dm diff --git a/waspstation/code/controllers/subsystem/autotransfer.dm b/whitesands/code/controllers/subsystem/autotransfer.dm similarity index 84% rename from waspstation/code/controllers/subsystem/autotransfer.dm rename to whitesands/code/controllers/subsystem/autotransfer.dm index 9384301e955..926bfb4a0fe 100644 --- a/waspstation/code/controllers/subsystem/autotransfer.dm +++ b/whitesands/code/controllers/subsystem/autotransfer.dm @@ -13,5 +13,5 @@ SUBSYSTEM_DEF(autotransfer) /datum/controller/subsystem/autotransfer/fire() if (world.time > targettime) - SSvote.initiate_vote("transfer",null, FALSE) // WaspStation Edit - Ghost Vote Rework + SSvote.initiate_vote("transfer",null, FALSE) //WS Edit - Ghost Vote Rework targettime = targettime + CONFIG_GET(number/vote_autotransfer_interval) diff --git a/waspstation/code/controllers/subsystem/job.dm b/whitesands/code/controllers/subsystem/job.dm similarity index 100% rename from waspstation/code/controllers/subsystem/job.dm rename to whitesands/code/controllers/subsystem/job.dm diff --git a/waspstation/code/controllers/subsystem/jukeboxes.dm b/whitesands/code/controllers/subsystem/jukeboxes.dm similarity index 100% rename from waspstation/code/controllers/subsystem/jukeboxes.dm rename to whitesands/code/controllers/subsystem/jukeboxes.dm diff --git a/waspstation/code/controllers/subsystem/minimaps.dm b/whitesands/code/controllers/subsystem/minimaps.dm similarity index 100% rename from waspstation/code/controllers/subsystem/minimaps.dm rename to whitesands/code/controllers/subsystem/minimaps.dm diff --git a/waspstation/code/controllers/subsystem/overmap.dm b/whitesands/code/controllers/subsystem/overmap.dm similarity index 100% rename from waspstation/code/controllers/subsystem/overmap.dm rename to whitesands/code/controllers/subsystem/overmap.dm diff --git a/waspstation/code/controllers/subsystem/textobfs.dm b/whitesands/code/controllers/subsystem/textobfs.dm similarity index 95% rename from waspstation/code/controllers/subsystem/textobfs.dm rename to whitesands/code/controllers/subsystem/textobfs.dm index f57b8c7deab..7745777641b 100644 --- a/waspstation/code/controllers/subsystem/textobfs.dm +++ b/whitesands/code/controllers/subsystem/textobfs.dm @@ -1,4 +1,4 @@ -//Waspstation text obfs subsystem, this can be widely applied for URL specific words. +//WS text obfs subsystem, this can be widely applied for URL specific words. //Object-Position ownership map: /* POSITION: OBJECT PATH: diff --git a/waspstation/code/datums/achievements/scores.dm b/whitesands/code/datums/achievements/scores.dm similarity index 100% rename from waspstation/code/datums/achievements/scores.dm rename to whitesands/code/datums/achievements/scores.dm diff --git a/waspstation/code/datums/ai_laws.dm b/whitesands/code/datums/ai_laws.dm similarity index 100% rename from waspstation/code/datums/ai_laws.dm rename to whitesands/code/datums/ai_laws.dm diff --git a/waspstation/code/datums/brain_damage/brain_trauma.dm b/whitesands/code/datums/brain_damage/brain_trauma.dm similarity index 100% rename from waspstation/code/datums/brain_damage/brain_trauma.dm rename to whitesands/code/datums/brain_damage/brain_trauma.dm diff --git a/waspstation/code/datums/brain_damage/phobia.dm b/whitesands/code/datums/brain_damage/phobia.dm similarity index 100% rename from waspstation/code/datums/brain_damage/phobia.dm rename to whitesands/code/datums/brain_damage/phobia.dm diff --git a/waspstation/code/datums/components/crafting/recipes.dm b/whitesands/code/datums/components/crafting/recipes.dm similarity index 100% rename from waspstation/code/datums/components/crafting/recipes.dm rename to whitesands/code/datums/components/crafting/recipes.dm diff --git a/waspstation/code/datums/components/outline.dm b/whitesands/code/datums/components/outline.dm similarity index 100% rename from waspstation/code/datums/components/outline.dm rename to whitesands/code/datums/components/outline.dm diff --git a/waspstation/code/datums/components/storage/concrete/pockets.dm b/whitesands/code/datums/components/storage/concrete/pockets.dm similarity index 100% rename from waspstation/code/datums/components/storage/concrete/pockets.dm rename to whitesands/code/datums/components/storage/concrete/pockets.dm diff --git a/waspstation/code/datums/components/taped.dm b/whitesands/code/datums/components/taped.dm similarity index 95% rename from waspstation/code/datums/components/taped.dm rename to whitesands/code/datums/components/taped.dm index 427a6dbbba8..ebe2385b4ff 100644 --- a/waspstation/code/datums/components/taped.dm +++ b/whitesands/code/datums/components/taped.dm @@ -43,7 +43,7 @@ taped_integrity += patch_amount tape_marks.Blend("#fff", ICON_ADD) - tape_marks.Blend(icon('waspstation/icons/obj/tapes.dmi', "[taped_icon_state]_mask"), ICON_MULTIPLY) + tape_marks.Blend(icon('whitesands/icons/obj/tapes.dmi', "[taped_icon_state]_mask"), ICON_MULTIPLY) taped_icon = new(tape_marks) I.add_overlay(taped_icon) I.update_icon() diff --git a/waspstation/code/datums/dcmnet.dm b/whitesands/code/datums/dcmnet.dm similarity index 100% rename from waspstation/code/datums/dcmnet.dm rename to whitesands/code/datums/dcmnet.dm diff --git a/waspstation/code/datums/diseases/coronavirus.dm b/whitesands/code/datums/diseases/coronavirus.dm similarity index 100% rename from waspstation/code/datums/diseases/coronavirus.dm rename to whitesands/code/datums/diseases/coronavirus.dm diff --git a/waspstation/code/datums/diseases/legionvirus.dm b/whitesands/code/datums/diseases/legionvirus.dm similarity index 100% rename from waspstation/code/datums/diseases/legionvirus.dm rename to whitesands/code/datums/diseases/legionvirus.dm diff --git a/waspstation/code/datums/ert.dm b/whitesands/code/datums/ert.dm similarity index 100% rename from waspstation/code/datums/ert.dm rename to whitesands/code/datums/ert.dm diff --git a/waspstation/code/datums/keybinding/movement.dm b/whitesands/code/datums/keybinding/movement.dm similarity index 100% rename from waspstation/code/datums/keybinding/movement.dm rename to whitesands/code/datums/keybinding/movement.dm diff --git a/waspstation/code/datums/mood_events/drug_events.dm b/whitesands/code/datums/mood_events/drug_events.dm similarity index 100% rename from waspstation/code/datums/mood_events/drug_events.dm rename to whitesands/code/datums/mood_events/drug_events.dm diff --git a/waspstation/code/datums/mood_events/generic_negative_events.dm b/whitesands/code/datums/mood_events/generic_negative_events.dm similarity index 100% rename from waspstation/code/datums/mood_events/generic_negative_events.dm rename to whitesands/code/datums/mood_events/generic_negative_events.dm diff --git a/waspstation/code/datums/mutations/dorfism.dm b/whitesands/code/datums/mutations/dorfism.dm similarity index 100% rename from waspstation/code/datums/mutations/dorfism.dm rename to whitesands/code/datums/mutations/dorfism.dm diff --git a/waspstation/code/datums/quixotejump.dm b/whitesands/code/datums/quixotejump.dm similarity index 100% rename from waspstation/code/datums/quixotejump.dm rename to whitesands/code/datums/quixotejump.dm diff --git a/waspstation/code/datums/ruins/jungle.dm b/whitesands/code/datums/ruins/jungle.dm similarity index 100% rename from waspstation/code/datums/ruins/jungle.dm rename to whitesands/code/datums/ruins/jungle.dm diff --git a/waspstation/code/datums/ruins/space.dm b/whitesands/code/datums/ruins/space.dm similarity index 100% rename from waspstation/code/datums/ruins/space.dm rename to whitesands/code/datums/ruins/space.dm diff --git a/waspstation/code/datums/ruins/station.dm b/whitesands/code/datums/ruins/station.dm similarity index 100% rename from waspstation/code/datums/ruins/station.dm rename to whitesands/code/datums/ruins/station.dm diff --git a/waspstation/code/datums/ruins/whitesands.dm b/whitesands/code/datums/ruins/whitesands.dm similarity index 100% rename from waspstation/code/datums/ruins/whitesands.dm rename to whitesands/code/datums/ruins/whitesands.dm diff --git a/waspstation/code/datums/shuttles.dm b/whitesands/code/datums/shuttles.dm similarity index 100% rename from waspstation/code/datums/shuttles.dm rename to whitesands/code/datums/shuttles.dm diff --git a/waspstation/code/datums/status_effects/debuffs.dm b/whitesands/code/datums/status_effects/debuffs.dm similarity index 100% rename from waspstation/code/datums/status_effects/debuffs.dm rename to whitesands/code/datums/status_effects/debuffs.dm diff --git a/waspstation/code/datums/traits/_quirk.dm b/whitesands/code/datums/traits/_quirk.dm similarity index 100% rename from waspstation/code/datums/traits/_quirk.dm rename to whitesands/code/datums/traits/_quirk.dm diff --git a/waspstation/code/datums/world_topic.dm b/whitesands/code/datums/world_topic.dm similarity index 100% rename from waspstation/code/datums/world_topic.dm rename to whitesands/code/datums/world_topic.dm diff --git a/waspstation/code/game/area/Space_Station_13_areas.dm b/whitesands/code/game/area/Space_Station_13_areas.dm similarity index 100% rename from waspstation/code/game/area/Space_Station_13_areas.dm rename to whitesands/code/game/area/Space_Station_13_areas.dm diff --git a/waspstation/code/game/area/areas/ruins/space.dm b/whitesands/code/game/area/areas/ruins/space.dm similarity index 100% rename from waspstation/code/game/area/areas/ruins/space.dm rename to whitesands/code/game/area/areas/ruins/space.dm diff --git a/waspstation/code/game/area/areas/shuttles.dm b/whitesands/code/game/area/areas/shuttles.dm similarity index 100% rename from waspstation/code/game/area/areas/shuttles.dm rename to whitesands/code/game/area/areas/shuttles.dm diff --git a/waspstation/code/game/gamemodes/changeling/changeling.dm b/whitesands/code/game/gamemodes/changeling/changeling.dm similarity index 100% rename from waspstation/code/game/gamemodes/changeling/changeling.dm rename to whitesands/code/game/gamemodes/changeling/changeling.dm diff --git a/waspstation/code/game/gamemodes/objectives.dm b/whitesands/code/game/gamemodes/objectives.dm similarity index 100% rename from waspstation/code/game/gamemodes/objectives.dm rename to whitesands/code/game/gamemodes/objectives.dm diff --git a/waspstation/code/game/machinery/Sleeper.dm b/whitesands/code/game/machinery/Sleeper.dm similarity index 100% rename from waspstation/code/game/machinery/Sleeper.dm rename to whitesands/code/game/machinery/Sleeper.dm diff --git a/waspstation/code/game/machinery/cloning.dm b/whitesands/code/game/machinery/cloning.dm similarity index 99% rename from waspstation/code/game/machinery/cloning.dm rename to whitesands/code/game/machinery/cloning.dm index 4a858272a5b..5ee21ce5081 100644 --- a/waspstation/code/game/machinery/cloning.dm +++ b/whitesands/code/game/machinery/cloning.dm @@ -14,7 +14,7 @@ name = "cloning pod" desc = "An electronically-lockable pod for growing organic tissue." density = TRUE - icon = 'waspstation/icons/obj/machines/cloning.dmi' + icon = 'whitesands/icons/obj/machines/cloning.dmi' icon_state = "pod_0" req_access = list(ACCESS_CLONING) //FOR PREMATURE UNLOCKING. verb_say = "states" diff --git a/waspstation/code/game/machinery/computer/cloning.dm b/whitesands/code/game/machinery/computer/cloning.dm similarity index 100% rename from waspstation/code/game/machinery/computer/cloning.dm rename to whitesands/code/game/machinery/computer/cloning.dm diff --git a/waspstation/code/game/machinery/cryopod.dm b/whitesands/code/game/machinery/cryopod.dm similarity index 100% rename from waspstation/code/game/machinery/cryopod.dm rename to whitesands/code/game/machinery/cryopod.dm diff --git a/waspstation/code/game/machinery/doors/poddoor.dm b/whitesands/code/game/machinery/doors/poddoor.dm similarity index 80% rename from waspstation/code/game/machinery/doors/poddoor.dm rename to whitesands/code/game/machinery/doors/poddoor.dm index 1fb632fcd71..a999c9421c1 100644 --- a/waspstation/code/game/machinery/doors/poddoor.dm +++ b/whitesands/code/game/machinery/doors/poddoor.dm @@ -30,31 +30,31 @@ update_freelook_sight() /obj/machinery/door/poddoor/multi_tile/four_tile_ver/ - icon = 'waspstation/icons/obj/doors/1x4blast_vert.dmi' + icon = 'whitesands/icons/obj/doors/1x4blast_vert.dmi' bound_height = 128 dir = NORTH /obj/machinery/door/poddoor/multi_tile/three_tile_ver/ - icon = 'waspstation/icons/obj/doors/1x3blast_vert.dmi' + icon = 'whitesands/icons/obj/doors/1x3blast_vert.dmi' bound_height = 96 dir = NORTH /obj/machinery/door/poddoor/multi_tile/two_tile_ver/ - icon = 'waspstation/icons/obj/doors/1x2blast_vert.dmi' + icon = 'whitesands/icons/obj/doors/1x2blast_vert.dmi' bound_height = 64 dir = NORTH /obj/machinery/door/poddoor/multi_tile/four_tile_hor/ - icon = 'waspstation/icons/obj/doors/1x4blast_hor.dmi' + icon = 'whitesands/icons/obj/doors/1x4blast_hor.dmi' bound_width = 128 dir = EAST /obj/machinery/door/poddoor/multi_tile/three_tile_hor/ - icon = 'waspstation/icons/obj/doors/1x3blast_hor.dmi' + icon = 'whitesands/icons/obj/doors/1x3blast_hor.dmi' bound_width = 96 dir = EAST /obj/machinery/door/poddoor/multi_tile/two_tile_hor/ - icon = 'waspstation/icons/obj/doors/1x2blast_hor.dmi' + icon = 'whitesands/icons/obj/doors/1x2blast_hor.dmi' bound_width = 64 dir = EAST diff --git a/waspstation/code/game/machinery/doors/spacepod.dm b/whitesands/code/game/machinery/doors/spacepod.dm similarity index 90% rename from waspstation/code/game/machinery/doors/spacepod.dm rename to whitesands/code/game/machinery/doors/spacepod.dm index 4b51119ad5f..abbe9623328 100644 --- a/waspstation/code/game/machinery/doors/spacepod.dm +++ b/whitesands/code/game/machinery/doors/spacepod.dm @@ -1,7 +1,7 @@ /obj/structure/spacepoddoor name = "podlock" desc = "Why it no open!!!" - icon = 'waspstation/icons/effects/beam.dmi' + icon = 'whitesands/icons/effects/beam.dmi' icon_state = "n_beam" density = 1 anchored = 1 diff --git a/waspstation/code/game/machinery/exp_cloner.dm b/whitesands/code/game/machinery/exp_cloner.dm similarity index 100% rename from waspstation/code/game/machinery/exp_cloner.dm rename to whitesands/code/game/machinery/exp_cloner.dm diff --git a/waspstation/code/game/machinery/porta_turret/portable_turret.dm b/whitesands/code/game/machinery/porta_turret/portable_turret.dm similarity index 100% rename from waspstation/code/game/machinery/porta_turret/portable_turret.dm rename to whitesands/code/game/machinery/porta_turret/portable_turret.dm diff --git a/waspstation/code/game/machinery/shuttle/custom_shuttle.dm b/whitesands/code/game/machinery/shuttle/custom_shuttle.dm similarity index 95% rename from waspstation/code/game/machinery/shuttle/custom_shuttle.dm rename to whitesands/code/game/machinery/shuttle/custom_shuttle.dm index 049bee16119..1e7fdf20cdb 100644 --- a/waspstation/code/game/machinery/shuttle/custom_shuttle.dm +++ b/whitesands/code/game/machinery/shuttle/custom_shuttle.dm @@ -4,7 +4,7 @@ density = TRUE obj_integrity = 250 max_integrity = 250 - icon = 'waspstation/icons/obj/shuttle.dmi' + icon = 'whitesands/icons/obj/shuttle.dmi' icon_state = "burst_plasma" circuit = /obj/item/circuitboard/machine/shuttle/engine var/icon_state_closed = "burst_plasma" diff --git a/waspstation/code/game/machinery/shuttle/shuttle_engine.dm b/whitesands/code/game/machinery/shuttle/shuttle_engine.dm similarity index 100% rename from waspstation/code/game/machinery/shuttle/shuttle_engine.dm rename to whitesands/code/game/machinery/shuttle/shuttle_engine.dm diff --git a/waspstation/code/game/machinery/shuttle/shuttle_engine_types.dm b/whitesands/code/game/machinery/shuttle/shuttle_engine_types.dm similarity index 99% rename from waspstation/code/game/machinery/shuttle/shuttle_engine_types.dm rename to whitesands/code/game/machinery/shuttle/shuttle_engine_types.dm index 6f485570904..2364f9c7f53 100644 --- a/waspstation/code/game/machinery/shuttle/shuttle_engine_types.dm +++ b/whitesands/code/game/machinery/shuttle/shuttle_engine_types.dm @@ -118,7 +118,7 @@ /obj/machinery/power/smes/shuttle name = "electric engine precharger" desc = "A medium-capacity, high transfer superconducting magnetic energy storage unit specially made for use with shuttle engines." - icon = 'waspstation/icons/obj/shuttle.dmi' + icon = 'whitesands/icons/obj/shuttle.dmi' input_level = 0 input_level_max = 50000 output_level = 50000 diff --git a/waspstation/code/game/machinery/shuttle/shuttle_heater.dm b/whitesands/code/game/machinery/shuttle/shuttle_heater.dm similarity index 99% rename from waspstation/code/game/machinery/shuttle/shuttle_heater.dm rename to whitesands/code/game/machinery/shuttle/shuttle_heater.dm index 986de2fc477..54d979b2d6e 100644 --- a/waspstation/code/game/machinery/shuttle/shuttle_heater.dm +++ b/whitesands/code/game/machinery/shuttle/shuttle_heater.dm @@ -8,7 +8,7 @@ name = "shuttle atmospherics device" desc = "This does something to do with shuttle atmospherics" icon_state = "heater" - icon = 'waspstation/icons/obj/shuttle.dmi' + icon = 'whitesands/icons/obj/shuttle.dmi' /obj/machinery/atmospherics/components/unary/shuttle/heater name = "engine heater" diff --git a/waspstation/code/game/machinery/suit_storage_unit.dm b/whitesands/code/game/machinery/suit_storage_unit.dm similarity index 100% rename from waspstation/code/game/machinery/suit_storage_unit.dm rename to whitesands/code/game/machinery/suit_storage_unit.dm diff --git a/waspstation/code/game/objects/effects/countdown.dm b/whitesands/code/game/objects/effects/countdown.dm similarity index 100% rename from waspstation/code/game/objects/effects/countdown.dm rename to whitesands/code/game/objects/effects/countdown.dm diff --git a/waspstation/code/game/objects/effects/decals/cleanable/food.dm b/whitesands/code/game/objects/effects/decals/cleanable/food.dm similarity index 100% rename from waspstation/code/game/objects/effects/decals/cleanable/food.dm rename to whitesands/code/game/objects/effects/decals/cleanable/food.dm diff --git a/waspstation/code/game/objects/effects/decals/cleanable/misc.dm b/whitesands/code/game/objects/effects/decals/cleanable/misc.dm similarity index 100% rename from waspstation/code/game/objects/effects/decals/cleanable/misc.dm rename to whitesands/code/game/objects/effects/decals/cleanable/misc.dm diff --git a/waspstation/code/game/objects/effects/decals/turfdecal/markings.dm b/whitesands/code/game/objects/effects/decals/turfdecal/markings.dm similarity index 56% rename from waspstation/code/game/objects/effects/decals/turfdecal/markings.dm rename to whitesands/code/game/objects/effects/decals/turfdecal/markings.dm index a29f8fa1b95..a165fa264e3 100644 --- a/waspstation/code/game/objects/effects/decals/turfdecal/markings.dm +++ b/whitesands/code/game/objects/effects/decals/turfdecal/markings.dm @@ -1,111 +1,111 @@ /obj/effect/turf_decal/atmos/oxygen - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "oxygen" /obj/effect/turf_decal/atmos/carbon_dioxide - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "carbon_dioxide" /obj/effect/turf_decal/atmos/nitrogen - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "nitrogen" /obj/effect/turf_decal/atmos/air - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "air" /obj/effect/turf_decal/atmos/nitrous_oxide - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "nitrous_oxide" /obj/effect/turf_decal/atmos/plasma - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "plasma" /obj/effect/turf_decal/atmos/mix - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "mix" /obj/effect/turf_decal/number/one - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "1" /obj/effect/turf_decal/number/two - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "2" /obj/effect/turf_decal/number/three - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "3" /obj/effect/turf_decal/number/four - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "4" /obj/effect/turf_decal/number/five - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "5" /obj/effect/turf_decal/number/six - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "6" /obj/effect/turf_decal/number/seven - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "7" /obj/effect/turf_decal/number/eight - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "8" /obj/effect/turf_decal/number/nine - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "9" /obj/effect/turf_decal/number/zero - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "0" /obj/effect/turf_decal/dept/hop - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "hop" /obj/effect/turf_decal/dept/bar - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "bar" /obj/effect/turf_decal/dept/cargo - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "cargo" /obj/effect/turf_decal/dept/medical - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "med" /obj/effect/turf_decal/dept/science - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "sci" /obj/effect/turf_decal/dept/security - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "sec" /obj/effect/turf_decal/dept/mining - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "mine" /obj/effect/turf_decal/zoo - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "zoo" /obj/effect/turf_decal/no - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "no" /obj/effect/turf_decal/radiation - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "radiation" /obj/effect/turf_decal/radiation/white - icon = 'waspstation/icons/turf/decals.dmi' + icon = 'whitesands/icons/turf/decals.dmi' icon_state = "radiation-w" diff --git a/waspstation/code/game/objects/effects/decals/turfdecal/prefabdecals.dm b/whitesands/code/game/objects/effects/decals/turfdecal/prefabdecals.dm similarity index 99% rename from waspstation/code/game/objects/effects/decals/turfdecal/prefabdecals.dm rename to whitesands/code/game/objects/effects/decals/turfdecal/prefabdecals.dm index 8a71e5db9ad..176cc1173dc 100644 --- a/waspstation/code/game/objects/effects/decals/turfdecal/prefabdecals.dm +++ b/whitesands/code/game/objects/effects/decals/turfdecal/prefabdecals.dm @@ -6,7 +6,7 @@ * */ /obj/effect/turf_decal/lumos - icon = 'waspstation/icons/effects/prefabdecals.dmi' + icon = 'whitesands/icons/effects/prefabdecals.dmi' icon_state = "baddecal" name = "Bad Decal" diff --git a/waspstation/code/game/objects/effects/landmarks.dm b/whitesands/code/game/objects/effects/landmarks.dm similarity index 96% rename from waspstation/code/game/objects/effects/landmarks.dm rename to whitesands/code/game/objects/effects/landmarks.dm index ccb90bda7fa..515e4072b09 100644 --- a/waspstation/code/game/objects/effects/landmarks.dm +++ b/whitesands/code/game/objects/effects/landmarks.dm @@ -40,7 +40,7 @@ /obj/effect/landmark/stationroom/box/engine templates = list("Engine SM" = 3, "Engine Singulo" = 3, "Engine Tesla" = 3) - icon = 'waspstation/icons/rooms/box/engine.dmi' + icon = 'whitesands/icons/rooms/box/engine.dmi' /obj/effect/landmark/stationroom/box/engine/New() diff --git a/waspstation/code/game/objects/effects/spawners/lootdrop.dm b/whitesands/code/game/objects/effects/spawners/lootdrop.dm similarity index 100% rename from waspstation/code/game/objects/effects/spawners/lootdrop.dm rename to whitesands/code/game/objects/effects/spawners/lootdrop.dm diff --git a/waspstation/code/game/objects/effects/spawners/structure.dm b/whitesands/code/game/objects/effects/spawners/structure.dm similarity index 73% rename from waspstation/code/game/objects/effects/spawners/structure.dm rename to whitesands/code/game/objects/effects/spawners/structure.dm index b5889e2db0d..679afd9170f 100644 --- a/waspstation/code/game/objects/effects/spawners/structure.dm +++ b/whitesands/code/game/objects/effects/spawners/structure.dm @@ -1,5 +1,5 @@ /obj/effect/spawner/structure/window/shutters - icon = 'waspstation/icons/obj/structures_spawners.dmi' + icon = 'whitesands/icons/obj/structures_spawners.dmi' icon_state = "shwindow_spawner" name = "shutter window spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/fulltile, /obj/machinery/door/firedoor/window) @@ -9,22 +9,22 @@ ) /obj/effect/spawner/structure/window/reinforced/shutters - icon = 'waspstation/icons/obj/structures_spawners.dmi' + icon = 'whitesands/icons/obj/structures_spawners.dmi' name = "reinforced shutter window spawner" - icon = 'waspstation/icons/obj/structures_spawners.dmi' + icon = 'whitesands/icons/obj/structures_spawners.dmi' icon_state = "shrwindow_spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/door/firedoor/window) /obj/effect/spawner/structure/window/reinforced/tinted/shutters - icon = 'waspstation/icons/obj/structures_spawners.dmi' + icon = 'whitesands/icons/obj/structures_spawners.dmi' name = "tinted reinforced shutter window spawner" - icon = 'waspstation/icons/obj/structures_spawners.dmi' + icon = 'whitesands/icons/obj/structures_spawners.dmi' icon_state = "shtwindow_spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile, /obj/machinery/door/firedoor/window) /obj/effect/spawner/structure/window/plasma/reinforced/shutters - icon = 'waspstation/icons/obj/structures_spawners.dmi' + icon = 'whitesands/icons/obj/structures_spawners.dmi' name = "reinforced plasma shutter window spawner" - icon = 'waspstation/icons/obj/structures_spawners.dmi' + icon = 'whitesands/icons/obj/structures_spawners.dmi' icon_state = "shprwindow_spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/fulltile, /obj/machinery/door/firedoor/window) diff --git a/waspstation/code/game/objects/effects/spiderperson_web.dm b/whitesands/code/game/objects/effects/spiderperson_web.dm similarity index 100% rename from waspstation/code/game/objects/effects/spiderperson_web.dm rename to whitesands/code/game/objects/effects/spiderperson_web.dm diff --git a/waspstation/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/whitesands/code/game/objects/effects/temporary_visuals/projectiles/impact.dm similarity index 100% rename from waspstation/code/game/objects/effects/temporary_visuals/projectiles/impact.dm rename to whitesands/code/game/objects/effects/temporary_visuals/projectiles/impact.dm diff --git a/waspstation/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/whitesands/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm similarity index 100% rename from waspstation/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm rename to whitesands/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm diff --git a/waspstation/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/whitesands/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm similarity index 100% rename from waspstation/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm rename to whitesands/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm diff --git a/waspstation/code/game/objects/items/airlock_painter.dm b/whitesands/code/game/objects/items/airlock_painter.dm similarity index 98% rename from waspstation/code/game/objects/items/airlock_painter.dm rename to whitesands/code/game/objects/items/airlock_painter.dm index 573eb513438..94f62c27f0f 100644 --- a/waspstation/code/game/objects/items/airlock_painter.dm +++ b/whitesands/code/game/objects/items/airlock_painter.dm @@ -3,7 +3,7 @@ /obj/item/floor_painter name = "floor painter" - icon = 'waspstation/icons/obj/device.dmi' + icon = 'whitesands/icons/obj/device.dmi' icon_state = "floor_sprayer" desc = "An airlock painter, reprogramed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed. Use it inhand to change the design, and Ctrl-Click to switch to decal-painting mode." @@ -137,7 +137,7 @@ /obj/item/decal_painter name = "decal painter" - desc = "An airlock painter, reprogramed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed. Alt-Click to change design." //WaspStation Edit - Floor Painters + desc = "An airlock painter, reprogramed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed. Alt-Click to change design." //WS Edit - Floor Painters icon = 'icons/obj/objects.dmi' icon_state = "decal_sprayer" item_state = "decalsprayer" diff --git a/waspstation/code/game/objects/items/cards_ids.dm b/whitesands/code/game/objects/items/cards_ids.dm similarity index 100% rename from waspstation/code/game/objects/items/cards_ids.dm rename to whitesands/code/game/objects/items/cards_ids.dm diff --git a/waspstation/code/game/objects/items/circuitboards/computer_circuitboards.dm b/whitesands/code/game/objects/items/circuitboards/computer_circuitboards.dm similarity index 100% rename from waspstation/code/game/objects/items/circuitboards/computer_circuitboards.dm rename to whitesands/code/game/objects/items/circuitboards/computer_circuitboards.dm diff --git a/waspstation/code/game/objects/items/circuitboards/deepcore.dm b/whitesands/code/game/objects/items/circuitboards/deepcore.dm similarity index 100% rename from waspstation/code/game/objects/items/circuitboards/deepcore.dm rename to whitesands/code/game/objects/items/circuitboards/deepcore.dm diff --git a/waspstation/code/game/objects/items/circuitboards/machine_circuitboards.dm b/whitesands/code/game/objects/items/circuitboards/machine_circuitboards.dm similarity index 100% rename from waspstation/code/game/objects/items/circuitboards/machine_circuitboards.dm rename to whitesands/code/game/objects/items/circuitboards/machine_circuitboards.dm diff --git a/waspstation/code/game/objects/items/cosmetics.dm b/whitesands/code/game/objects/items/cosmetics.dm similarity index 100% rename from waspstation/code/game/objects/items/cosmetics.dm rename to whitesands/code/game/objects/items/cosmetics.dm diff --git a/waspstation/code/game/objects/items/desk_flags.dm b/whitesands/code/game/objects/items/desk_flags.dm similarity index 89% rename from waspstation/code/game/objects/items/desk_flags.dm rename to whitesands/code/game/objects/items/desk_flags.dm index 8be9e875ebf..f5eb4044eec 100644 --- a/waspstation/code/game/objects/items/desk_flags.dm +++ b/whitesands/code/game/objects/items/desk_flags.dm @@ -1,7 +1,7 @@ /obj/item/desk_flag name = "flag" desc = "Show your patriotism with WaffleCo. brand desk flags!" - icon = 'waspstation/icons/obj/flags.dmi' + icon = 'whitesands/icons/obj/flags.dmi' icon_state = "flag" force = 3 throwforce = 2 diff --git a/waspstation/code/game/objects/items/devices/PDA_types.dm b/whitesands/code/game/objects/items/devices/PDA_types.dm similarity index 100% rename from waspstation/code/game/objects/items/devices/PDA_types.dm rename to whitesands/code/game/objects/items/devices/PDA_types.dm diff --git a/waspstation/code/game/objects/items/devices/crowbar.dm b/whitesands/code/game/objects/items/devices/crowbar.dm similarity index 100% rename from waspstation/code/game/objects/items/devices/crowbar.dm rename to whitesands/code/game/objects/items/devices/crowbar.dm diff --git a/waspstation/code/game/objects/items/devices/multitool.dm b/whitesands/code/game/objects/items/devices/multitool.dm similarity index 100% rename from waspstation/code/game/objects/items/devices/multitool.dm rename to whitesands/code/game/objects/items/devices/multitool.dm diff --git a/waspstation/code/game/objects/items/devices/radio/encryptionkey.dm b/whitesands/code/game/objects/items/devices/radio/encryptionkey.dm similarity index 80% rename from waspstation/code/game/objects/items/devices/radio/encryptionkey.dm rename to whitesands/code/game/objects/items/devices/radio/encryptionkey.dm index 50deddf1103..71d89ba9ff7 100644 --- a/waspstation/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/whitesands/code/game/objects/items/devices/radio/encryptionkey.dm @@ -1,18 +1,18 @@ /obj/item/encryptionkey/headset_medsec name = "medical-security encryption key" - icon = 'waspstation/icons/obj/radio.dmi' + icon = 'whitesands/icons/obj/radio.dmi' icon_state = "medsec_cypherkey" channels = list(RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_SECURITY = 1) /obj/item/encryptionkey/solgov name = "\proper solgov encryption key" - icon = 'waspstation/icons/obj/radio.dmi' + icon = 'whitesands/icons/obj/radio.dmi' icon_state = "solgov_cypherkey" independent = TRUE channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_SOLGOV = 1) /obj/item/encryptionkey/wideband name = "wideband encryption key" - icon = 'waspstation/icons/obj/radio.dmi' + icon = 'whitesands/icons/obj/radio.dmi' icon_state = "wideband_cypherkey" channels = list(RADIO_CHANNEL_WIDEBAND = 1) diff --git a/waspstation/code/game/objects/items/devices/radio/headset.dm b/whitesands/code/game/objects/items/devices/radio/headset.dm similarity index 90% rename from waspstation/code/game/objects/items/devices/radio/headset.dm rename to whitesands/code/game/objects/items/devices/radio/headset.dm index 486daa992db..51e02d47873 100644 --- a/waspstation/code/game/objects/items/devices/radio/headset.dm +++ b/whitesands/code/game/objects/items/devices/radio/headset.dm @@ -2,7 +2,7 @@ /obj/item/radio/headset/solgov name = "\improper SolGov Offical's headset" desc = "A SolGov Official's headset." - icon = 'waspstation/icons/obj/radio.dmi' + icon = 'whitesands/icons/obj/radio.dmi' icon_state = "solgov_headset" keyslot = new /obj/item/encryptionkey/solgov @@ -19,14 +19,14 @@ /obj/item/radio/headset/headset_medsec name = "medical-security radio headset" desc = "Used to hear how many security officers need to be stiched back together." - icon = 'waspstation/icons/obj/radio.dmi' + icon = 'whitesands/icons/obj/radio.dmi' icon_state = "medsec_headset" keyslot = new /obj/item/encryptionkey/headset_medsec /obj/item/radio/headset/headset_medsec/alt name = "medical-security bowman headset" desc = "Used to hear how many security officers need to be stiched back together. Protects ears from flashbangs." - icon = 'waspstation/icons/obj/radio.dmi' + icon = 'whitesands/icons/obj/radio.dmi' icon_state = "medsec_headset_alt" keyslot = new /obj/item/encryptionkey/headset_medsec diff --git a/waspstation/code/game/objects/items/devices/radio/intercom.dm b/whitesands/code/game/objects/items/devices/radio/intercom.dm similarity index 100% rename from waspstation/code/game/objects/items/devices/radio/intercom.dm rename to whitesands/code/game/objects/items/devices/radio/intercom.dm diff --git a/waspstation/code/game/objects/items/devices/screwdriver.dm b/whitesands/code/game/objects/items/devices/screwdriver.dm similarity index 100% rename from waspstation/code/game/objects/items/devices/screwdriver.dm rename to whitesands/code/game/objects/items/devices/screwdriver.dm diff --git a/waspstation/code/game/objects/items/devices/weldingtool.dm b/whitesands/code/game/objects/items/devices/weldingtool.dm similarity index 100% rename from waspstation/code/game/objects/items/devices/weldingtool.dm rename to whitesands/code/game/objects/items/devices/weldingtool.dm diff --git a/waspstation/code/game/objects/items/devices/wirecutters.dm b/whitesands/code/game/objects/items/devices/wirecutters.dm similarity index 100% rename from waspstation/code/game/objects/items/devices/wirecutters.dm rename to whitesands/code/game/objects/items/devices/wirecutters.dm diff --git a/waspstation/code/game/objects/items/devices/wrench.dm b/whitesands/code/game/objects/items/devices/wrench.dm similarity index 100% rename from waspstation/code/game/objects/items/devices/wrench.dm rename to whitesands/code/game/objects/items/devices/wrench.dm diff --git a/waspstation/code/game/objects/items/ecigar.dm b/whitesands/code/game/objects/items/ecigar.dm similarity index 100% rename from waspstation/code/game/objects/items/ecigar.dm rename to whitesands/code/game/objects/items/ecigar.dm diff --git a/waspstation/code/game/objects/items/manuals.dm b/whitesands/code/game/objects/items/manuals.dm similarity index 100% rename from waspstation/code/game/objects/items/manuals.dm rename to whitesands/code/game/objects/items/manuals.dm diff --git a/waspstation/code/game/objects/items/melee/energy.dm b/whitesands/code/game/objects/items/melee/energy.dm similarity index 73% rename from waspstation/code/game/objects/items/melee/energy.dm rename to whitesands/code/game/objects/items/melee/energy.dm index 1ff84bc52da..2e66dc926c5 100644 --- a/waspstation/code/game/objects/items/melee/energy.dm +++ b/whitesands/code/game/objects/items/melee/energy.dm @@ -1,10 +1,10 @@ /obj/item/melee/transforming/energy/ctf name = "energy sword" desc = "That cable over there, I'm going to cut it." - icon = 'waspstation/icons/obj/items_and_weapons.dmi' + icon = 'whitesands/icons/obj/items_and_weapons.dmi' icon_state = "plasmasword0" - lefthand_file = 'waspstation/icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'waspstation/icons/mob/inhands/weapons/swords_righthand.dmi' + lefthand_file = 'whitesands/icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'whitesands/icons/mob/inhands/weapons/swords_righthand.dmi' sharpness = IS_SHARP armour_penetration = 200 block_chance = 0 @@ -26,5 +26,5 @@ force_on = 34 //desword grade, but 0 blocking /obj/item/melee/transforming/energy/ctf/transform_messages(mob/living/user, supress_message_text) - playsound(user, active ? 'waspstation/sound/weapons/SolGov_sword_arm.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE) + playsound(user, active ? 'whitesands/sound/weapons/SolGov_sword_arm.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE) to_chat(user, "[src] [active ? "is now active":"can now be concealed"].") diff --git a/waspstation/code/game/objects/items/melee/misc.dm b/whitesands/code/game/objects/items/melee/misc.dm similarity index 96% rename from waspstation/code/game/objects/items/melee/misc.dm rename to whitesands/code/game/objects/items/melee/misc.dm index 5e3b9891dad..87429d15aec 100644 --- a/waspstation/code/game/objects/items/melee/misc.dm +++ b/whitesands/code/game/objects/items/melee/misc.dm @@ -1,7 +1,7 @@ /obj/item/melee/greykingsword name = "blade of the grey-king" desc = "A legendary sword made with 3 replica katanas nailed together and dipped in heavy narcotics." - icon = 'waspstation/icons/obj/items_and_weapons.dmi' + icon = 'whitesands/icons/obj/items_and_weapons.dmi' icon_state = "grey_sword" item_state = "swordoff" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' @@ -56,7 +56,7 @@ /obj/item/kitchen/knife/letter_opener name = "letter opener" - icon = 'waspstation/icons/obj/items_and_weapons.dmi' + icon = 'whitesands/icons/obj/items_and_weapons.dmi' icon_state = "letter_opener" desc = "A military combat utility survival knife." embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE) diff --git a/waspstation/code/game/objects/items/pinpointer.dm b/whitesands/code/game/objects/items/pinpointer.dm similarity index 98% rename from waspstation/code/game/objects/items/pinpointer.dm rename to whitesands/code/game/objects/items/pinpointer.dm index 0106062ec45..ba951666f45 100644 --- a/waspstation/code/game/objects/items/pinpointer.dm +++ b/whitesands/code/game/objects/items/pinpointer.dm @@ -1,7 +1,7 @@ /obj/item/pinpointer/deepcore name = "deep core pinpointer" desc = "A handheld dowsing utility for locating material deep beneath the surface." - icon = 'waspstation/icons/obj/mining.dmi' + icon = 'whitesands/icons/obj/mining.dmi' icon_state = "miningpinpointing" custom_price = 300 custom_premium_price = 300 diff --git a/waspstation/code/game/objects/items/shuttle_creator.dm b/whitesands/code/game/objects/items/shuttle_creator.dm similarity index 100% rename from waspstation/code/game/objects/items/shuttle_creator.dm rename to whitesands/code/game/objects/items/shuttle_creator.dm diff --git a/waspstation/code/game/objects/items/stacks/medical.dm b/whitesands/code/game/objects/items/stacks/medical.dm similarity index 95% rename from waspstation/code/game/objects/items/stacks/medical.dm rename to whitesands/code/game/objects/items/stacks/medical.dm index ff227645e50..25a230d07d8 100644 --- a/waspstation/code/game/objects/items/stacks/medical.dm +++ b/whitesands/code/game/objects/items/stacks/medical.dm @@ -5,7 +5,7 @@ desc = "Used to secure limbs following a fracture." gender = PLURAL singular_name = "splint" - icon = 'waspstation/icons/obj/items_and_weapons.dmi' + icon = 'whitesands/icons/obj/items_and_weapons.dmi' icon_state = "splint" self_delay = 40 other_delay = 15 diff --git a/waspstation/code/game/objects/items/stacks/tape.dm b/whitesands/code/game/objects/items/stacks/tape.dm similarity index 99% rename from waspstation/code/game/objects/items/stacks/tape.dm rename to whitesands/code/game/objects/items/stacks/tape.dm index 973d55e609e..4822433c146 100644 --- a/waspstation/code/game/objects/items/stacks/tape.dm +++ b/whitesands/code/game/objects/items/stacks/tape.dm @@ -2,13 +2,13 @@ name = "packaging tape" singular_name = "tape strip" desc = "Sticks things together with minimal effort." - icon = 'waspstation/icons/obj/tapes.dmi' + icon = 'whitesands/icons/obj/tapes.dmi' icon_state = "tape" item_flags = NOBLUDGEON | NO_MAT_REDEMPTION amount = 10 max_amount = 10 grind_results = list(/datum/reagent/cellulose = 5) - usesound = 'waspstation/sound/items/tape.ogg' + usesound = 'whitesands/sound/items/tape.ogg' var/stop_bleed = 600 var/nonorganic_heal = 5 diff --git a/waspstation/code/game/objects/items/storage/backpack.dm b/whitesands/code/game/objects/items/storage/backpack.dm similarity index 95% rename from waspstation/code/game/objects/items/storage/backpack.dm rename to whitesands/code/game/objects/items/storage/backpack.dm index 72a1ba6d00a..678d9dc3f4b 100644 --- a/waspstation/code/game/objects/items/storage/backpack.dm +++ b/whitesands/code/game/objects/items/storage/backpack.dm @@ -6,8 +6,8 @@ /obj/item/storage/backpack/messenger name = "messenger bag" desc = "A sturdy backpack worn over one shoulder." - icon = 'waspstation/icons/obj/storage.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/back.dmi' + icon = 'whitesands/icons/obj/storage.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/back.dmi' icon_state = "courierbag" item_state = "courierbag" diff --git a/waspstation/code/game/objects/items/storage/bags.dm b/whitesands/code/game/objects/items/storage/bags.dm similarity index 94% rename from waspstation/code/game/objects/items/storage/bags.dm rename to whitesands/code/game/objects/items/storage/bags.dm index 94c05ec84c0..2974a9957f6 100644 --- a/waspstation/code/game/objects/items/storage/bags.dm +++ b/whitesands/code/game/objects/items/storage/bags.dm @@ -1,6 +1,6 @@ /obj/item/storage/bag/medical name = "medicine bag" - icon = 'waspstation/icons/obj/bags.dmi' + icon = 'whitesands/icons/obj/bags.dmi' icon_state = "medbag" desc = "A bag for storing syringes, sutures, ointments, and pills." w_class = WEIGHT_CLASS_NORMAL diff --git a/waspstation/code/game/objects/items/storage/boxes.dm b/whitesands/code/game/objects/items/storage/boxes.dm similarity index 87% rename from waspstation/code/game/objects/items/storage/boxes.dm rename to whitesands/code/game/objects/items/storage/boxes.dm index 27e2b4b5848..12a29ca2abe 100644 --- a/waspstation/code/game/objects/items/storage/boxes.dm +++ b/whitesands/code/game/objects/items/storage/boxes.dm @@ -1,7 +1,7 @@ /obj/item/storage/box/slugshot name = "box of 12-gauge slug shotgun shells" desc = "a box full of slug shots, designed for riot shotguns" - icon = 'waspstation/icons/obj/storage.dmi' + icon = 'whitesands/icons/obj/storage.dmi' icon_state = "slugshot_box" illustration = null diff --git a/waspstation/code/game/objects/items/storage/fancy.dm b/whitesands/code/game/objects/items/storage/fancy.dm similarity index 100% rename from waspstation/code/game/objects/items/storage/fancy.dm rename to whitesands/code/game/objects/items/storage/fancy.dm diff --git a/waspstation/code/game/objects/items/storage/firstaid.dm b/whitesands/code/game/objects/items/storage/firstaid.dm similarity index 99% rename from waspstation/code/game/objects/items/storage/firstaid.dm rename to whitesands/code/game/objects/items/storage/firstaid.dm index d367b7a5ac9..d3c6851c9b4 100644 --- a/waspstation/code/game/objects/items/storage/firstaid.dm +++ b/whitesands/code/game/objects/items/storage/firstaid.dm @@ -11,7 +11,7 @@ /obj/item/storage/firstaid name = "first-aid kit" desc = "It's an emergency medical kit for those serious boo-boos." - icon = 'waspstation/icons/obj/storage.dmi' + icon = 'whitesands/icons/obj/storage.dmi' icon_state = "firstaid" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' diff --git a/waspstation/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/whitesands/code/game/objects/structures/crates_lockers/closets/secure/security.dm similarity index 100% rename from waspstation/code/game/objects/structures/crates_lockers/closets/secure/security.dm rename to whitesands/code/game/objects/structures/crates_lockers/closets/secure/security.dm diff --git a/waspstation/code/game/objects/structures/curtains.dm b/whitesands/code/game/objects/structures/curtains.dm similarity index 100% rename from waspstation/code/game/objects/structures/curtains.dm rename to whitesands/code/game/objects/structures/curtains.dm diff --git a/waspstation/code/game/turf/_whitesands.dm b/whitesands/code/game/turf/_whitesands.dm similarity index 100% rename from waspstation/code/game/turf/_whitesands.dm rename to whitesands/code/game/turf/_whitesands.dm diff --git a/waspstation/code/game/turf/closed/wall/whitesands.dm b/whitesands/code/game/turf/closed/wall/whitesands.dm similarity index 70% rename from waspstation/code/game/turf/closed/wall/whitesands.dm rename to whitesands/code/game/turf/closed/wall/whitesands.dm index 4c0e7b4fe9a..3f75c5bb308 100644 --- a/waspstation/code/game/turf/closed/wall/whitesands.dm +++ b/whitesands/code/game/turf/closed/wall/whitesands.dm @@ -1,7 +1,7 @@ /turf/closed/mineral/iron/whitesands - icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -10,8 +10,8 @@ has_borders = FALSE /turf/closed/mineral/uranium/whitesands - icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -20,8 +20,8 @@ has_borders = FALSE /turf/closed/mineral/diamond/whitesands - icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -30,8 +30,8 @@ has_borders = FALSE /turf/closed/mineral/plasma/whitesands - icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -40,8 +40,8 @@ has_borders = FALSE /turf/closed/mineral/bscrystal/whitesands - icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -50,8 +50,8 @@ has_borders = FALSE /turf/closed/mineral/gibtonite/whitesands - icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -60,8 +60,8 @@ has_borders = FALSE /turf/closed/mineral/random/whitesands - icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -73,8 +73,8 @@ has_borders = FALSE /turf/closed/mineral/random/whitesands/high_chance - icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -83,8 +83,8 @@ has_borders = FALSE /turf/closed/mineral/random/labormineral/whitesands - icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -93,8 +93,8 @@ has_borders = FALSE /turf/closed/mineral/random/low_chance - icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'waspstation/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried diff --git a/waspstation/code/game/turf/open/floor/whitesands.dm b/whitesands/code/game/turf/open/floor/whitesands.dm similarity index 95% rename from waspstation/code/game/turf/open/floor/whitesands.dm rename to whitesands/code/game/turf/open/floor/whitesands.dm index 7d6d2701335..03fda400c48 100644 --- a/waspstation/code/game/turf/open/floor/whitesands.dm +++ b/whitesands/code/game/turf/open/floor/whitesands.dm @@ -1,7 +1,7 @@ /turf/open/floor/plating/asteroid/whitesands name = "salted sand" baseturfs = /turf/open/floor/plating/asteroid/whitesands - icon = 'waspstation/icons/turf/floors/whitesands/ws_floors.dmi' + icon = 'whitesands/icons/turf/floors/whitesands/ws_floors.dmi' icon_state = "sand" icon_plating = "sand" planetary_atmos = TRUE diff --git a/waspstation/code/game/turfs/closed/_closed.dm b/whitesands/code/game/turfs/closed/_closed.dm similarity index 100% rename from waspstation/code/game/turfs/closed/_closed.dm rename to whitesands/code/game/turfs/closed/_closed.dm diff --git a/waspstation/code/game/turfs/open/floor/hull.dm b/whitesands/code/game/turfs/open/floor/hull.dm similarity index 100% rename from waspstation/code/game/turfs/open/floor/hull.dm rename to whitesands/code/game/turfs/open/floor/hull.dm diff --git a/waspstation/code/game/turfs/open/floor/medians.dm b/whitesands/code/game/turfs/open/floor/medians.dm similarity index 95% rename from waspstation/code/game/turfs/open/floor/medians.dm rename to whitesands/code/game/turfs/open/floor/medians.dm index 80095d6c243..49f65be4aab 100644 --- a/waspstation/code/game/turfs/open/floor/medians.dm +++ b/whitesands/code/game/turfs/open/floor/medians.dm @@ -6,7 +6,7 @@ * */ /turf/open/floor/plasteel/median - icon = 'waspstation/icons/turf/floors/medians.dmi' + icon = 'whitesands/icons/turf/floors/medians.dmi' icon_state = "floor_fuckywucky" name = "Uh oh tile" diff --git a/waspstation/code/modules/admin/topic.dm b/whitesands/code/modules/admin/topic.dm similarity index 100% rename from waspstation/code/modules/admin/topic.dm rename to whitesands/code/modules/admin/topic.dm diff --git a/waspstation/code/modules/admin/verbs/mapping.dm b/whitesands/code/modules/admin/verbs/mapping.dm similarity index 100% rename from waspstation/code/modules/admin/verbs/mapping.dm rename to whitesands/code/modules/admin/verbs/mapping.dm diff --git a/waspstation/code/modules/admin/verbs/mentors_edit.dm b/whitesands/code/modules/admin/verbs/mentors_edit.dm similarity index 100% rename from waspstation/code/modules/admin/verbs/mentors_edit.dm rename to whitesands/code/modules/admin/verbs/mentors_edit.dm diff --git a/waspstation/code/modules/admin/verbs/modify_antag_tokens.dm b/whitesands/code/modules/admin/verbs/modify_antag_tokens.dm similarity index 100% rename from waspstation/code/modules/admin/verbs/modify_antag_tokens.dm rename to whitesands/code/modules/admin/verbs/modify_antag_tokens.dm diff --git a/waspstation/code/modules/antagonists/_common/antag_spawner.dm b/whitesands/code/modules/antagonists/_common/antag_spawner.dm similarity index 94% rename from waspstation/code/modules/antagonists/_common/antag_spawner.dm rename to whitesands/code/modules/antagonists/_common/antag_spawner.dm index a46d64ef47c..2feb28399fd 100644 --- a/waspstation/code/modules/antagonists/_common/antag_spawner.dm +++ b/whitesands/code/modules/antagonists/_common/antag_spawner.dm @@ -2,7 +2,7 @@ /obj/item/antag_spawner/syndi_borer name = "syndicate brain-slug container" desc = "Releases a modified cortical borer to assist the user." - icon = 'waspstation/icons/obj/chemical.dmi' //Temporary? Doesn't look like a feckin syndicate item, and is overall shit. FIX + icon = 'whitesands/icons/obj/chemical.dmi' //Temporary? Doesn't look like a feckin syndicate item, and is overall shit. FIX icon_state = "hypoviallarge-b" var/polling = FALSE diff --git a/waspstation/code/modules/antagonists/borer/borer.dm b/whitesands/code/modules/antagonists/borer/borer.dm similarity index 99% rename from waspstation/code/modules/antagonists/borer/borer.dm rename to whitesands/code/modules/antagonists/borer/borer.dm index 5704b40cdfd..53376d6ca20 100644 --- a/waspstation/code/modules/antagonists/borer/borer.dm +++ b/whitesands/code/modules/antagonists/borer/borer.dm @@ -61,7 +61,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3) name = "cortical borer" real_name = "cortical borer" desc = "A small, quivering, slug-like creature." - icon = 'waspstation/icons/mob/borer.dmi' + icon = 'whitesands/icons/mob/borer.dmi' icon_state = "brainslug" icon_living = "brainslug" icon_dead = "brainslug_dead" @@ -994,7 +994,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3) give_back_control_action.Remove(victim) /datum/action/innate/borer - icon_icon = 'waspstation/icons/mob/actions/actions_borer.dmi' + icon_icon = 'whitesands/icons/mob/actions/actions_borer.dmi' background_icon_state = "bg_alien" /datum/action/innate/borer/talk_to_host diff --git a/waspstation/code/modules/antagonists/borer/borer_chems.dm b/whitesands/code/modules/antagonists/borer/borer_chems.dm similarity index 100% rename from waspstation/code/modules/antagonists/borer/borer_chems.dm rename to whitesands/code/modules/antagonists/borer/borer_chems.dm diff --git a/waspstation/code/modules/antagonists/borer/borer_html.dm b/whitesands/code/modules/antagonists/borer/borer_html.dm similarity index 100% rename from waspstation/code/modules/antagonists/borer/borer_html.dm rename to whitesands/code/modules/antagonists/borer/borer_html.dm diff --git a/waspstation/code/modules/antagonists/borer/borer_say.dm b/whitesands/code/modules/antagonists/borer/borer_say.dm similarity index 100% rename from waspstation/code/modules/antagonists/borer/borer_say.dm rename to whitesands/code/modules/antagonists/borer/borer_say.dm diff --git a/waspstation/code/modules/antagonists/borer/syndiborer.dm b/whitesands/code/modules/antagonists/borer/syndiborer.dm similarity index 100% rename from waspstation/code/modules/antagonists/borer/syndiborer.dm rename to whitesands/code/modules/antagonists/borer/syndiborer.dm diff --git a/waspstation/code/modules/antagonists/ert/ert.dm b/whitesands/code/modules/antagonists/ert/ert.dm similarity index 100% rename from waspstation/code/modules/antagonists/ert/ert.dm rename to whitesands/code/modules/antagonists/ert/ert.dm diff --git a/waspstation/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm b/whitesands/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm similarity index 100% rename from waspstation/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm rename to whitesands/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm diff --git a/waspstation/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm b/whitesands/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm similarity index 98% rename from waspstation/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm rename to whitesands/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm index 43d2756e25c..7f85a1b54d8 100644 --- a/waspstation/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm +++ b/whitesands/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm @@ -1,7 +1,7 @@ /obj/machinery/atmospherics/components/binary/relief_valve name = "binary pressure relief valve" desc = "Like a manual valve, but opens at a certain pressure rather than being toggleable." - icon = 'waspstation/icons/obj/atmospherics/components/relief_valve.dmi' + icon = 'whitesands/icons/obj/atmospherics/components/relief_valve.dmi' icon_state = "relief_valve-t-map" can_unwrench = TRUE construction_type = /obj/item/pipe/binary diff --git a/waspstation/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm b/whitesands/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm similarity index 98% rename from waspstation/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm rename to whitesands/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm index 7d5e75ba1ca..1d8f9e629ef 100644 --- a/waspstation/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm +++ b/whitesands/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm @@ -1,7 +1,7 @@ /obj/machinery/atmospherics/components/unary/relief_valve name = "pressure relief valve" desc = "A valve that opens to the air at a certain pressure, then closes once it goes below another." - icon = 'waspstation/icons/obj/atmospherics/components/relief_valve.dmi' + icon = 'whitesands/icons/obj/atmospherics/components/relief_valve.dmi' icon_state = "relief_valve-e-map" can_unwrench = TRUE interaction_flags_machine = INTERACT_MACHINE_OFFLINE | INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_SET_MACHINE diff --git a/waspstation/code/modules/atmospherics/machinery/portable/canister.dm b/whitesands/code/modules/atmospherics/machinery/portable/canister.dm similarity index 89% rename from waspstation/code/modules/atmospherics/machinery/portable/canister.dm rename to whitesands/code/modules/atmospherics/machinery/portable/canister.dm index 0356654726c..6b1aaa38269 100644 --- a/waspstation/code/modules/atmospherics/machinery/portable/canister.dm +++ b/whitesands/code/modules/atmospherics/machinery/portable/canister.dm @@ -1,5 +1,5 @@ /obj/machinery/portable_atmospherics/canister - icon = 'waspstation/icons/obj/atmos.dmi' + icon = 'whitesands/icons/obj/atmos.dmi' /obj/machinery/portable_atmospherics/canister/update_overlays() . = ..() diff --git a/waspstation/code/modules/awaymissions/corpse.dm b/whitesands/code/modules/awaymissions/corpse.dm similarity index 100% rename from waspstation/code/modules/awaymissions/corpse.dm rename to whitesands/code/modules/awaymissions/corpse.dm diff --git a/waspstation/code/modules/awaymissions/mission_code/speedway.dm b/whitesands/code/modules/awaymissions/mission_code/speedway.dm similarity index 100% rename from waspstation/code/modules/awaymissions/mission_code/speedway.dm rename to whitesands/code/modules/awaymissions/mission_code/speedway.dm diff --git a/waspstation/code/modules/buildmode/submodes/map_export.dm b/whitesands/code/modules/buildmode/submodes/map_export.dm similarity index 100% rename from waspstation/code/modules/buildmode/submodes/map_export.dm rename to whitesands/code/modules/buildmode/submodes/map_export.dm diff --git a/waspstation/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/whitesands/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm similarity index 100% rename from waspstation/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm rename to whitesands/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm diff --git a/waspstation/code/modules/cargo/bounties/engineering.dm b/whitesands/code/modules/cargo/bounties/engineering.dm similarity index 100% rename from waspstation/code/modules/cargo/bounties/engineering.dm rename to whitesands/code/modules/cargo/bounties/engineering.dm diff --git a/waspstation/code/modules/cargo/exports/large_objects.dm b/whitesands/code/modules/cargo/exports/large_objects.dm similarity index 100% rename from waspstation/code/modules/cargo/exports/large_objects.dm rename to whitesands/code/modules/cargo/exports/large_objects.dm diff --git a/waspstation/code/modules/cargo/packs.dm b/whitesands/code/modules/cargo/packs.dm similarity index 100% rename from waspstation/code/modules/cargo/packs.dm rename to whitesands/code/modules/cargo/packs.dm diff --git a/waspstation/code/modules/client/antag_tokens.dm b/whitesands/code/modules/client/antag_tokens.dm similarity index 100% rename from waspstation/code/modules/client/antag_tokens.dm rename to whitesands/code/modules/client/antag_tokens.dm diff --git a/waspstation/code/modules/client/loadout/loadout.dm b/whitesands/code/modules/client/loadout/loadout.dm similarity index 100% rename from waspstation/code/modules/client/loadout/loadout.dm rename to whitesands/code/modules/client/loadout/loadout.dm diff --git a/waspstation/code/modules/client/loadout/loadout_accessories.dm b/whitesands/code/modules/client/loadout/loadout_accessories.dm similarity index 100% rename from waspstation/code/modules/client/loadout/loadout_accessories.dm rename to whitesands/code/modules/client/loadout/loadout_accessories.dm diff --git a/waspstation/code/modules/client/loadout/loadout_eyewear.dm b/whitesands/code/modules/client/loadout/loadout_eyewear.dm similarity index 100% rename from waspstation/code/modules/client/loadout/loadout_eyewear.dm rename to whitesands/code/modules/client/loadout/loadout_eyewear.dm diff --git a/waspstation/code/modules/client/loadout/loadout_general.dm b/whitesands/code/modules/client/loadout/loadout_general.dm similarity index 100% rename from waspstation/code/modules/client/loadout/loadout_general.dm rename to whitesands/code/modules/client/loadout/loadout_general.dm diff --git a/waspstation/code/modules/client/loadout/loadout_hat.dm b/whitesands/code/modules/client/loadout/loadout_hat.dm similarity index 100% rename from waspstation/code/modules/client/loadout/loadout_hat.dm rename to whitesands/code/modules/client/loadout/loadout_hat.dm diff --git a/waspstation/code/modules/client/loadout/loadout_ooc.dm b/whitesands/code/modules/client/loadout/loadout_ooc.dm similarity index 100% rename from waspstation/code/modules/client/loadout/loadout_ooc.dm rename to whitesands/code/modules/client/loadout/loadout_ooc.dm diff --git a/waspstation/code/modules/client/loadout/loadout_suit.dm b/whitesands/code/modules/client/loadout/loadout_suit.dm similarity index 100% rename from waspstation/code/modules/client/loadout/loadout_suit.dm rename to whitesands/code/modules/client/loadout/loadout_suit.dm diff --git a/waspstation/code/modules/client/loadout/loadout_uniform.dm b/whitesands/code/modules/client/loadout/loadout_uniform.dm similarity index 100% rename from waspstation/code/modules/client/loadout/loadout_uniform.dm rename to whitesands/code/modules/client/loadout/loadout_uniform.dm diff --git a/waspstation/code/modules/client/verbs/minimap.dm b/whitesands/code/modules/client/verbs/minimap.dm similarity index 100% rename from waspstation/code/modules/client/verbs/minimap.dm rename to whitesands/code/modules/client/verbs/minimap.dm diff --git a/waspstation/code/modules/clothing/glasses/_glasses.dm b/whitesands/code/modules/clothing/glasses/_glasses.dm similarity index 100% rename from waspstation/code/modules/clothing/glasses/_glasses.dm rename to whitesands/code/modules/clothing/glasses/_glasses.dm diff --git a/waspstation/code/modules/clothing/glasses/hud.dm b/whitesands/code/modules/clothing/glasses/hud.dm similarity index 73% rename from waspstation/code/modules/clothing/glasses/hud.dm rename to whitesands/code/modules/clothing/glasses/hud.dm index 7e91b5ae860..a9142a78c04 100644 --- a/waspstation/code/modules/clothing/glasses/hud.dm +++ b/whitesands/code/modules/clothing/glasses/hud.dm @@ -2,41 +2,41 @@ /obj/item/clothing/glasses/hud/health/prescription name = "prescription health scanner HUD" desc = "A heads-up display that scans the humanoids in view and provides accurate data about their health status. This pair also helps nearsighted doctors." - icon = 'waspstation/icons/obj/clothing/glasses.dmi' + icon = 'whitesands/icons/obj/clothing/glasses.dmi' icon_state = "prescriptionhealthhud" - mob_overlay_icon = 'waspstation/icons/mob/clothing/eyes.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/eyes.dmi' vision_correction = 1 /obj/item/clothing/glasses/hud/security/prescription name = "prescription security HUD" desc = "A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. This pair also corrects nearsightedness." - icon = 'waspstation/icons/obj/clothing/glasses.dmi' + icon = 'whitesands/icons/obj/clothing/glasses.dmi' icon_state = "prescriptionsecurityhud" - mob_overlay_icon = 'waspstation/icons/mob/clothing/eyes.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/eyes.dmi' vision_correction = 1 //"Goggles" /obj/item/clothing/glasses/meson/prescription name = "prescription optical meson scanner" desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This pair also corrects nearsightedness." - icon = 'waspstation/icons/obj/clothing/glasses.dmi' + icon = 'whitesands/icons/obj/clothing/glasses.dmi' icon_state = "prescriptionmeson" - mob_overlay_icon = 'waspstation/icons/mob/clothing/eyes.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/eyes.dmi' vision_correction = 1 /obj/item/clothing/glasses/science/prescription name = "prescription science goggles" desc = "A pair of prescription glasses fitted with an analyzer for scanning items and reagents. " - icon = 'waspstation/icons/obj/clothing/glasses.dmi' + icon = 'whitesands/icons/obj/clothing/glasses.dmi' icon_state = "prescriptionpurple" - mob_overlay_icon = 'waspstation/icons/mob/clothing/eyes.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/eyes.dmi' vision_correction = 1 //Sunglasses /obj/item/clothing/glasses/meson/sunglasses name = "optical meson scannerglasses" desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This pair is built into a pair of sunglasses." - icon = 'waspstation/icons/obj/clothing/glasses.dmi' + icon = 'whitesands/icons/obj/clothing/glasses.dmi' icon_state = "sunnmeson" - mob_overlay_icon = 'waspstation/icons/mob/clothing/eyes.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/eyes.dmi' flash_protect = FLASH_PROTECTION_FLASH diff --git a/waspstation/code/modules/clothing/gloves/tapegloves.dm b/whitesands/code/modules/clothing/gloves/tapegloves.dm similarity index 93% rename from waspstation/code/modules/clothing/gloves/tapegloves.dm rename to whitesands/code/modules/clothing/gloves/tapegloves.dm index 6126041b61e..d6fecb91bd2 100644 --- a/waspstation/code/modules/clothing/gloves/tapegloves.dm +++ b/whitesands/code/modules/clothing/gloves/tapegloves.dm @@ -1,7 +1,7 @@ /obj/item/clothing/gloves/color/yellow/sprayon/tape name = "taped-on insulated gloves" desc = "This is a totally safe idea." - icon = 'waspstation/icons/obj/clothing/gloves.dmi' + icon = 'whitesands/icons/obj/clothing/gloves.dmi' icon_state = "yellowtape" item_state = "ygloves" shocks_remaining = 3 diff --git a/waspstation/code/modules/clothing/head/berets.dm b/whitesands/code/modules/clothing/head/berets.dm similarity index 98% rename from waspstation/code/modules/clothing/head/berets.dm rename to whitesands/code/modules/clothing/head/berets.dm index 6383923f4e1..17034bcd5df 100644 --- a/waspstation/code/modules/clothing/head/berets.dm +++ b/whitesands/code/modules/clothing/head/berets.dm @@ -2,8 +2,8 @@ /obj/item/clothing/head/beret name = "beret" desc = "A beret, a mime's favorite headwear." - icon = 'waspstation/icons/obj/clothing/hats.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/head.dmi' + icon = 'whitesands/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/head.dmi' icon_state = "beret" dog_fashion = /datum/dog_fashion/head/beret dynamic_hair_suffix = "+generic" diff --git a/waspstation/code/modules/clothing/head/cargo.dm b/whitesands/code/modules/clothing/head/cargo.dm similarity index 67% rename from waspstation/code/modules/clothing/head/cargo.dm rename to whitesands/code/modules/clothing/head/cargo.dm index a2bcfd2cf12..abaa6c903b1 100644 --- a/waspstation/code/modules/clothing/head/cargo.dm +++ b/whitesands/code/modules/clothing/head/cargo.dm @@ -1,14 +1,14 @@ /obj/item/clothing/head/supply_chief name = "supply chief's cap" desc = "The one thing between you and 40 boxes of orderable pizza is the person wearing this hat." - icon = 'waspstation/icons/obj/clothing/hats.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/head.dmi' + icon = 'whitesands/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/head.dmi' icon_state = "supply_chief_cap" /obj/item/clothing/head/deliveries_officer name = "supply chief's cap" desc = "Whether through fires, the vacuum of space, or hordes of souless husks of grey suited criminals, your crate will always be delivered!" - icon = 'waspstation/icons/obj/clothing/hats.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/head.dmi' + icon = 'whitesands/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/head.dmi' icon_state = "deliveries_officer_cap" diff --git a/waspstation/code/modules/clothing/head/cowboy.dm b/whitesands/code/modules/clothing/head/cowboy.dm similarity index 59% rename from waspstation/code/modules/clothing/head/cowboy.dm rename to whitesands/code/modules/clothing/head/cowboy.dm index 1b133b26f77..809d071fb24 100644 --- a/waspstation/code/modules/clothing/head/cowboy.dm +++ b/whitesands/code/modules/clothing/head/cowboy.dm @@ -1,8 +1,8 @@ /obj/item/clothing/head/cowboy name = "Cowboy Hat" desc = "yee haw" - icon = 'waspstation/icons/obj/clothing/hats.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/head.dmi' + icon = 'whitesands/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/head.dmi' icon_state = "cowboy" dynamic_fhair_suffix = "+generic" dynamic_fhair_suffix = "+generic" diff --git a/waspstation/code/modules/clothing/head/helmet.dm b/whitesands/code/modules/clothing/head/helmet.dm similarity index 84% rename from waspstation/code/modules/clothing/head/helmet.dm rename to whitesands/code/modules/clothing/head/helmet.dm index 82c309393a7..6d68a9c419c 100644 --- a/waspstation/code/modules/clothing/head/helmet.dm +++ b/whitesands/code/modules/clothing/head/helmet.dm @@ -5,8 +5,8 @@ item_state = "helmet_terragov" can_flashlight = FALSE dog_fashion = null - icon = 'waspstation/icons/obj/clothing/hats.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/head.dmi' + icon = 'whitesands/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/head.dmi' /obj/item/clothing/head/solgov name = "\improper SolGov officer's cap" @@ -15,8 +15,8 @@ icon_state = "cap_solgov" item_state = "cap_solgov" strip_delay = 80 - icon = 'waspstation/icons/obj/clothing/hats.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/head.dmi' + icon = 'whitesands/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/head.dmi' /obj/item/clothing/head/solgov/terragov name = "\improper TerraGov officer's cap" diff --git a/waspstation/code/modules/clothing/head/misc_special.dm b/whitesands/code/modules/clothing/head/misc_special.dm similarity index 100% rename from waspstation/code/modules/clothing/head/misc_special.dm rename to whitesands/code/modules/clothing/head/misc_special.dm diff --git a/whitesands/code/modules/clothing/neck/ties.dm b/whitesands/code/modules/clothing/neck/ties.dm new file mode 100644 index 00000000000..7ec05fd81ae --- /dev/null +++ b/whitesands/code/modules/clothing/neck/ties.dm @@ -0,0 +1,29 @@ +/obj/item/clothing/neck/tie/orange + name = "orange tie" + icon = 'whitesands/icons/obj/clothing/neck.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/neck.dmi' + icon_state = "orangetie" + +/obj/item/clothing/neck/tie/light_blue + name = "light blue tie" + icon = 'whitesands/icons/obj/clothing/neck.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/neck.dmi' + icon_state = "lightbluetie" + +/obj/item/clothing/neck/tie/purple + name = "purple tie" + icon = 'whitesands/icons/obj/clothing/neck.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/neck.dmi' + icon_state = "purpletie" + +/obj/item/clothing/neck/tie/green + name = "green tie" + icon = 'whitesands/icons/obj/clothing/neck.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/neck.dmi' + icon_state = "greentie" + +/obj/item/clothing/neck/tie/brown + name = "brown tie" + icon = 'whitesands/icons/obj/clothing/neck.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/neck.dmi' + icon_state = "browntie" diff --git a/waspstation/code/modules/clothing/outfits/SolGov.dm b/whitesands/code/modules/clothing/outfits/SolGov.dm similarity index 100% rename from waspstation/code/modules/clothing/outfits/SolGov.dm rename to whitesands/code/modules/clothing/outfits/SolGov.dm diff --git a/waspstation/code/modules/clothing/shoes/_shoes.dm b/whitesands/code/modules/clothing/shoes/_shoes.dm similarity index 73% rename from waspstation/code/modules/clothing/shoes/_shoes.dm rename to whitesands/code/modules/clothing/shoes/_shoes.dm index 2686bbc67f4..818aeae0c38 100644 --- a/waspstation/code/modules/clothing/shoes/_shoes.dm +++ b/whitesands/code/modules/clothing/shoes/_shoes.dm @@ -11,8 +11,8 @@ /obj/item/clothing/shoes/proc/digi_alt(mob/living/carbon/human/user, set_icon_to) if(set_icon_to) - mob_overlay_icon = 'waspstation/icons/mob/clothing/digialt.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/digialt.dmi' else - mob_overlay_icon = 'waspstation/icons/mob/clothing/feet.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/feet.dmi' user.update_inv_shoes() return diff --git a/waspstation/code/modules/clothing/shoes/magboots.dm b/whitesands/code/modules/clothing/shoes/magboots.dm similarity index 97% rename from waspstation/code/modules/clothing/shoes/magboots.dm rename to whitesands/code/modules/clothing/shoes/magboots.dm index 6315908d6d8..cdd7521bfaa 100644 --- a/waspstation/code/modules/clothing/shoes/magboots.dm +++ b/whitesands/code/modules/clothing/shoes/magboots.dm @@ -1,6 +1,6 @@ /obj/item/clothing/shoes/magboots - icon = 'waspstation/icons/obj/clothing/shoes.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/feet.dmi' + icon = 'whitesands/icons/obj/clothing/shoes.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/feet.dmi' /obj/item/clothing/shoes/magboots/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WELDER) diff --git a/waspstation/code/modules/clothing/spacesuits/hardsuits.dm b/whitesands/code/modules/clothing/spacesuits/hardsuits.dm similarity index 86% rename from waspstation/code/modules/clothing/spacesuits/hardsuits.dm rename to whitesands/code/modules/clothing/spacesuits/hardsuits.dm index f900c36fe0c..12b935b1488 100644 --- a/waspstation/code/modules/clothing/spacesuits/hardsuits.dm +++ b/whitesands/code/modules/clothing/spacesuits/hardsuits.dm @@ -5,8 +5,8 @@ item_state = "hardsuit0-solgov" hardsuit_type = "solgov" armor = list("melee" = 50, "bullet" = 45, "laser" = 40,"energy" = 30, "bomb" = 60, "bio" = 100, "rad" = 90, "fire" = 85, "acid" = 75) - icon = 'waspstation/icons/obj/clothing/hats.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/head.dmi' + icon = 'whitesands/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/head.dmi' /obj/item/clothing/suit/space/hardsuit/solgov icon_state = "hardsuit_solgov" @@ -16,8 +16,8 @@ armor = list("melee" = 50, "bullet" = 45, "laser" = 40, "energy" = 30, "bomb" = 60, "bio" = 100, "rad" = 90, "fire" = 85, "acid" = 75) //intentionally the fucking strong, this is master chief-tier armor //is this really what you call the strong?? is this the best solgov has to offer?????? helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov slowdown = 0 - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' /obj/item/clothing/head/helmet/space/hardsuit/quixote name = "Quixote mobility hardsuit helmet" @@ -28,8 +28,8 @@ armor = list("melee" = 50, "bullet" = 40, "laser" = 40, "energy" = 25, "bomb" = 50, "bio" = 100, "rad" = 60, "fire" = 50, "acid" = 100) hardsuit_type = "quixote" max_heat_protection_temperature = 20000 - icon = 'waspstation/icons/obj/clothing/hats.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/head.dmi' + icon = 'whitesands/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/head.dmi' /obj/item/clothing/suit/space/hardsuit/quixote name = "Quixote mobility hardsuit" @@ -45,8 +45,8 @@ slowdown = 0 max_heat_protection_temperature = 20000 var/datum/action/innate/quixotejump/jump - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' /obj/item/clothing/suit/space/hardsuit/quixote/Initialize() . = ..() diff --git a/waspstation/code/modules/clothing/spacesuits/syndi.dm b/whitesands/code/modules/clothing/spacesuits/syndi.dm similarity index 100% rename from waspstation/code/modules/clothing/spacesuits/syndi.dm rename to whitesands/code/modules/clothing/spacesuits/syndi.dm diff --git a/waspstation/code/modules/clothing/suits/armor.dm b/whitesands/code/modules/clothing/suits/armor.dm similarity index 77% rename from waspstation/code/modules/clothing/suits/armor.dm rename to whitesands/code/modules/clothing/suits/armor.dm index 4bcdefec5eb..6763eda1472 100644 --- a/waspstation/code/modules/clothing/suits/armor.dm +++ b/whitesands/code/modules/clothing/suits/armor.dm @@ -3,8 +3,8 @@ desc = "A standard armor vest fielded for SolGov's infantry." icon_state = "armor_solgov" item_state = "armor_solgov" - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' /obj/item/clothing/suit/armor/vest/solgov/Initialize() . = ..() @@ -19,7 +19,7 @@ /obj/item/clothing/suit/armor/vest/hop name = "head of personnel's parade jacket" desc = "For when an armoured vest isn't fashionable enough." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "hopformal" item_state = "capspacesuit" diff --git a/waspstation/code/modules/clothing/suits/coats.dm b/whitesands/code/modules/clothing/suits/coats.dm similarity index 66% rename from waspstation/code/modules/clothing/suits/coats.dm rename to whitesands/code/modules/clothing/suits/coats.dm index 83a447b5133..b85acc010a4 100644 --- a/waspstation/code/modules/clothing/suits/coats.dm +++ b/whitesands/code/modules/clothing/suits/coats.dm @@ -1,50 +1,50 @@ /obj/item/clothing/suit/toggle/lawyer/cmo name = "light blue suit jacket" desc = "A foppish dress jacket." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "suitjacket_cmo" /obj/item/clothing/suit/toggle/lawyer/medical name = "saturated blue suit jacket" desc = "A foppish dress jacket." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "suitjacket_medical" /obj/item/clothing/suit/toggle/lawyer/science name = "purple suit jacket" desc = "A foppish dress jacket." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "suitjacket_science" /obj/item/clothing/suit/toggle/lawyer/brown name = "brown suit jacket" desc = "A foppish dress jacket." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "suitjacket_brown" /obj/item/clothing/suit/toggle/lawyer/orange name = "orange suit jacket" desc = "A foppish dress jacket." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "suitjacket_orange" /obj/item/clothing/suit/toggle/lawyer/atmos name = "light blue jacket" desc = "A foppish dress jacket." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "suitjacket_light_blue" /obj/item/clothing/suit/toggle/labcoat/chemist/side name = "pharmacologist labcoat" desc = "A lab coat that buttons on the side, which provides some protection from chemical spills. It in chemistry colors." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "labcoat_side_chem" /obj/item/clothing/suit/toggle/solgov @@ -53,8 +53,8 @@ body_parts_covered = CHEST|GROIN|ARMS|HANDS icon_state = "coat_solgov" item_state = "coat_solgov" - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' blood_overlay_type = "coat" togglename = "buttons" armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) diff --git a/waspstation/code/modules/clothing/suits/jobs.dm b/whitesands/code/modules/clothing/suits/jobs.dm similarity index 90% rename from waspstation/code/modules/clothing/suits/jobs.dm rename to whitesands/code/modules/clothing/suits/jobs.dm index 08d07d57d73..215fb2e31e3 100644 --- a/waspstation/code/modules/clothing/suits/jobs.dm +++ b/whitesands/code/modules/clothing/suits/jobs.dm @@ -3,8 +3,8 @@ /obj/item/clothing/suit/solgov_trenchcoat name = "solgov trenchcoat" desc = "A solgov official's trenchcoat. Has a lot of pockets." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "trenchcoat_solgov" item_state = "trenchcoat_solgov" body_parts_covered = CHEST|LEGS|ARMS @@ -16,8 +16,8 @@ // Security // /obj/item/clothing/suit/armor/vest/security - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' item_state = "armor" body_parts_covered = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS|HANDS diff --git a/waspstation/code/modules/clothing/suits/labcoat.dm b/whitesands/code/modules/clothing/suits/labcoat.dm similarity index 76% rename from waspstation/code/modules/clothing/suits/labcoat.dm rename to whitesands/code/modules/clothing/suits/labcoat.dm index 0de031cb9be..78343af2cb9 100644 --- a/waspstation/code/modules/clothing/suits/labcoat.dm +++ b/whitesands/code/modules/clothing/suits/labcoat.dm @@ -1,7 +1,7 @@ /obj/item/clothing/suit/toggle/labcoat/brig_phys name = "security medic's labcoat" desc = "A lightly armoured suit that protects against minor chemical spills and rogue patients. Has a dark red stripe on the shoulder." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "labcoat_brig" armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0, fire = 50, acid = 50) diff --git a/waspstation/code/modules/clothing/under/SolGov.dm b/whitesands/code/modules/clothing/under/SolGov.dm similarity index 91% rename from waspstation/code/modules/clothing/under/SolGov.dm rename to whitesands/code/modules/clothing/under/SolGov.dm index cf86d2237e8..01503524fa3 100644 --- a/waspstation/code/modules/clothing/under/SolGov.dm +++ b/whitesands/code/modules/clothing/under/SolGov.dm @@ -1,6 +1,6 @@ /obj/item/clothing/under/solgov - icon = 'waspstation/icons/obj/clothing/under/solgov.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/solgov.dmi' + icon = 'whitesands/icons/obj/clothing/under/solgov.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/solgov.dmi' icon_state = "fatigues" item_state = "fatigues" name = "\improper SolGov fatigues" diff --git a/waspstation/code/modules/clothing/under/accessories.dm b/whitesands/code/modules/clothing/under/accessories.dm similarity index 97% rename from waspstation/code/modules/clothing/under/accessories.dm rename to whitesands/code/modules/clothing/under/accessories.dm index 7ba19bd29c5..76e8f964ea8 100644 --- a/waspstation/code/modules/clothing/under/accessories.dm +++ b/whitesands/code/modules/clothing/under/accessories.dm @@ -53,4 +53,4 @@ name = "solgov waistcoat" desc = "A standard issue waistcoat in solgov colors." icon_state = "solgov_waistcoat" - icon = 'waspstation/icons/obj/clothing/accessories.dmi' + icon = 'whitesands/icons/obj/clothing/accessories.dmi' diff --git a/waspstation/code/modules/clothing/under/jobs/cargo.dm b/whitesands/code/modules/clothing/under/jobs/cargo.dm similarity index 78% rename from waspstation/code/modules/clothing/under/jobs/cargo.dm rename to whitesands/code/modules/clothing/under/jobs/cargo.dm index 3da6114daca..cdfa5fb6fdd 100644 --- a/waspstation/code/modules/clothing/under/jobs/cargo.dm +++ b/whitesands/code/modules/clothing/under/jobs/cargo.dm @@ -5,8 +5,8 @@ /obj/item/clothing/under/suit/qm name = "supply chief suit" desc = "A suit with supply colors, worn by those who lead the supply department." - icon = 'waspstation/icons/obj/clothing/under/cargo.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/cargo.dmi' + icon = 'whitesands/icons/obj/clothing/under/cargo.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/cargo.dmi' icon_state = "supply_chief" fitted = NO_FEMALE_UNIFORM @@ -22,8 +22,8 @@ /obj/item/clothing/under/suit/cargo_tech name = "deliveries officer suit" desc = "A suit with cargo colors, with a pair of shorts..." - icon = 'waspstation/icons/obj/clothing/under/cargo.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/cargo.dmi' + icon = 'whitesands/icons/obj/clothing/under/cargo.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/cargo.dmi' icon_state = "deliveries_officer" fitted = NO_FEMALE_UNIFORM @@ -39,8 +39,8 @@ /obj/item/clothing/under/rank/cargo/tech/mailroom_technician name = "mailroom technician's jumpsuit" desc = "Shorts and lost mail makes up this jumpsuit." - icon = 'waspstation/icons/obj/clothing/under/cargo.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/cargo.dmi' + icon = 'whitesands/icons/obj/clothing/under/cargo.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/cargo.dmi' icon_state = "mailroom_technician" body_parts_covered = CHEST|GROIN|ARMS mutantrace_variation = NO_MUTANTRACE_VARIATION diff --git a/waspstation/code/modules/clothing/under/jobs/centcom.dm b/whitesands/code/modules/clothing/under/jobs/centcom.dm similarity index 91% rename from waspstation/code/modules/clothing/under/jobs/centcom.dm rename to whitesands/code/modules/clothing/under/jobs/centcom.dm index a042ee6e971..257ee82471b 100644 --- a/waspstation/code/modules/clothing/under/jobs/centcom.dm +++ b/whitesands/code/modules/clothing/under/jobs/centcom.dm @@ -1,6 +1,6 @@ /obj/item/clothing/under/rank/centcom icon = 'icons/obj/clothing/under/centcom.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/centcom.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/centcom.dmi' /obj/item/clothing/under/rank/centcom/officer name = "\improper CentCom officer's jumpsuit" diff --git a/waspstation/code/modules/clothing/under/jobs/command.dm b/whitesands/code/modules/clothing/under/jobs/command.dm similarity index 90% rename from waspstation/code/modules/clothing/under/jobs/command.dm rename to whitesands/code/modules/clothing/under/jobs/command.dm index 728466f383c..618bce80fa3 100644 --- a/waspstation/code/modules/clothing/under/jobs/command.dm +++ b/whitesands/code/modules/clothing/under/jobs/command.dm @@ -1,16 +1,16 @@ /obj/item/clothing/under/rank/command desc = "A standard command jumpsuit." name = "command jumpsuit" - icon = 'waspstation/icons/obj/clothing/under/command.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/command.dmi' + icon = 'whitesands/icons/obj/clothing/under/command.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/command.dmi' icon_state = "cmd" item_state = "w_suit" /obj/item/clothing/under/rank/command/skirt desc = "A standard command jumpskirt." name = "command jumpskirt" - icon = 'waspstation/icons/obj/clothing/under/command.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/command.dmi' + icon = 'whitesands/icons/obj/clothing/under/command.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/command.dmi' icon_state = "cmd_skirt" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE diff --git a/waspstation/code/modules/clothing/under/jobs/engineering.dm b/whitesands/code/modules/clothing/under/jobs/engineering.dm similarity index 82% rename from waspstation/code/modules/clothing/under/jobs/engineering.dm rename to whitesands/code/modules/clothing/under/jobs/engineering.dm index f24e8121e06..eedf1911570 100644 --- a/waspstation/code/modules/clothing/under/jobs/engineering.dm +++ b/whitesands/code/modules/clothing/under/jobs/engineering.dm @@ -3,8 +3,8 @@ /obj/item/clothing/under/rank/engineering/engineer/junior name = "junior engineer jumpsuit" desc = "A jumpsuit worn by junior engineers. It has minor radiation shielding." - icon = 'waspstation/icons/obj/clothing/under/engineering.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/engineering.dmi' + icon = 'whitesands/icons/obj/clothing/under/engineering.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/engineering.dmi' icon_state = "junior_engineer" fitted = NO_FEMALE_UNIFORM @@ -18,8 +18,8 @@ /obj/item/clothing/under/rank/engineering/engineer/electrician name = "electrician jumpsuit" desc = "A jumpsuit worn by electricians, made of old insulated gloves. It has minor radiation shielding." - icon = 'waspstation/icons/obj/clothing/under/engineering.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/engineering.dmi' + icon = 'whitesands/icons/obj/clothing/under/engineering.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/engineering.dmi' icon_state = "electrician" fitted = NO_FEMALE_UNIFORM @@ -33,8 +33,8 @@ /obj/item/clothing/under/rank/engineering/engineer/maintenance_tech name = "maintenance technician jumpsuit" desc = "A jumpsuit worn by maintenance technicians, to easily disappear and never be seen again in the maintanance tunnels... It has minor radiation shielding." - icon = 'waspstation/icons/obj/clothing/under/engineering.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/engineering.dmi' + icon = 'whitesands/icons/obj/clothing/under/engineering.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/engineering.dmi' icon_state = "maintenance_tech" fitted = NO_FEMALE_UNIFORM @@ -48,8 +48,8 @@ /obj/item/clothing/under/rank/engineering/engineer/telecomm_specialist name = "telecommunications specialist jumpsuit" desc = "A jumpsuit worn by telecomm specialist, perfect for those who had earned a space communication degree. It has minor radiation shielding." - icon = 'waspstation/icons/obj/clothing/under/engineering.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/engineering.dmi' + icon = 'whitesands/icons/obj/clothing/under/engineering.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/engineering.dmi' icon_state = "telecomm_specialist" fitted = NO_FEMALE_UNIFORM @@ -63,8 +63,8 @@ /obj/item/clothing/under/suit/ce name = "engineering coordinator suit" desc = "A suit with engineering colors, worn by those who lead and have survived the engineering department." - icon = 'waspstation/icons/obj/clothing/under/engineering.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/engineering.dmi' + icon = 'whitesands/icons/obj/clothing/under/engineering.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/engineering.dmi' icon_state = "senior_medical" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 80, "acid" = 40) @@ -82,8 +82,8 @@ /obj/item/clothing/under/suit/senior_engineer name = "senior engineer suit" desc = "A suit with engineering colors, meant to be worn by senior staff." - icon = 'waspstation/icons/obj/clothing/under/engineering.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/engineering.dmi' + icon = 'whitesands/icons/obj/clothing/under/engineering.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/engineering.dmi' icon_state = "senior_engineer" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 60, "acid" = 20) @@ -101,8 +101,8 @@ /obj/item/clothing/under/suit/senior_atmos name = "senior atmospheric technician suit" desc = "A suit with atmospheric colors, meant to be worn by senior staff." - icon = 'waspstation/icons/obj/clothing/under/engineering.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/engineering.dmi' + icon = 'whitesands/icons/obj/clothing/under/engineering.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/engineering.dmi' icon_state = "senior_atmos" fitted = NO_FEMALE_UNIFORM @@ -117,8 +117,8 @@ /obj/item/clothing/under/rank/engineering/atmospheric_technician/life_support_specialist name = "life support specialists's jumpsuit" desc = "It's a jumpsuit worn by life support specialists, who are the ones behind the fact you are able to breath and complain." - icon = 'waspstation/icons/obj/clothing/under/engineering.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/engineering.dmi' + icon = 'whitesands/icons/obj/clothing/under/engineering.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/engineering.dmi' icon_state = "life_support_specialist" resistance_flags = NONE fitted = NO_FEMALE_UNIFORM @@ -134,8 +134,8 @@ /obj/item/clothing/under/rank/engineering/atmospheric_technician/firefighter name = "firefighter's jumpsuit" desc = "It's a jumpsuit worn by firefigthers to help aid in dealing science caused fires. It is made of fire resistant materials." - icon = 'waspstation/icons/obj/clothing/under/engineering.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/engineering.dmi' + icon = 'whitesands/icons/obj/clothing/under/engineering.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/engineering.dmi' icon_state = "firefighter" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 0) //Same fire number as standard engineer uniform fitted = NO_FEMALE_UNIFORM diff --git a/waspstation/code/modules/clothing/under/jobs/medical.dm b/whitesands/code/modules/clothing/under/jobs/medical.dm similarity index 83% rename from waspstation/code/modules/clothing/under/jobs/medical.dm rename to whitesands/code/modules/clothing/under/jobs/medical.dm index 21ed330c3cc..ae95f25356c 100644 --- a/waspstation/code/modules/clothing/under/jobs/medical.dm +++ b/whitesands/code/modules/clothing/under/jobs/medical.dm @@ -3,8 +3,8 @@ /obj/item/clothing/under/rank/medical/chemist/pharmacist name = "pharmacist's jumpsuit" desc = "It's made of a special fiber that gives special protection against biohazards. For those pharmacists that want to improve or worsen the station's health." - icon = 'waspstation/icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/medical.dmi' + icon = 'whitesands/icons/obj/clothing/under/medical.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/medical.dmi' icon_state = "pharmacist" fitted = NO_FEMALE_UNIFORM @@ -17,8 +17,8 @@ /obj/item/clothing/under/rank/medical/chemist/pharmacologist name = "pharmacologist's jumpsuit" desc = "It's made of a special fiber that gives special protection against biohazards. For those pharmacologist one step behind to being evil." - icon = 'waspstation/icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/medical.dmi' + icon = 'whitesands/icons/obj/clothing/under/medical.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/medical.dmi' icon_state = "pharmacologist" fitted = NO_FEMALE_UNIFORM @@ -31,8 +31,8 @@ /obj/item/clothing/under/rank/medical/chemist/junior_chemist name = "junior chemist's jumpsuit" desc = "It's made of a special fiber that gives special protection against biohazards. A jumpsuit for junior chemist staff." - icon = 'waspstation/icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/medical.dmi' + icon = 'whitesands/icons/obj/clothing/under/medical.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/medical.dmi' icon_state = "junior_chemistry" fitted = NO_FEMALE_UNIFORM @@ -46,8 +46,8 @@ /obj/item/clothing/under/rank/medical/psychiatrist name = "white psychiatrist's suit" desc = "A turtleneck for personnel trained to deal with psychological issues, such as terrible work place incidents or the clown's bad jokes. This one has a white turtleneck." - icon = 'waspstation/icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/medical.dmi' + icon = 'whitesands/icons/obj/clothing/under/medical.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/medical.dmi' icon_state = "psychiatrist-white" can_adjust = FALSE @@ -69,8 +69,8 @@ /obj/item/clothing/under/rank/medical/doctor/junior_doctor name = "junior doctor's jumpsuit" desc = "It's made of a special fiber that provides minor protection against biohazards. Worn by the junior medical personnel." - icon = 'waspstation/icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/medical.dmi' + icon = 'whitesands/icons/obj/clothing/under/medical.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/medical.dmi' icon_state = "junior_medical" fitted = NO_FEMALE_UNIFORM @@ -83,8 +83,8 @@ /obj/item/clothing/under/suit/cmo name = "medical director suit" desc = "A suit with medical colors, meant to be worn by those who lead the medical department." - icon = 'waspstation/icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/medical.dmi' + icon = 'whitesands/icons/obj/clothing/under/medical.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/medical.dmi' icon_state = "medical_director" permeability_coefficient = 0.5 @@ -102,16 +102,16 @@ /obj/item/clothing/under/rank/medical/chief_medical_officer/surgeon_general name = "surgeon-general scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is meant to be worn by surgeon-generals." - icon = 'waspstation/icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/medical.dmi' + icon = 'whitesands/icons/obj/clothing/under/medical.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/medical.dmi' icon_state = "surgeon_general" can_adjust = FALSE /obj/item/clothing/under/suit/senior_doctor name = "senior doctor suit" desc = "A suit with medical colors, meant to be worn by senior staff." - icon = 'waspstation/icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/medical.dmi' + icon = 'whitesands/icons/obj/clothing/under/medical.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/medical.dmi' icon_state = "senior_medical" permeability_coefficient = 0.5 @@ -129,8 +129,8 @@ /obj/item/clothing/under/suit/senior_chemist name = "senior chemist suit" desc = "A suit with chemistry colors, meant to be worn by senior staff." - icon = 'waspstation/icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/medical.dmi' + icon = 'whitesands/icons/obj/clothing/under/medical.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/medical.dmi' icon_state = "senior_chemistry" permeability_coefficient = 0.5 @@ -148,8 +148,8 @@ /obj/item/clothing/under/suit/pathologist name = "pathologist suit" desc = "A suit with special fibers that provide minor protection against biohazards. A suit with green pants, provided to pathologists." - icon = 'waspstation/icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/medical.dmi' + icon = 'whitesands/icons/obj/clothing/under/medical.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/medical.dmi' icon_state = "pathologist" permeability_coefficient = 0.5 @@ -167,8 +167,8 @@ /obj/item/clothing/under/rank/medical/paramedic/emt name = "emergency medical technician jumpsuit" desc = "It's made of a special fiber that provides minor protection against biohazards. It has shorts, allowing ease of movement for EMTs." - icon = 'waspstation/icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/medical.dmi' + icon = 'whitesands/icons/obj/clothing/under/medical.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/medical.dmi' icon_state = "emt" body_parts_covered = CHEST|GROIN|ARMS diff --git a/waspstation/code/modules/clothing/under/jobs/rnd.dm b/whitesands/code/modules/clothing/under/jobs/rnd.dm similarity index 80% rename from waspstation/code/modules/clothing/under/jobs/rnd.dm rename to whitesands/code/modules/clothing/under/jobs/rnd.dm index 28ad56a01de..cef260c1225 100644 --- a/waspstation/code/modules/clothing/under/jobs/rnd.dm +++ b/whitesands/code/modules/clothing/under/jobs/rnd.dm @@ -3,8 +3,8 @@ /obj/item/clothing/under/rank/rnd/scientist/junior name = "junior scientist jumpsuit" desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a junior scientist." - icon = 'waspstation/icons/obj/clothing/under/rnd.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/rnd.dmi' + icon = 'whitesands/icons/obj/clothing/under/rnd.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/rnd.dmi' icon_state = "junior" fitted = NO_FEMALE_UNIFORM @@ -18,8 +18,8 @@ /obj/item/clothing/under/rank/rnd/scientist/xenobiologist name = "xenobiologist jumpsuit" desc = "It's made of a special fiber that provides minor protection against biohzards. Worn by xenobiologist who have no qualms in creating abominations against nature." - icon = 'waspstation/icons/obj/clothing/under/rnd.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/rnd.dmi' + icon = 'whitesands/icons/obj/clothing/under/rnd.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/rnd.dmi' icon_state = "xenobiologist" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) @@ -35,8 +35,8 @@ /obj/item/clothing/under/rank/rnd/scientist/nanite name = "nanite researcher jumpsuit" desc = "Worn researchers that study and applies the usage of nanites, now more microscopic things to worry about." - icon = 'waspstation/icons/obj/clothing/under/rnd.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/rnd.dmi' + icon = 'whitesands/icons/obj/clothing/under/rnd.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/rnd.dmi' icon_state = "nanite" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) resistance_flags = NONE @@ -51,8 +51,8 @@ /obj/item/clothing/under/rank/rnd/roboticist/biomech_engineer name = "biomechanical engineer jumpsuit" - icon = 'waspstation/icons/obj/clothing/under/rnd.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/rnd.dmi' + icon = 'whitesands/icons/obj/clothing/under/rnd.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/rnd.dmi' icon_state = "biomech_engineer" fitted = NO_FEMALE_UNIFORM @@ -65,8 +65,8 @@ /obj/item/clothing/under/rank/rnd/roboticist/mech_engineer name = "mechatronic engineer jumpsuit" - icon = 'waspstation/icons/obj/clothing/under/rnd.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/rnd.dmi' + icon = 'whitesands/icons/obj/clothing/under/rnd.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/rnd.dmi' icon_state = "mech_engineer" fitted = NO_FEMALE_UNIFORM @@ -80,8 +80,8 @@ /obj/item/clothing/under/suit/senior_scientist name = "senior scientist suit" desc = "A suit with science colors, meant to be worn by senior staff." - icon = 'waspstation/icons/obj/clothing/under/rnd.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/rnd.dmi' + icon = 'whitesands/icons/obj/clothing/under/rnd.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/rnd.dmi' icon_state = "senior_science" permeability_coefficient = 0.5 @@ -99,8 +99,8 @@ /obj/item/clothing/under/suit/senior_roboticist name = "senior roboticist suit" desc = "A suit with robotics colors, meant to be worn by senior staff." - icon = 'waspstation/icons/obj/clothing/under/rnd.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/rnd.dmi' + icon = 'whitesands/icons/obj/clothing/under/rnd.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/rnd.dmi' icon_state = "senior_roboticist" resistance_flags = NONE diff --git a/waspstation/code/modules/clothing/under/jobs/security.dm b/whitesands/code/modules/clothing/under/jobs/security.dm similarity index 97% rename from waspstation/code/modules/clothing/under/jobs/security.dm rename to whitesands/code/modules/clothing/under/jobs/security.dm index ea1649b96aa..10d4a0ee70a 100644 --- a/waspstation/code/modules/clothing/under/jobs/security.dm +++ b/whitesands/code/modules/clothing/under/jobs/security.dm @@ -14,8 +14,8 @@ */ /obj/item/clothing/under/rank/security - icon = 'waspstation/icons/obj/clothing/under/security.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/security.dmi' + icon = 'whitesands/icons/obj/clothing/under/security.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/security.dmi' // Security Officer // /obj/item/clothing/under/rank/security/officer @@ -189,8 +189,8 @@ /obj/item/clothing/under/rank/prisoner/protected_custody name = "protected custody jumpsuit" desc = "It's standardised Nanotrasen prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position." - icon = 'waspstation/icons/obj/clothing/under/security.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/security.dmi' + icon = 'whitesands/icons/obj/clothing/under/security.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/security.dmi' icon_state = "protected_custody" fitted = NO_FEMALE_UNIFORM diff --git a/waspstation/code/modules/clothing/under/jobs/service.dm b/whitesands/code/modules/clothing/under/jobs/service.dm similarity index 92% rename from waspstation/code/modules/clothing/under/jobs/service.dm rename to whitesands/code/modules/clothing/under/jobs/service.dm index 2600a8d560a..c8f6465ddda 100644 --- a/waspstation/code/modules/clothing/under/jobs/service.dm +++ b/whitesands/code/modules/clothing/under/jobs/service.dm @@ -1,8 +1,8 @@ /obj/item/clothing/under/rank/civilian/janitor name = "janitor's jumpsuit" desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." - icon = 'waspstation/icons/obj/clothing/under/service.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/service.dmi' + icon = 'whitesands/icons/obj/clothing/under/service.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/service.dmi' icon_state = "janitor" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) fitted = NO_FEMALE_UNIFORM diff --git a/waspstation/code/modules/clothing/under/syndicate.dm b/whitesands/code/modules/clothing/under/syndicate.dm similarity index 89% rename from waspstation/code/modules/clothing/under/syndicate.dm rename to whitesands/code/modules/clothing/under/syndicate.dm index b7f68748c57..0e5e5b51a5b 100644 --- a/waspstation/code/modules/clothing/under/syndicate.dm +++ b/whitesands/code/modules/clothing/under/syndicate.dm @@ -4,8 +4,8 @@ icon_state = "jake" armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) alt_covers_chest = TRUE - icon = 'waspstation/icons/obj/clothing/under/syndicate.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/under/syndicate.dmi' + icon = 'whitesands/icons/obj/clothing/under/syndicate.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/under/syndicate.dmi' /datum/outfit/syndicate/intern name = "Syndicate Operative - Intern" diff --git a/waspstation/code/modules/events/borers.dm b/whitesands/code/modules/events/borers.dm similarity index 100% rename from waspstation/code/modules/events/borers.dm rename to whitesands/code/modules/events/borers.dm diff --git a/waspstation/code/modules/food_and_drinks/food/snacks_meat.dm b/whitesands/code/modules/food_and_drinks/food/snacks_meat.dm similarity index 100% rename from waspstation/code/modules/food_and_drinks/food/snacks_meat.dm rename to whitesands/code/modules/food_and_drinks/food/snacks_meat.dm diff --git a/waspstation/code/modules/food_and_drinks/food/snacks_pastry.dm b/whitesands/code/modules/food_and_drinks/food/snacks_pastry.dm similarity index 100% rename from waspstation/code/modules/food_and_drinks/food/snacks_pastry.dm rename to whitesands/code/modules/food_and_drinks/food/snacks_pastry.dm diff --git a/waspstation/code/modules/food_and_drinks/food/snacks_salad.dm b/whitesands/code/modules/food_and_drinks/food/snacks_salad.dm similarity index 100% rename from waspstation/code/modules/food_and_drinks/food/snacks_salad.dm rename to whitesands/code/modules/food_and_drinks/food/snacks_salad.dm diff --git a/waspstation/code/modules/food_and_drinks/food/snacks_soup.dm b/whitesands/code/modules/food_and_drinks/food/snacks_soup.dm similarity index 100% rename from waspstation/code/modules/food_and_drinks/food/snacks_soup.dm rename to whitesands/code/modules/food_and_drinks/food/snacks_soup.dm diff --git a/waspstation/code/modules/food_and_drinks/kitchen_machinery/catgrill.dm b/whitesands/code/modules/food_and_drinks/kitchen_machinery/catgrill.dm similarity index 94% rename from waspstation/code/modules/food_and_drinks/kitchen_machinery/catgrill.dm rename to whitesands/code/modules/food_and_drinks/kitchen_machinery/catgrill.dm index 762d4ec28e8..e9dd319fc56 100644 --- a/waspstation/code/modules/food_and_drinks/kitchen_machinery/catgrill.dm +++ b/whitesands/code/modules/food_and_drinks/kitchen_machinery/catgrill.dm @@ -3,7 +3,7 @@ /obj/machinery/grill/cat name = "catgrill" desc = "Is this what the youngins are into now?" - icon = 'waspstation/icons/obj/kitchen.dmi' + icon = 'whitesands/icons/obj/kitchen.dmi' icon_state = "catgrill_open" anchored = FALSE diff --git a/waspstation/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/whitesands/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm similarity index 96% rename from waspstation/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm rename to whitesands/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 2051b28f067..750ebc3ccd3 100644 --- a/waspstation/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/whitesands/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -4,7 +4,7 @@ /obj/machinery/smartfridge/bloodbank name = "Refrigerated Blood Bank" desc = "A refrigerated storage unit for blood packs." - icon = 'waspstation/icons/obj/vending.dmi' + icon = 'whitesands/icons/obj/vending.dmi' icon_state = "bloodbank" /obj/machinery/smartfridge/bloodbank/accept_check(obj/item/O) //Literally copied bar smartfridge code diff --git a/waspstation/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/whitesands/code/modules/food_and_drinks/recipes/drinks_recipes.dm similarity index 100% rename from waspstation/code/modules/food_and_drinks/recipes/drinks_recipes.dm rename to whitesands/code/modules/food_and_drinks/recipes/drinks_recipes.dm diff --git a/waspstation/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/whitesands/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm similarity index 100% rename from waspstation/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm rename to whitesands/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm diff --git a/waspstation/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/whitesands/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm similarity index 100% rename from waspstation/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm rename to whitesands/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm diff --git a/waspstation/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/whitesands/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm similarity index 100% rename from waspstation/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm rename to whitesands/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm diff --git a/waspstation/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/whitesands/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm similarity index 100% rename from waspstation/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm rename to whitesands/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm diff --git a/waspstation/code/modules/jobs/job.dm b/whitesands/code/modules/jobs/job.dm similarity index 100% rename from waspstation/code/modules/jobs/job.dm rename to whitesands/code/modules/jobs/job.dm diff --git a/waspstation/code/modules/jobs/job_types/_alt_titles.dm b/whitesands/code/modules/jobs/job_types/_alt_titles.dm similarity index 100% rename from waspstation/code/modules/jobs/job_types/_alt_titles.dm rename to whitesands/code/modules/jobs/job_types/_alt_titles.dm diff --git a/waspstation/code/modules/jobs/job_types/brigphys.dm b/whitesands/code/modules/jobs/job_types/brigphys.dm similarity index 94% rename from waspstation/code/modules/jobs/job_types/brigphys.dm rename to whitesands/code/modules/jobs/job_types/brigphys.dm index b4395dfbf29..d7fc7d819c9 100644 --- a/waspstation/code/modules/jobs/job_types/brigphys.dm +++ b/whitesands/code/modules/jobs/job_types/brigphys.dm @@ -9,8 +9,8 @@ minimal_player_age = 7 exp_requirements = 300 exp_type = EXP_TYPE_CREW - wiki_page = "Guide_to_Medicine" //WaspStation Edit - Wikilinks/Warning - special_notice = "You are not a security officer, do not do their job for them. However, you can help them if they need immediate assistance. You are to tend to the medical needs of officers and prisoners." //WaspStation Edit - Wikilinks/Warning + wiki_page = "Guide_to_Medicine" //WS Edit - Wikilinks/Warning + special_notice = "You are not a security officer, do not do their job for them. However, you can help them if they need immediate assistance. You are to tend to the medical needs of officers and prisoners." //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/brig_phys diff --git a/waspstation/code/modules/jobs/job_types/solgov_rep.dm b/whitesands/code/modules/jobs/job_types/solgov_rep.dm similarity index 100% rename from waspstation/code/modules/jobs/job_types/solgov_rep.dm rename to whitesands/code/modules/jobs/job_types/solgov_rep.dm diff --git a/waspstation/code/modules/language/dwarven.dm b/whitesands/code/modules/language/dwarven.dm similarity index 100% rename from waspstation/code/modules/language/dwarven.dm rename to whitesands/code/modules/language/dwarven.dm diff --git a/waspstation/code/modules/language/language_holder.dm b/whitesands/code/modules/language/language_holder.dm similarity index 100% rename from waspstation/code/modules/language/language_holder.dm rename to whitesands/code/modules/language/language_holder.dm diff --git a/waspstation/code/modules/language/mouse.dm b/whitesands/code/modules/language/mouse.dm similarity index 100% rename from waspstation/code/modules/language/mouse.dm rename to whitesands/code/modules/language/mouse.dm diff --git a/waspstation/code/modules/language/spider.dm b/whitesands/code/modules/language/spider.dm similarity index 100% rename from waspstation/code/modules/language/spider.dm rename to whitesands/code/modules/language/spider.dm diff --git a/waspstation/code/modules/library/lib_items.dm b/whitesands/code/modules/library/lib_items.dm similarity index 100% rename from waspstation/code/modules/library/lib_items.dm rename to whitesands/code/modules/library/lib_items.dm diff --git a/waspstation/code/modules/mapping/map_template.dm b/whitesands/code/modules/mapping/map_template.dm similarity index 100% rename from waspstation/code/modules/mapping/map_template.dm rename to whitesands/code/modules/mapping/map_template.dm diff --git a/waspstation/code/modules/mapping/minimaps.dm b/whitesands/code/modules/mapping/minimaps.dm similarity index 100% rename from waspstation/code/modules/mapping/minimaps.dm rename to whitesands/code/modules/mapping/minimaps.dm diff --git a/waspstation/code/modules/mapping/writer.dm b/whitesands/code/modules/mapping/writer.dm similarity index 100% rename from waspstation/code/modules/mapping/writer.dm rename to whitesands/code/modules/mapping/writer.dm diff --git a/waspstation/code/modules/metacoin/metacoin.dm b/whitesands/code/modules/metacoin/metacoin.dm similarity index 100% rename from waspstation/code/modules/metacoin/metacoin.dm rename to whitesands/code/modules/metacoin/metacoin.dm diff --git a/waspstation/code/modules/mining/deepcore/_deepcore.dm b/whitesands/code/modules/mining/deepcore/_deepcore.dm similarity index 98% rename from waspstation/code/modules/mining/deepcore/_deepcore.dm rename to whitesands/code/modules/mining/deepcore/_deepcore.dm index 4883868461c..1fba6dd2071 100644 --- a/waspstation/code/modules/mining/deepcore/_deepcore.dm +++ b/whitesands/code/modules/mining/deepcore/_deepcore.dm @@ -43,7 +43,7 @@ container - The material container component used for those sweet mats \*/ /obj/machinery/deepcore - icon = 'waspstation/icons/obj/machines/deepcore.dmi' + icon = 'whitesands/icons/obj/machines/deepcore.dmi' var/datum/dcm_net/network var/datum/component/material_container/crude/container diff --git a/waspstation/code/modules/mining/deepcore/drill.dm b/whitesands/code/modules/mining/deepcore/drill.dm similarity index 98% rename from waspstation/code/modules/mining/deepcore/drill.dm rename to whitesands/code/modules/mining/deepcore/drill.dm index fb9edbf2f2b..66270c3159f 100644 --- a/waspstation/code/modules/mining/deepcore/drill.dm +++ b/whitesands/code/modules/mining/deepcore/drill.dm @@ -1,7 +1,7 @@ /obj/machinery/deepcore/drill name = "Deep Core Bluespace Drill" desc = "A sophisticated machince capable of extracting ores deep within a planets surface." - icon = 'waspstation/icons/obj/machines/drill.dmi' + icon = 'whitesands/icons/obj/machines/drill.dmi' icon_state = "deep_core_drill" density = TRUE anchored = FALSE diff --git a/waspstation/code/modules/mining/deepcore/equipment.dm b/whitesands/code/modules/mining/deepcore/equipment.dm similarity index 94% rename from waspstation/code/modules/mining/deepcore/equipment.dm rename to whitesands/code/modules/mining/deepcore/equipment.dm index 37e886a66a7..f147cb2644a 100644 --- a/waspstation/code/modules/mining/deepcore/equipment.dm +++ b/whitesands/code/modules/mining/deepcore/equipment.dm @@ -1,7 +1,7 @@ /obj/item/deepcorecapsule name = "deepcore drill deployment capsule" desc = "A deepcore mining drill compressed into an easy-to-deploy capsule." - icon = 'waspstation/icons/obj/mining.dmi' + icon = 'whitesands/icons/obj/mining.dmi' icon_state = "capsule_dcm" w_class = WEIGHT_CLASS_TINY var/to_deploy = /obj/machinery/deepcore/drill diff --git a/waspstation/code/modules/mining/deepcore/hopper.dm b/whitesands/code/modules/mining/deepcore/hopper.dm similarity index 100% rename from waspstation/code/modules/mining/deepcore/hopper.dm rename to whitesands/code/modules/mining/deepcore/hopper.dm diff --git a/waspstation/code/modules/mining/deepcore/hub.dm b/whitesands/code/modules/mining/deepcore/hub.dm similarity index 100% rename from waspstation/code/modules/mining/deepcore/hub.dm rename to whitesands/code/modules/mining/deepcore/hub.dm diff --git a/waspstation/code/modules/mining/deepcore/ore_vein.dm b/whitesands/code/modules/mining/deepcore/ore_vein.dm similarity index 100% rename from waspstation/code/modules/mining/deepcore/ore_vein.dm rename to whitesands/code/modules/mining/deepcore/ore_vein.dm diff --git a/waspstation/code/modules/mining/equipment/explorer_gear.dm b/whitesands/code/modules/mining/equipment/explorer_gear.dm similarity index 81% rename from waspstation/code/modules/mining/equipment/explorer_gear.dm rename to whitesands/code/modules/mining/equipment/explorer_gear.dm index 079aa241e48..ed67a0ffad4 100644 --- a/waspstation/code/modules/mining/equipment/explorer_gear.dm +++ b/whitesands/code/modules/mining/equipment/explorer_gear.dm @@ -1,10 +1,10 @@ /obj/item/clothing/suit/hooded/survivor name = "survivor suit" desc = "A ragged makeshift suit resembling the explorer suit. It's been repaired so many times it's hard to tell if it's more suit or patch." - icon = 'waspstation/icons/obj/clothing/suits.dmi' - lefthand_file = 'waspstation/icons/mob/inhands/clothing/lefthand.dmi' - righthand_file = 'waspstation/icons/mob/inhands/clothing/righthand.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/suits.dmi' + icon = 'whitesands/icons/obj/clothing/suits.dmi' + lefthand_file = 'whitesands/icons/mob/inhands/clothing/lefthand.dmi' + righthand_file = 'whitesands/icons/mob/inhands/clothing/righthand.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/suits.dmi' icon_state = "survivor_suit" item_state = "survivor_suit" body_parts_covered = CHEST|GROIN|LEGS|ARMS @@ -20,8 +20,8 @@ /obj/item/clothing/head/hooded/survivor_hood name = "survivor hood" desc = "A loose-fitting hood, patched up with sealant and adhesive. Somewhat protects the head from the environment, but gets the job done." - icon = 'waspstation/icons/obj/clothing/hats.dmi' - mob_overlay_icon = 'waspstation/icons/mob/clothing/head.dmi' + icon = 'whitesands/icons/obj/clothing/hats.dmi' + mob_overlay_icon = 'whitesands/icons/mob/clothing/head.dmi' icon_state = "survivor_hood" suit = /obj/item/clothing/suit/hooded/survivor body_parts_covered = HEAD diff --git a/waspstation/code/modules/mining/lavaland/ash_flora.dm b/whitesands/code/modules/mining/lavaland/ash_flora.dm similarity index 95% rename from waspstation/code/modules/mining/lavaland/ash_flora.dm rename to whitesands/code/modules/mining/lavaland/ash_flora.dm index ddda0f1242e..ef9087d2bea 100644 --- a/waspstation/code/modules/mining/lavaland/ash_flora.dm +++ b/whitesands/code/modules/mining/lavaland/ash_flora.dm @@ -10,7 +10,7 @@ return 1 /obj/structure/flora/ash/whitesands - icon = 'waspstation/icons/obj/lavaland/newlavalandplants.dmi' + icon = 'whitesands/icons/obj/lavaland/newlavalandplants.dmi' /*/obj/structure/flora/ash/whitesands/fern Need sprats name = "cave fern" @@ -61,7 +61,7 @@ //SNACKS /obj/item/reagent_containers/food/snacks/grown/ash_flora/whitesands - icon = 'waspstation/icons/obj/lavaland/newlavalandplants.dmi' + icon = 'whitesands/icons/obj/lavaland/newlavalandplants.dmi' /obj/item/reagent_containers/food/snacks/grown/ash_flora/whitesands/fern name = "fern leaf" @@ -90,8 +90,8 @@ //SEEDS /obj/item/seeds/lavaland/whitesands - icon = 'waspstation/icons/obj/lavaland/newlavalandplants.dmi' - growing_icon = 'waspstation/icons/obj/lavaland/newlavalandplants.dmi' + icon = 'whitesands/icons/obj/lavaland/newlavalandplants.dmi' + growing_icon = 'whitesands/icons/obj/lavaland/newlavalandplants.dmi' species = "fern" // begone test growthstages = 2 diff --git a/waspstation/code/modules/mining/ores_coins.dm b/whitesands/code/modules/mining/ores_coins.dm similarity index 83% rename from waspstation/code/modules/mining/ores_coins.dm rename to whitesands/code/modules/mining/ores_coins.dm index 250e38f461f..1730c8e47a4 100644 --- a/waspstation/code/modules/mining/ores_coins.dm +++ b/whitesands/code/modules/mining/ores_coins.dm @@ -1,7 +1,7 @@ /obj/item/stack/ore/glass/whitesands name = "white sand pile" - icon = 'waspstation/icons/obj/mining.dmi' + icon = 'whitesands/icons/obj/mining.dmi' icon_state = "whitesands" item_state = "whitesands" singular_name = "white sand pile" diff --git a/waspstation/code/modules/mob/emote.dm b/whitesands/code/modules/mob/emote.dm similarity index 82% rename from waspstation/code/modules/mob/emote.dm rename to whitesands/code/modules/mob/emote.dm index 015eb6cf2ae..d43c9b0a27f 100644 --- a/waspstation/code/modules/mob/emote.dm +++ b/whitesands/code/modules/mob/emote.dm @@ -1,4 +1,4 @@ -//Waspstation Emotes +//WS Emotes /datum/emote/speen key = "speen" @@ -12,9 +12,9 @@ if(.) user.spin(20, 1) if(isobserver(user) && prob(90)) //Speening in their grave - user.playsound_local(get_turf(user), 'waspstation/sound/voice/speen.ogg', 50, TRUE) + user.playsound_local(get_turf(user), 'whitesands/sound/voice/speen.ogg', 50, TRUE) return - playsound(user, 'waspstation/sound/voice/speen.ogg', 50, 1, -1) + playsound(user, 'whitesands/sound/voice/speen.ogg', 50, 1, -1) if((iscyborg(user) || isanimal(user)) && user.has_buckled_mobs()) var/mob/living/L = user var/datum/component/riding/riding_datum = L.GetComponent(/datum/component/riding) diff --git a/waspstation/code/modules/mob/living/brain/posibrain.dm b/whitesands/code/modules/mob/living/brain/posibrain.dm similarity index 100% rename from waspstation/code/modules/mob/living/brain/posibrain.dm rename to whitesands/code/modules/mob/living/brain/posibrain.dm diff --git a/waspstation/code/modules/mob/living/carbon/human/human.dm b/whitesands/code/modules/mob/living/carbon/human/human.dm similarity index 100% rename from waspstation/code/modules/mob/living/carbon/human/human.dm rename to whitesands/code/modules/mob/living/carbon/human/human.dm diff --git a/waspstation/code/modules/mob/living/carbon/human/life.dm b/whitesands/code/modules/mob/living/carbon/human/life.dm similarity index 100% rename from waspstation/code/modules/mob/living/carbon/human/life.dm rename to whitesands/code/modules/mob/living/carbon/human/life.dm diff --git a/waspstation/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/whitesands/code/modules/mob/living/carbon/human/species_types/dwarves.dm similarity index 100% rename from waspstation/code/modules/mob/living/carbon/human/species_types/dwarves.dm rename to whitesands/code/modules/mob/living/carbon/human/species_types/dwarves.dm diff --git a/waspstation/code/modules/mob/living/carbon/human/species_types/spider.dm b/whitesands/code/modules/mob/living/carbon/human/species_types/spider.dm similarity index 99% rename from waspstation/code/modules/mob/living/carbon/human/species_types/spider.dm rename to whitesands/code/modules/mob/living/carbon/human/species_types/spider.dm index 290e989f7ad..544c8c4f40c 100644 --- a/waspstation/code/modules/mob/living/carbon/human/species_types/spider.dm +++ b/whitesands/code/modules/mob/living/carbon/human/species_types/spider.dm @@ -230,7 +230,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt")) description = "A glowing toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/spider - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "silk" /datum/chemical_reaction/mutationtoxin/arachnid diff --git a/waspstation/code/modules/mob/living/carbon/human/species_types/squidpeople.dm b/whitesands/code/modules/mob/living/carbon/human/species_types/squidpeople.dm similarity index 95% rename from waspstation/code/modules/mob/living/carbon/human/species_types/squidpeople.dm rename to whitesands/code/modules/mob/living/carbon/human/species_types/squidpeople.dm index 14453638cf4..d2d535aef3d 100644 --- a/waspstation/code/modules/mob/living/carbon/human/species_types/squidpeople.dm +++ b/whitesands/code/modules/mob/living/carbon/human/species_types/squidpeople.dm @@ -18,7 +18,7 @@ attack_verb = "slap" attack_sound = 'sound/weapons/slap.ogg' miss_sound = 'sound/weapons/punchmiss.ogg' - special_step_sounds = list('waspstation/sound/effects/footstep/squid1.ogg', 'waspstation/sound/effects/footstep/squid2.ogg', 'waspstation/sound/effects/footstep/squid3.ogg') + special_step_sounds = list('whitesands/sound/effects/footstep/squid1.ogg', 'whitesands/sound/effects/footstep/squid2.ogg', 'whitesands/sound/effects/footstep/squid3.ogg') disliked_food = JUNKFOOD liked_food = VEGETABLES | MEAT toxic_food = FRIED diff --git a/waspstation/code/modules/mob/living/silicon/ai/ai.dm b/whitesands/code/modules/mob/living/silicon/ai/ai.dm similarity index 100% rename from waspstation/code/modules/mob/living/silicon/ai/ai.dm rename to whitesands/code/modules/mob/living/silicon/ai/ai.dm diff --git a/waspstation/code/modules/mob/living/silicon/robot/update_icons.dm b/whitesands/code/modules/mob/living/silicon/robot/update_icons.dm similarity index 91% rename from waspstation/code/modules/mob/living/silicon/robot/update_icons.dm rename to whitesands/code/modules/mob/living/silicon/robot/update_icons.dm index f2a07c47601..e9e503ce6df 100644 --- a/waspstation/code/modules/mob/living/silicon/robot/update_icons.dm +++ b/whitesands/code/modules/mob/living/silicon/robot/update_icons.dm @@ -1,9 +1,9 @@ /mob/living/silicon/robot/update_icons() cut_overlays() icon_state = module.cyborg_base_icon - //Waspstation changes - Thanks Cit - Allows modules to use different icon files + //WS changes - Thanks Cit - Allows modules to use different icon files icon = (module.cyborg_icon_override ? module.cyborg_icon_override : initial(icon)) - //End Wasp Changes + //EndWS Changes if(module.cyborg_base_icon == "robot") icon = 'icons/mob/robots.dmi' pixel_x = initial(pixel_x) diff --git a/waspstation/code/modules/mob/living/simple_animal/corpse.dm b/whitesands/code/modules/mob/living/simple_animal/corpse.dm similarity index 100% rename from waspstation/code/modules/mob/living/simple_animal/corpse.dm rename to whitesands/code/modules/mob/living/simple_animal/corpse.dm diff --git a/waspstation/code/modules/mob/living/simple_animal/friendly/gator.dm b/whitesands/code/modules/mob/living/simple_animal/friendly/gator.dm similarity index 94% rename from waspstation/code/modules/mob/living/simple_animal/friendly/gator.dm rename to whitesands/code/modules/mob/living/simple_animal/friendly/gator.dm index 7882e37e254..94cb0f15426 100644 --- a/waspstation/code/modules/mob/living/simple_animal/friendly/gator.dm +++ b/whitesands/code/modules/mob/living/simple_animal/friendly/gator.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/retaliate/gator/steppy name = "Steppy" desc = "Cargo's pet gator. Is he being detained!?" - icon = 'waspstation/icons/mob/pets.dmi' + icon = 'whitesands/icons/mob/pets.dmi' icon_state = "steppy" icon_living = "steppy" icon_dead ="steppy_dead" diff --git a/waspstation/code/modules/mob/living/simple_animal/friendly/snake.dm b/whitesands/code/modules/mob/living/simple_animal/friendly/snake.dm similarity index 98% rename from waspstation/code/modules/mob/living/simple_animal/friendly/snake.dm rename to whitesands/code/modules/mob/living/simple_animal/friendly/snake.dm index ded3f1922dc..ef24e9aaaa5 100644 --- a/waspstation/code/modules/mob/living/simple_animal/friendly/snake.dm +++ b/whitesands/code/modules/mob/living/simple_animal/friendly/snake.dm @@ -1,5 +1,5 @@ /mob/living/simple_animal/hostile/retaliate/poison/snake - var/glasses_overlay_file = 'waspstation/icons/mob/pets.dmi' + var/glasses_overlay_file = 'whitesands/icons/mob/pets.dmi' var/obj/item/clothing/glasses/glasses = null //snek glasses /mob/living/simple_animal/hostile/retaliate/poison/snake/say(message, bubble_type, list/spans, sanitize, datum/language/language, ignore_spam, forced) @@ -79,7 +79,7 @@ /mob/living/simple_animal/hostile/retaliate/poison/snake/bookworm name = "Bookworm" - icon = 'waspstation/icons/mob/pets.dmi' + icon = 'whitesands/icons/mob/pets.dmi' icon_state = "bookworm" icon_living = "bookworm" icon_dead = "bookworm_dead" diff --git a/waspstation/code/modules/mob/living/simple_animal/hostile/hostile.dm b/whitesands/code/modules/mob/living/simple_animal/hostile/hostile.dm similarity index 100% rename from waspstation/code/modules/mob/living/simple_animal/hostile/hostile.dm rename to whitesands/code/modules/mob/living/simple_animal/hostile/hostile.dm diff --git a/waspstation/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/whitesands/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm similarity index 100% rename from waspstation/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm rename to whitesands/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm diff --git a/waspstation/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/whitesands/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm similarity index 100% rename from waspstation/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm rename to whitesands/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm diff --git a/waspstation/code/modules/mob/living/simple_animal/hostile/whitesands/survivors.dm b/whitesands/code/modules/mob/living/simple_animal/hostile/whitesands/survivors.dm similarity index 98% rename from waspstation/code/modules/mob/living/simple_animal/hostile/whitesands/survivors.dm rename to whitesands/code/modules/mob/living/simple_animal/hostile/whitesands/survivors.dm index 72ed8f61d11..d75f20810a8 100644 --- a/waspstation/code/modules/mob/living/simple_animal/hostile/whitesands/survivors.dm +++ b/whitesands/code/modules/mob/living/simple_animal/hostile/whitesands/survivors.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/whitesands name = "Whitesands Inhabitant" desc = "If you can read this, yell at a coder!" - icon = 'waspstation/icons/mob/simple_human.dmi' + icon = 'whitesands/icons/mob/simple_human.dmi' icon_state = "survivor_base" icon_living = "survivor_base" icon_dead = null diff --git a/waspstation/code/modules/mob/living/simple_animal/hostile/zombie.dm b/whitesands/code/modules/mob/living/simple_animal/hostile/zombie.dm similarity index 82% rename from waspstation/code/modules/mob/living/simple_animal/hostile/zombie.dm rename to whitesands/code/modules/mob/living/simple_animal/hostile/zombie.dm index 42f098c9ebd..5834540f0f9 100644 --- a/waspstation/code/modules/mob/living/simple_animal/hostile/zombie.dm +++ b/whitesands/code/modules/mob/living/simple_animal/hostile/zombie.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/zombie/leatherman name = "Leatherman" desc = "Fuck you!" - icon = 'waspstation/icons/mob/simple_human.dmi' + icon = 'whitesands/icons/mob/simple_human.dmi' icon_state = "zombie_leather" icon_living = "zombie_leather" maxHealth = 60 diff --git a/waspstation/code/modules/mob/say_vr.dm b/whitesands/code/modules/mob/say_vr.dm similarity index 97% rename from waspstation/code/modules/mob/say_vr.dm rename to whitesands/code/modules/mob/say_vr.dm index b65712d4f9c..18950b4e9e1 100644 --- a/waspstation/code/modules/mob/say_vr.dm +++ b/whitesands/code/modules/mob/say_vr.dm @@ -10,7 +10,7 @@ usr << "No." var/msg = input(usr,"Set the flavor text in your 'examine' verb. Can also be used for OOC notes about your character.","Flavor Text",html_decode(flavor_text)) as message|null - if(msg) //Waspstation edit - "Cancel" does not clear flavor text + if(msg) //WS edit - "Cancel" does not clear flavor text msg = copytext(msg, 1, MAX_MESSAGE_LEN) msg = html_encode(msg) @@ -44,7 +44,7 @@ proc/get_top_level_mob(var/mob/S) /* -SUBTLER //WaspStation - Subtle emotes +SUBTLER //WS - Subtle emotes */ /datum/emote/living/subtler diff --git a/waspstation/code/modules/movespeed/modifiers/mobs.dm b/whitesands/code/modules/movespeed/modifiers/mobs.dm similarity index 100% rename from waspstation/code/modules/movespeed/modifiers/mobs.dm rename to whitesands/code/modules/movespeed/modifiers/mobs.dm diff --git a/waspstation/code/modules/movespeed/modifiers/reagents.dm b/whitesands/code/modules/movespeed/modifiers/reagents.dm similarity index 100% rename from waspstation/code/modules/movespeed/modifiers/reagents.dm rename to whitesands/code/modules/movespeed/modifiers/reagents.dm diff --git a/waspstation/code/modules/overmap/_overmap.dm b/whitesands/code/modules/overmap/_overmap.dm similarity index 98% rename from waspstation/code/modules/overmap/_overmap.dm rename to whitesands/code/modules/overmap/_overmap.dm index 063389d3d31..8843f00e2e8 100644 --- a/waspstation/code/modules/overmap/_overmap.dm +++ b/whitesands/code/modules/overmap/_overmap.dm @@ -1,6 +1,6 @@ /* OVERMAP TURFS */ /turf/open/overmap - icon = 'waspstation/icons/turf/overmap.dmi' + icon = 'whitesands/icons/turf/overmap.dmi' icon_state = "overmap" initial_gas_mix = AIRLESS_ATMOS @@ -22,7 +22,7 @@ numbers += list("[round(x/10)]","[round(x%10)]") for(var/i = 1 to numbers.len) - var/image/I = image('waspstation/icons/effects/numbers.dmi',numbers[i]) + var/image/I = image('whitesands/icons/effects/numbers.dmi',numbers[i]) I.pixel_x = 5*i - 2 I.pixel_y = world.icon_size/2 - 3 if(y == 1) @@ -60,7 +60,7 @@ /obj/structure/overmap name = "overmap object" desc = "An unknown celestial object." - icon = 'waspstation/icons/effects/overmap.dmi' + icon = 'whitesands/icons/effects/overmap.dmi' icon_state = "object" ///ID, literally the most important thing var/id diff --git a/waspstation/code/modules/overmap/events.dm b/whitesands/code/modules/overmap/events.dm similarity index 100% rename from waspstation/code/modules/overmap/events.dm rename to whitesands/code/modules/overmap/events.dm diff --git a/waspstation/code/modules/overmap/helm.dm b/whitesands/code/modules/overmap/helm.dm similarity index 100% rename from waspstation/code/modules/overmap/helm.dm rename to whitesands/code/modules/overmap/helm.dm diff --git a/waspstation/code/modules/overmap/nav.dm b/whitesands/code/modules/overmap/nav.dm similarity index 100% rename from waspstation/code/modules/overmap/nav.dm rename to whitesands/code/modules/overmap/nav.dm diff --git a/waspstation/code/modules/overmap/ships/_ships.dm b/whitesands/code/modules/overmap/ships/_ships.dm similarity index 99% rename from waspstation/code/modules/overmap/ships/_ships.dm rename to whitesands/code/modules/overmap/ships/_ships.dm index af5e0fd08c5..e905ea53858 100644 --- a/waspstation/code/modules/overmap/ships/_ships.dm +++ b/whitesands/code/modules/overmap/ships/_ships.dm @@ -8,7 +8,7 @@ /obj/structure/overmap/ship name = "overmap vessel" desc = "A spacefaring vessel." - icon = 'waspstation/icons/effects/overmap.dmi' + icon = 'whitesands/icons/effects/overmap.dmi' icon_state = "ship" ///Prefix of all the icons used by the ship. ([base_icon_state]_moving and [base_icon_state]_damaged) base_icon_state = "ship" diff --git a/waspstation/code/modules/overmap/ships/simulated.dm b/whitesands/code/modules/overmap/ships/simulated.dm similarity index 100% rename from waspstation/code/modules/overmap/ships/simulated.dm rename to whitesands/code/modules/overmap/ships/simulated.dm diff --git a/waspstation/code/modules/paperwork/pen.dm b/whitesands/code/modules/paperwork/pen.dm similarity index 100% rename from waspstation/code/modules/paperwork/pen.dm rename to whitesands/code/modules/paperwork/pen.dm diff --git a/waspstation/code/modules/power/antimatter/containment_jar.dm b/whitesands/code/modules/power/antimatter/containment_jar.dm similarity index 100% rename from waspstation/code/modules/power/antimatter/containment_jar.dm rename to whitesands/code/modules/power/antimatter/containment_jar.dm diff --git a/waspstation/code/modules/power/antimatter/control.dm b/whitesands/code/modules/power/antimatter/control.dm similarity index 100% rename from waspstation/code/modules/power/antimatter/control.dm rename to whitesands/code/modules/power/antimatter/control.dm diff --git a/waspstation/code/modules/power/antimatter/shielding.dm b/whitesands/code/modules/power/antimatter/shielding.dm similarity index 100% rename from waspstation/code/modules/power/antimatter/shielding.dm rename to whitesands/code/modules/power/antimatter/shielding.dm diff --git a/waspstation/code/modules/power/cell.dm b/whitesands/code/modules/power/cell.dm similarity index 91% rename from waspstation/code/modules/power/cell.dm rename to whitesands/code/modules/power/cell.dm index 1aa58df9c99..fa102a3062e 100644 --- a/waspstation/code/modules/power/cell.dm +++ b/whitesands/code/modules/power/cell.dm @@ -1,11 +1,11 @@ /obj/item/stock_parts/cell/gun name = "weapon power cell" - icon = 'waspstation/icons/obj/power.dmi' + icon = 'whitesands/icons/obj/power.dmi' icon_state = "g-cell" maxcharge = 10000 custom_materials = list(/datum/material/glass=60) chargerate = 1500 - rating = 0 //gun batteries now incompatible with RPED Waspstation edit + rating = 0 //gun batteries now incompatible with RPED WS edit /obj/item/stock_parts/cell/gun/empty/Initialize() . = ..() @@ -53,7 +53,7 @@ /obj/item/stock_parts/cell/gun/SolGov name = "SolGov power cell" - icon = 'waspstation/icons/obj/power.dmi' + icon = 'whitesands/icons/obj/power.dmi' icon_state = "g-cell" maxcharge = 8000 custom_materials = list(/datum/material/glass=60) diff --git a/waspstation/code/modules/projectiles/ammunition/ballistic/rifle.dm b/whitesands/code/modules/projectiles/ammunition/ballistic/rifle.dm similarity index 100% rename from waspstation/code/modules/projectiles/ammunition/ballistic/rifle.dm rename to whitesands/code/modules/projectiles/ammunition/ballistic/rifle.dm diff --git a/waspstation/code/modules/projectiles/ammunition/ballistic/smg.dm b/whitesands/code/modules/projectiles/ammunition/ballistic/smg.dm similarity index 84% rename from waspstation/code/modules/projectiles/ammunition/ballistic/smg.dm rename to whitesands/code/modules/projectiles/ammunition/ballistic/smg.dm index fa1dfd99a03..3cee790ae55 100644 --- a/waspstation/code/modules/projectiles/ammunition/ballistic/smg.dm +++ b/whitesands/code/modules/projectiles/ammunition/ballistic/smg.dm @@ -1,7 +1,7 @@ /obj/item/ammo_casing/caseless/c47x33mm name = "4.73×33mm caseless round" desc = "A 4.73×33mm caseless round." - icon = 'waspstation/icons/obj/ammo.dmi' + icon = 'whitesands/icons/obj/ammo.dmi' icon_state = "caseless" caliber = "4.73×33mm caseless" projectile_type = /obj/projectile/bullet/c47x33mm @@ -9,7 +9,7 @@ /obj/item/ammo_casing/caseless/c556mmHITP name = "5.56mm HITP caseless round" desc = "A 5.56mm HITP caseless round." - icon = 'waspstation/icons/obj/ammo.dmi' + icon = 'whitesands/icons/obj/ammo.dmi' icon_state = "caseless" caliber = "5.56mm HITP caseless" projectile_type = /obj/projectile/bullet/c556mmHITP diff --git a/waspstation/code/modules/projectiles/boxes_magazines/containers.dm b/whitesands/code/modules/projectiles/boxes_magazines/containers.dm similarity index 100% rename from waspstation/code/modules/projectiles/boxes_magazines/containers.dm rename to whitesands/code/modules/projectiles/boxes_magazines/containers.dm diff --git a/waspstation/code/modules/projectiles/boxes_magazines/external/rifle.dm b/whitesands/code/modules/projectiles/boxes_magazines/external/rifle.dm similarity index 87% rename from waspstation/code/modules/projectiles/boxes_magazines/external/rifle.dm rename to whitesands/code/modules/projectiles/boxes_magazines/external/rifle.dm index 355a8f11582..710e4987580 100644 --- a/waspstation/code/modules/projectiles/boxes_magazines/external/rifle.dm +++ b/whitesands/code/modules/projectiles/boxes_magazines/external/rifle.dm @@ -1,6 +1,6 @@ /obj/item/ammo_box/magazine/rifle47x33mm name = "SolGov AR magazine (4.73×33mm caseless)" - icon = 'waspstation/icons/obj/ammo.dmi' + icon = 'whitesands/icons/obj/ammo.dmi' icon_state = "47x33mm-50" ammo_type = /obj/item/ammo_casing/caseless/c47x33mm caliber = "4.73×33mm caseless" @@ -12,7 +12,7 @@ /obj/item/ammo_box/magazine/aks74u name = "AKS-74U (5.45x39mm cartridge)" - icon = 'waspstation/icons/obj/ammo.dmi' + icon = 'whitesands/icons/obj/ammo.dmi' icon_state = "aks74u_mag" ammo_type = /obj/item/ammo_casing/ballistic/a545_39 caliber = "5.45x39mm" diff --git a/waspstation/code/modules/projectiles/boxes_magazines/external/smg.dm b/whitesands/code/modules/projectiles/boxes_magazines/external/smg.dm similarity index 89% rename from waspstation/code/modules/projectiles/boxes_magazines/external/smg.dm rename to whitesands/code/modules/projectiles/boxes_magazines/external/smg.dm index 1595a2f682a..ef01d66c973 100644 --- a/waspstation/code/modules/projectiles/boxes_magazines/external/smg.dm +++ b/whitesands/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -1,6 +1,6 @@ /obj/item/ammo_box/magazine/pistol556mm name = "handgun magazine (5.56mm HITP caseless)" - icon = 'waspstation/icons/obj/ammo.dmi' + icon = 'whitesands/icons/obj/ammo.dmi' icon_state = "5.56mmHITP-12" //ok i did it ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP caliber = "5.56mm HITP caseless" diff --git a/waspstation/code/modules/projectiles/boxes_magazines/internal/_derringer.dm b/whitesands/code/modules/projectiles/boxes_magazines/internal/_derringer.dm similarity index 100% rename from waspstation/code/modules/projectiles/boxes_magazines/internal/_derringer.dm rename to whitesands/code/modules/projectiles/boxes_magazines/internal/_derringer.dm diff --git a/waspstation/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/whitesands/code/modules/projectiles/boxes_magazines/internal/rifle.dm similarity index 100% rename from waspstation/code/modules/projectiles/boxes_magazines/internal/rifle.dm rename to whitesands/code/modules/projectiles/boxes_magazines/internal/rifle.dm diff --git a/waspstation/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/whitesands/code/modules/projectiles/boxes_magazines/internal/shotgun.dm similarity index 100% rename from waspstation/code/modules/projectiles/boxes_magazines/internal/shotgun.dm rename to whitesands/code/modules/projectiles/boxes_magazines/internal/shotgun.dm diff --git a/waspstation/code/modules/projectiles/boxes_magazines/pistol.dm b/whitesands/code/modules/projectiles/boxes_magazines/pistol.dm similarity index 100% rename from waspstation/code/modules/projectiles/boxes_magazines/pistol.dm rename to whitesands/code/modules/projectiles/boxes_magazines/pistol.dm diff --git a/waspstation/code/modules/projectiles/guns/ballistic/automatic.dm b/whitesands/code/modules/projectiles/guns/ballistic/automatic.dm similarity index 88% rename from waspstation/code/modules/projectiles/guns/ballistic/automatic.dm rename to whitesands/code/modules/projectiles/guns/ballistic/automatic.dm index e523270b27c..dfb569a3b53 100644 --- a/waspstation/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/whitesands/code/modules/projectiles/guns/ballistic/automatic.dm @@ -2,7 +2,7 @@ name = "SolGov assault rifle" desc = "The end result of 12 years of work by SolarGarrison's R&D division. Chambered in 4.73×33mm caseless ammunition." icon_state = "solar" - icon = 'waspstation/icons/obj/guns/projectile.dmi' + icon = 'whitesands/icons/obj/guns/projectile.dmi' item_state = "arg" mag_type = /obj/item/ammo_box/magazine/rifle47x33mm can_suppress = FALSE @@ -15,7 +15,7 @@ /obj/item/gun/ballistic/automatic/pistol/commander name = "\improper Commander" desc = "A modification on the classic 1911 handgun, this one is chambered in 9mm. Much like its predecessor, it suffers from low capacity." - icon = 'waspstation/icons/obj/guns/projectile.dmi' + icon = 'whitesands/icons/obj/guns/projectile.dmi' icon_state = "commander" w_class = WEIGHT_CLASS_NORMAL mag_type = /obj/item/ammo_box/magazine/co9mm @@ -27,7 +27,7 @@ /obj/item/gun/ballistic/automatic/pistol/solgov name = "SolGov M9C" desc = "Known formally as the M9A5C, this is a compact caseless ammo handgun made for switching to when your primary runs empty on it's mag." - icon = 'waspstation/icons/obj/guns/projectile.dmi' + icon = 'whitesands/icons/obj/guns/projectile.dmi' icon_state = "solm9c" weapon_weight = WEAPON_LIGHT w_class = WEIGHT_CLASS_SMALL @@ -39,7 +39,7 @@ A pre-FTL era carbine, the \"curio\" status of the weapon and its relative cheap cost to manufacture make it perfect for colonists on a budget looking to license firearms for local manufacture. "} - icon = 'waspstation/icons/obj/guns/projectile.dmi' + icon = 'whitesands/icons/obj/guns/projectile.dmi' icon_state = "aks74u" weapon_weight = WEAPON_MEDIUM w_class = WEIGHT_CLASS_NORMAL diff --git a/waspstation/code/modules/projectiles/guns/ballistic/derringer.dm b/whitesands/code/modules/projectiles/guns/ballistic/derringer.dm similarity index 96% rename from waspstation/code/modules/projectiles/guns/ballistic/derringer.dm rename to whitesands/code/modules/projectiles/guns/ballistic/derringer.dm index 446b9383366..1899676e145 100644 --- a/waspstation/code/modules/projectiles/guns/ballistic/derringer.dm +++ b/whitesands/code/modules/projectiles/guns/ballistic/derringer.dm @@ -1,7 +1,7 @@ /obj/item/gun/ballistic/derringer name = ".38 Derringer" desc = "A easily consealable derringer. Uses .38 ammo" - icon = 'waspstation/icons/obj/guns/projectile.dmi' + icon = 'whitesands/icons/obj/guns/projectile.dmi' icon_state = "derringer" mag_type = /obj/item/ammo_box/magazine/internal/derr38 fire_sound = 'sound/weapons/gun/revolver/shot_alt.ogg' diff --git a/waspstation/code/modules/projectiles/guns/ballistic/rifle.dm b/whitesands/code/modules/projectiles/guns/ballistic/rifle.dm similarity index 71% rename from waspstation/code/modules/projectiles/guns/ballistic/rifle.dm rename to whitesands/code/modules/projectiles/guns/ballistic/rifle.dm index 10d2ff3aab6..e7dad03c416 100644 --- a/waspstation/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/whitesands/code/modules/projectiles/guns/ballistic/rifle.dm @@ -5,12 +5,12 @@ this rifle has seen its share of part replacements, repairs, and bubba-hack-jobs to keep it serviceable. Use at your own risk. "} - icon = 'waspstation/icons/obj/guns/projectile.dmi' + icon = 'whitesands/icons/obj/guns/projectile.dmi' icon_state = "crackhead_rifle" item_state = "crackhead_rifle" weapon_weight = WEAPON_MEDIUM w_class = WEIGHT_CLASS_NORMAL pin = /obj/item/firing_pin/explorer mag_type = /obj/item/ammo_box/magazine/internal/boltaction/polymer - lefthand_file = 'waspstation/icons/mob/inhands/weapons/64x_guns_left.dmi' - righthand_file = 'waspstation/icons/mob/inhands/weapons/64x_guns_right.dmi' + lefthand_file = 'whitesands/icons/mob/inhands/weapons/64x_guns_left.dmi' + righthand_file = 'whitesands/icons/mob/inhands/weapons/64x_guns_right.dmi' diff --git a/waspstation/code/modules/projectiles/guns/ballistic/shotgun.dm b/whitesands/code/modules/projectiles/guns/ballistic/shotgun.dm similarity index 88% rename from waspstation/code/modules/projectiles/guns/ballistic/shotgun.dm rename to whitesands/code/modules/projectiles/guns/ballistic/shotgun.dm index eca322d125a..ce24fd8db08 100644 --- a/waspstation/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/whitesands/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -1,7 +1,7 @@ /obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact name = "compact compact combat shotgun" desc = "A compact version of the compact version of the semi automatic combat shotgun. For when you want a gun the same size as your brain." - icon = 'waspstation/icons/obj/guns/projectile.dmi' + icon = 'whitesands/icons/obj/guns/projectile.dmi' icon_state = "cshotguncc" mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact/compact w_class = WEIGHT_CLASS_SMALL @@ -24,7 +24,7 @@ /obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact/compact name = "compact compact compact combat shotgun" desc = "A compact version of the compact version of the compact version of the semi automatic combat shotgun. It's a miracle it works..." - icon = 'waspstation/icons/obj/guns/projectile.dmi' + icon = 'whitesands/icons/obj/guns/projectile.dmi' icon_state = "cshotgunccc" mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact/compact/compact w_class = WEIGHT_CLASS_TINY @@ -52,9 +52,9 @@ name = "quadvolgue shotgun" desc = "I've got my quad damage right here!" icon_state = "qshotgun" - icon = 'waspstation/icons/obj/guns/projectile.dmi' - lefthand_file = 'waspstation/icons/mob/inhands/weapons/64x_guns_left.dmi' - righthand_file = 'waspstation/icons/mob/inhands/weapons/64x_guns_right.dmi' + icon = 'whitesands/icons/obj/guns/projectile.dmi' + lefthand_file = 'whitesands/icons/mob/inhands/weapons/64x_guns_left.dmi' + righthand_file = 'whitesands/icons/mob/inhands/weapons/64x_guns_right.dmi' item_state = "shotgun_qb" w_class = WEIGHT_CLASS_BULKY force = 14 //blunt edge and really heavy @@ -65,9 +65,9 @@ unique_reskin = null recoil = 1 weapon_weight = WEAPON_LIGHT - fire_sound = 'waspstation/sound/weapons/gun/shotgun/quadfire.ogg' - rack_sound = "waspstation/sound/weapons/gun/shotgun/quadrack.ogg" - load_sound = "waspstation/sound/weapons/gun/shotgun/quadinsert.ogg" + fire_sound = 'whitesands/sound/weapons/gun/shotgun/quadfire.ogg' + rack_sound = "whitesands/sound/weapons/gun/shotgun/quadrack.ogg" + load_sound = "whitesands/sound/weapons/gun/shotgun/quadinsert.ogg" fire_sound_volume = 35 rack_sound_volume = 50 diff --git a/waspstation/code/modules/projectiles/guns/energy/energy_gun.dm b/whitesands/code/modules/projectiles/guns/energy/energy_gun.dm similarity index 89% rename from waspstation/code/modules/projectiles/guns/energy/energy_gun.dm rename to whitesands/code/modules/projectiles/guns/energy/energy_gun.dm index f4bf4aa5b91..97d3922bf3d 100644 --- a/waspstation/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/whitesands/code/modules/projectiles/guns/energy/energy_gun.dm @@ -1,7 +1,7 @@ /obj/item/gun/energy/e_gun/adv_stopping name = "advanced stopping revolver" desc = "An advanced energy revolver with the capacity to shoot both disabler and lethal lasers, as well as futuristic safari nets." - icon = 'waspstation/icons/obj/guns/energy.dmi' + icon = 'whitesands/icons/obj/guns/energy.dmi' icon_state = "bsgun" item_state = "gun" force = 7 diff --git a/waspstation/code/modules/projectiles/guns/energy/laser.dm b/whitesands/code/modules/projectiles/guns/energy/laser.dm similarity index 100% rename from waspstation/code/modules/projectiles/guns/energy/laser.dm rename to whitesands/code/modules/projectiles/guns/energy/laser.dm diff --git a/waspstation/code/modules/projectiles/guns/energy/pulse.dm b/whitesands/code/modules/projectiles/guns/energy/pulse.dm similarity index 88% rename from waspstation/code/modules/projectiles/guns/energy/pulse.dm rename to whitesands/code/modules/projectiles/guns/energy/pulse.dm index 32cddf7ac11..a6643560343 100644 --- a/waspstation/code/modules/projectiles/guns/energy/pulse.dm +++ b/whitesands/code/modules/projectiles/guns/energy/pulse.dm @@ -3,9 +3,9 @@ desc = "An almost jury-rigged answer to NT's dominance on pulse weaponry. Features only 4 shots but can rapidly recharge." icon_state = "terrapulse" ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse) - internal_cell = TRUE //prevents you from giving it an OP cell - WaspStation Edit + internal_cell = TRUE //prevents you from giving it an OP cell - WS Edit cell_type = /obj/item/stock_parts/cell/gun/SolGov selfcharge = 1 - icon = 'waspstation/icons/obj/guns/energy.dmi' + icon = 'whitesands/icons/obj/guns/energy.dmi' charge_delay = 0.5 //50 seconds to recharge the clip slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT diff --git a/waspstation/code/modules/projectiles/projectile/beams.dm b/whitesands/code/modules/projectiles/projectile/beams.dm similarity index 100% rename from waspstation/code/modules/projectiles/projectile/beams.dm rename to whitesands/code/modules/projectiles/projectile/beams.dm diff --git a/waspstation/code/modules/projectiles/projectile/bullets/rifle.dm b/whitesands/code/modules/projectiles/projectile/bullets/rifle.dm similarity index 100% rename from waspstation/code/modules/projectiles/projectile/bullets/rifle.dm rename to whitesands/code/modules/projectiles/projectile/bullets/rifle.dm diff --git a/waspstation/code/modules/projectiles/projectile/bullets/smg.dm b/whitesands/code/modules/projectiles/projectile/bullets/smg.dm similarity index 100% rename from waspstation/code/modules/projectiles/projectile/bullets/smg.dm rename to whitesands/code/modules/projectiles/projectile/bullets/smg.dm diff --git a/waspstation/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/whitesands/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm similarity index 100% rename from waspstation/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm rename to whitesands/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm diff --git a/waspstation/code/modules/reagents/chemistry/reagents/food_reagents.dm b/whitesands/code/modules/reagents/chemistry/reagents/food_reagents.dm similarity index 100% rename from waspstation/code/modules/reagents/chemistry/reagents/food_reagents.dm rename to whitesands/code/modules/reagents/chemistry/reagents/food_reagents.dm diff --git a/waspstation/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/whitesands/code/modules/reagents/chemistry/reagents/medicine_reagents.dm similarity index 100% rename from waspstation/code/modules/reagents/chemistry/reagents/medicine_reagents.dm rename to whitesands/code/modules/reagents/chemistry/reagents/medicine_reagents.dm diff --git a/waspstation/code/modules/reagents/chemistry/reagents/other_reagents.dm b/whitesands/code/modules/reagents/chemistry/reagents/other_reagents.dm similarity index 92% rename from waspstation/code/modules/reagents/chemistry/reagents/other_reagents.dm rename to whitesands/code/modules/reagents/chemistry/reagents/other_reagents.dm index 952921cd6ad..54758f8b5af 100644 --- a/waspstation/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/whitesands/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -23,5 +23,5 @@ description = "An ashen toxin. Something about this seems lesser." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/lizard/ashwalker/kobold - process_flags = ORGANIC | SYNTHETIC //WaspStation Edit - IPCs + process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs taste_description = "short savagery" diff --git a/waspstation/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/whitesands/code/modules/reagents/chemistry/reagents/toxin_reagents.dm similarity index 100% rename from waspstation/code/modules/reagents/chemistry/reagents/toxin_reagents.dm rename to whitesands/code/modules/reagents/chemistry/reagents/toxin_reagents.dm diff --git a/waspstation/code/modules/reagents/chemistry/recipes/medicine.dm b/whitesands/code/modules/reagents/chemistry/recipes/medicine.dm similarity index 98% rename from waspstation/code/modules/reagents/chemistry/recipes/medicine.dm rename to whitesands/code/modules/reagents/chemistry/recipes/medicine.dm index 7dda3ac4bd3..2969c62cf57 100644 --- a/waspstation/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/whitesands/code/modules/reagents/chemistry/recipes/medicine.dm @@ -52,7 +52,7 @@ required_reagents = list(/datum/reagent/medicine/antitoxin = 1, /datum/reagent/carbon = 2) required_catalysts = list(/datum/reagent/toxin/plasma = 1) -/*/datum/chemical_reaction/hepanephrodaxon //waspstation edit: temporary removal of an overloaded chem +/*/datum/chemical_reaction/hepanephrodaxon //WS edit: temporary removal of an overloaded chem results = list(/datum/reagent/medicine/hepanephrodaxon = 5) required_reagents = list(/datum/reagent/medicine/carthatoline = 2, /datum/reagent/carbon = 2, /datum/reagent/lithium = 1) required_catalysts = list(/datum/reagent/toxin/plasma = 5)*/ diff --git a/waspstation/code/modules/reagents/chemistry/recipes/others.dm b/whitesands/code/modules/reagents/chemistry/recipes/others.dm similarity index 100% rename from waspstation/code/modules/reagents/chemistry/recipes/others.dm rename to whitesands/code/modules/reagents/chemistry/recipes/others.dm diff --git a/waspstation/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/whitesands/code/modules/reagents/chemistry/recipes/pyrotechnics.dm similarity index 100% rename from waspstation/code/modules/reagents/chemistry/recipes/pyrotechnics.dm rename to whitesands/code/modules/reagents/chemistry/recipes/pyrotechnics.dm diff --git a/waspstation/code/modules/reagents/reagent_containers/bottle.dm b/whitesands/code/modules/reagents/reagent_containers/bottle.dm similarity index 100% rename from waspstation/code/modules/reagents/reagent_containers/bottle.dm rename to whitesands/code/modules/reagents/reagent_containers/bottle.dm diff --git a/waspstation/code/modules/reagents/reagent_containers/hypospray.dm b/whitesands/code/modules/reagents/reagent_containers/hypospray.dm similarity index 99% rename from waspstation/code/modules/reagents/reagent_containers/hypospray.dm rename to whitesands/code/modules/reagents/reagent_containers/hypospray.dm index b19f54f3f71..0f6ae466619 100644 --- a/waspstation/code/modules/reagents/reagent_containers/hypospray.dm +++ b/whitesands/code/modules/reagents/reagent_containers/hypospray.dm @@ -1,7 +1,7 @@ //A vial-loaded hypospray. Cartridge-based! /obj/item/hypospray/mkii name = "hypospray mk.II" - icon = 'waspstation/icons/obj/syringe.dmi' + icon = 'whitesands/icons/obj/syringe.dmi' icon_state = "hypo2" desc = "A new development from DeForest Medical, this hypospray takes 30-unit vials as the drug supply for easy swapping." w_class = WEIGHT_CLASS_TINY diff --git a/waspstation/code/modules/reagents/reagent_containers/hypovial.dm b/whitesands/code/modules/reagents/reagent_containers/hypovial.dm similarity index 98% rename from waspstation/code/modules/reagents/reagent_containers/hypovial.dm rename to whitesands/code/modules/reagents/reagent_containers/hypovial.dm index 2f1eb06e4bf..36c696cb9d6 100644 --- a/waspstation/code/modules/reagents/reagent_containers/hypovial.dm +++ b/whitesands/code/modules/reagents/reagent_containers/hypovial.dm @@ -1,9 +1,9 @@ -//hypovials used with the MkII hypospray. See waspstation's modularized hypospray.dm. +//hypovials used with the MkII hypospray. See WS's modularized hypospray.dm. /obj/item/reagent_containers/glass/bottle/vial name = "broken hypovial" desc = "A hypovial compatible with most hyposprays." - icon = 'waspstation/icons/obj/chemical.dmi' + icon = 'whitesands/icons/obj/chemical.dmi' icon_state = "hypovial" spillable = FALSE var/comes_with = list() //Easy way of doing this. diff --git a/waspstation/code/modules/reagents/reagent_containers/pill.dm b/whitesands/code/modules/reagents/reagent_containers/pill.dm similarity index 100% rename from waspstation/code/modules/reagents/reagent_containers/pill.dm rename to whitesands/code/modules/reagents/reagent_containers/pill.dm diff --git a/waspstation/code/modules/reagents/reagent_containers/syringes.dm b/whitesands/code/modules/reagents/reagent_containers/syringes.dm similarity index 100% rename from waspstation/code/modules/reagents/reagent_containers/syringes.dm rename to whitesands/code/modules/reagents/reagent_containers/syringes.dm diff --git a/waspstation/code/modules/research/designs/autolathe_designs.dm b/whitesands/code/modules/research/designs/autolathe_designs.dm similarity index 100% rename from waspstation/code/modules/research/designs/autolathe_designs.dm rename to whitesands/code/modules/research/designs/autolathe_designs.dm diff --git a/waspstation/code/modules/research/designs/comp_board_designs.dm b/whitesands/code/modules/research/designs/comp_board_designs.dm similarity index 100% rename from waspstation/code/modules/research/designs/comp_board_designs.dm rename to whitesands/code/modules/research/designs/comp_board_designs.dm diff --git a/waspstation/code/modules/research/designs/machine_designs.dm b/whitesands/code/modules/research/designs/machine_designs.dm similarity index 100% rename from waspstation/code/modules/research/designs/machine_designs.dm rename to whitesands/code/modules/research/designs/machine_designs.dm diff --git a/waspstation/code/modules/research/designs/mechfabricator_designs.dm b/whitesands/code/modules/research/designs/mechfabricator_designs.dm similarity index 100% rename from waspstation/code/modules/research/designs/mechfabricator_designs.dm rename to whitesands/code/modules/research/designs/mechfabricator_designs.dm diff --git a/waspstation/code/modules/research/designs/spacepod_designs.dm b/whitesands/code/modules/research/designs/spacepod_designs.dm similarity index 100% rename from waspstation/code/modules/research/designs/spacepod_designs.dm rename to whitesands/code/modules/research/designs/spacepod_designs.dm diff --git a/waspstation/code/modules/research/designs/tool_designs.dm b/whitesands/code/modules/research/designs/tool_designs.dm similarity index 100% rename from waspstation/code/modules/research/designs/tool_designs.dm rename to whitesands/code/modules/research/designs/tool_designs.dm diff --git a/waspstation/code/modules/research/techweb/all_nodes.dm b/whitesands/code/modules/research/techweb/all_nodes.dm similarity index 100% rename from waspstation/code/modules/research/techweb/all_nodes.dm rename to whitesands/code/modules/research/techweb/all_nodes.dm diff --git a/waspstation/code/modules/shuttle/emergency.dm b/whitesands/code/modules/shuttle/emergency.dm similarity index 100% rename from waspstation/code/modules/shuttle/emergency.dm rename to whitesands/code/modules/shuttle/emergency.dm diff --git a/waspstation/code/modules/shuttle/shuttle.dm b/whitesands/code/modules/shuttle/shuttle.dm similarity index 100% rename from waspstation/code/modules/shuttle/shuttle.dm rename to whitesands/code/modules/shuttle/shuttle.dm diff --git a/waspstation/code/modules/spacepods/construction.dm b/whitesands/code/modules/spacepods/construction.dm similarity index 100% rename from waspstation/code/modules/spacepods/construction.dm rename to whitesands/code/modules/spacepods/construction.dm diff --git a/waspstation/code/modules/spacepods/equipment.dm b/whitesands/code/modules/spacepods/equipment.dm similarity index 95% rename from waspstation/code/modules/spacepods/equipment.dm rename to whitesands/code/modules/spacepods/equipment.dm index a2f18788a96..b08ea100c62 100644 --- a/waspstation/code/modules/spacepods/equipment.dm +++ b/whitesands/code/modules/spacepods/equipment.dm @@ -1,6 +1,6 @@ /obj/item/spacepod_equipment var/obj/spacepod/spacepod - icon = 'waspstation/icons/obj/spacepods/parts.dmi' + icon = 'whitesands/icons/obj/spacepods/parts.dmi' var/slot = SPACEPOD_SLOT_MISC var/slot_space = 1 @@ -192,7 +192,7 @@ projectile_type = /obj/projectile/beam/disabler shot_cost = 400 fire_sound = 'sound/weapons/taser2.ogg' - overlay_icon = 'waspstation/icons/obj/spacepods/2x2.dmi' + overlay_icon = 'whitesands/icons/obj/spacepods/2x2.dmi' overlay_icon_state = "pod_weapon_disabler" /obj/item/spacepod_equipment/weaponry/burst_disabler @@ -204,7 +204,7 @@ shots_per = 3 fire_sound = 'sound/weapons/taser2.ogg' fire_delay = 30 - overlay_icon = 'waspstation/icons/obj/spacepods/2x2.dmi' + overlay_icon = 'whitesands/icons/obj/spacepods/2x2.dmi' overlay_icon_state = "pod_weapon_disabler" /obj/item/spacepod_equipment/weaponry/laser @@ -214,14 +214,14 @@ projectile_type = /obj/projectile/beam/laser shot_cost = 600 fire_sound = 'sound/weapons/Laser.ogg' - overlay_icon = 'waspstation/icons/obj/spacepods/2x2.dmi' + overlay_icon = 'whitesands/icons/obj/spacepods/2x2.dmi' overlay_icon_state = "pod_weapon_laser" // MINING LASERS /obj/item/spacepod_equipment/weaponry/basic_pod_ka name = "weak kinetic accelerator" desc = "A weak kinetic accelerator for space pods, fires bursts of energy that cut through rock." - icon = 'waspstation/goon/icons/obj/spacepods/parts.dmi' + icon = 'whitesands/goon/icons/obj/spacepods/parts.dmi' icon_state = "pod_taser" projectile_type = /obj/projectile/kinetic/pod shot_cost = 300 @@ -231,7 +231,7 @@ /obj/item/spacepod_equipment/weaponry/pod_ka name = "kinetic accelerator system" desc = "A kinetic accelerator system for space pods, fires bursts of energy that cut through rock." - icon = 'waspstation/goon/icons/obj/spacepods/parts.dmi' + icon = 'whitesands/goon/icons/obj/spacepods/parts.dmi' icon_state = "pod_m_laser" projectile_type = /obj/projectile/kinetic/pod/regular shot_cost = 250 @@ -248,13 +248,13 @@ /obj/item/spacepod_equipment/weaponry/plasma_cutter name = "plasma cutter system" desc = "A plasma cutter system for space pods. It is capable of expelling concentrated plasma bursts to mine or cut off xeno limbs!" - icon = 'waspstation/goon/icons/obj/spacepods/parts.dmi' + icon = 'whitesands/goon/icons/obj/spacepods/parts.dmi' icon_state = "pod_p_cutter" projectile_type = /obj/projectile/plasma shot_cost = 250 fire_delay = 10 fire_sound = 'sound/weapons/plasma_cutter.ogg' - overlay_icon = 'waspstation/icons/obj/spacepods/2x2.dmi' + overlay_icon = 'whitesands/icons/obj/spacepods/2x2.dmi' overlay_icon_state = "pod_weapon_plasma" /obj/item/spacepod_equipment/weaponry/plasma_cutter/adv @@ -274,7 +274,7 @@ /obj/item/spacepod_equipment/tracker name = "spacepod tracking system" desc = "A tracking device for spacepods." - icon = 'waspstation/goon/icons/obj/spacepods/parts.dmi' + icon = 'whitesands/goon/icons/obj/spacepods/parts.dmi' icon_state = "pod_locator" /* @@ -347,7 +347,7 @@ /obj/item/spacepod_key name = "spacepod key" desc = "A key for a spacepod lock." - icon = 'waspstation/icons/obj/spacepods/parts.dmi' + icon = 'whitesands/icons/obj/spacepods/parts.dmi' icon_state = "podkey" w_class = WEIGHT_CLASS_TINY var/id = null @@ -360,7 +360,7 @@ /obj/item/device/lock_buster name = "pod lock buster" desc = "Destroys a podlock in mere seconds once applied. Waranty void if used." - icon = 'waspstation/icons/obj/spacepods/parts.dmi' + icon = 'whitesands/icons/obj/spacepods/parts.dmi' icon_state = "lock_buster_off" var/on = FALSE diff --git a/waspstation/code/modules/spacepods/parts.dm b/whitesands/code/modules/spacepods/parts.dm similarity index 98% rename from waspstation/code/modules/spacepods/parts.dm rename to whitesands/code/modules/spacepods/parts.dm index 06172aea3c0..3f7e8e1214a 100644 --- a/waspstation/code/modules/spacepods/parts.dm +++ b/whitesands/code/modules/spacepods/parts.dm @@ -1,5 +1,5 @@ /obj/item/pod_parts - icon = 'waspstation/goon/icons/obj/spacepods/parts.dmi' + icon = 'whitesands/goon/icons/obj/spacepods/parts.dmi' w_class = WEIGHT_CLASS_GIGANTIC flags_1 = CONDUCT_1 @@ -119,7 +119,7 @@ name = "civilian pod armor" icon_state = "pod_armor_civ" desc = "Spacepod armor. This is the civilian version. It looks rather flimsy." - var/pod_icon = 'waspstation/goon/icons/obj/spacepods/2x2.dmi' + var/pod_icon = 'whitesands/goon/icons/obj/spacepods/2x2.dmi' var/pod_icon_state = "pod_civ" var/pod_desc = "A sleek civilian space pod." var/pod_integrity = 250 diff --git a/waspstation/code/modules/spacepods/physics.dm b/whitesands/code/modules/spacepods/physics.dm similarity index 100% rename from waspstation/code/modules/spacepods/physics.dm rename to whitesands/code/modules/spacepods/physics.dm diff --git a/waspstation/code/modules/spacepods/prebuilt.dm b/whitesands/code/modules/spacepods/prebuilt.dm similarity index 96% rename from waspstation/code/modules/spacepods/prebuilt.dm rename to whitesands/code/modules/spacepods/prebuilt.dm index 32611316c5e..e0246502c38 100644 --- a/waspstation/code/modules/spacepods/prebuilt.dm +++ b/whitesands/code/modules/spacepods/prebuilt.dm @@ -1,5 +1,5 @@ /obj/spacepod/prebuilt - icon = 'waspstation/goon/icons/obj/spacepods/2x2.dmi' + icon = 'whitesands/goon/icons/obj/spacepods/2x2.dmi' icon_state = "pod_civ" var/cell_type = /obj/item/stock_parts/cell/high/plus var/armor_type = /obj/item/pod_parts/armor diff --git a/waspstation/code/modules/spacepods/spacepod.dm b/whitesands/code/modules/spacepods/spacepod.dm similarity index 96% rename from waspstation/code/modules/spacepods/spacepod.dm rename to whitesands/code/modules/spacepods/spacepod.dm index 9ab2121a721..1bf62f33737 100644 --- a/waspstation/code/modules/spacepods/spacepod.dm +++ b/whitesands/code/modules/spacepods/spacepod.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_INIT(spacepod_verb_list, list( /obj/spacepod name = "space pod" desc = "A frame for a spacepod." - icon = 'waspstation/goon/icons/obj/spacepods/construction_2x2.dmi' + icon = 'whitesands/goon/icons/obj/spacepods/construction_2x2.dmi' icon_state = "pod_1" density = 1 opacity = 0 @@ -406,10 +406,10 @@ GLOBAL_LIST_INIT(spacepod_verb_list, list( /obj/spacepod/update_icon() cut_overlays() if(construction_state != SPACEPOD_ARMOR_WELDED) - icon = 'waspstation/goon/icons/obj/spacepods/construction_2x2.dmi' + icon = 'whitesands/goon/icons/obj/spacepods/construction_2x2.dmi' icon_state = "pod_[construction_state]" if(pod_armor && construction_state >= SPACEPOD_ARMOR_LOOSE) - var/mutable_appearance/masked_armor = mutable_appearance(icon = 'waspstation/goon/icons/obj/spacepods/construction_2x2.dmi', icon_state = "armor_mask") + var/mutable_appearance/masked_armor = mutable_appearance(icon = 'whitesands/goon/icons/obj/spacepods/construction_2x2.dmi', icon_state = "armor_mask") var/mutable_appearance/armor = mutable_appearance(pod_armor.pod_icon, pod_armor.pod_icon_state) armor.blend_mode = BLEND_MULTIPLY masked_armor.overlays = list(armor) @@ -421,13 +421,13 @@ GLOBAL_LIST_INIT(spacepod_verb_list, list( icon = pod_armor.pod_icon icon_state = pod_armor.pod_icon_state else - icon = 'waspstation/goon/icons/obj/spacepods/2x2.dmi' + icon = 'whitesands/goon/icons/obj/spacepods/2x2.dmi' icon_state = initial(icon_state) if(obj_integrity <= max_integrity / 2) - add_overlay(image(icon='waspstation/goon/icons/obj/spacepods/2x2.dmi', icon_state="pod_damage")) + add_overlay(image(icon='whitesands/goon/icons/obj/spacepods/2x2.dmi', icon_state="pod_damage")) if(obj_integrity <= max_integrity / 4) - add_overlay(image(icon='waspstation/goon/icons/obj/spacepods/2x2.dmi', icon_state="pod_fire")) + add_overlay(image(icon='whitesands/goon/icons/obj/spacepods/2x2.dmi', icon_state="pod_fire")) if(weapon && weapon.overlay_icon_state) add_overlay(image(icon=weapon.overlay_icon,icon_state=weapon.overlay_icon_state)) @@ -463,11 +463,11 @@ GLOBAL_LIST_INIT(spacepod_verb_list, list( var/left_thrust = left_thrusts[cdir] var/right_thrust = right_thrusts[cdir] if(left_thrust) - add_overlay(image(icon = 'waspstation/icons/obj/spacepods/2x2.dmi', icon_state = "rcs_left", dir = cdir)) + add_overlay(image(icon = 'whitesands/icons/obj/spacepods/2x2.dmi', icon_state = "rcs_left", dir = cdir)) if(right_thrust) - add_overlay(image(icon = 'waspstation/icons/obj/spacepods/2x2.dmi', icon_state = "rcs_right", dir = cdir)) + add_overlay(image(icon = 'whitesands/icons/obj/spacepods/2x2.dmi', icon_state = "rcs_right", dir = cdir)) if(back_thrust) - var/image/I = image(icon = 'waspstation/icons/obj/spacepods/2x2.dmi', icon_state = "thrust") + var/image/I = image(icon = 'whitesands/icons/obj/spacepods/2x2.dmi', icon_state = "thrust") I.transform = matrix(1, 0, 0, 0, 1, -32) add_overlay(I) diff --git a/waspstation/code/modules/surgery/ipc_revive.dm b/whitesands/code/modules/surgery/ipc_revive.dm similarity index 100% rename from waspstation/code/modules/surgery/ipc_revive.dm rename to whitesands/code/modules/surgery/ipc_revive.dm diff --git a/waspstation/code/modules/surgery/mechanical.dm b/whitesands/code/modules/surgery/mechanical.dm similarity index 100% rename from waspstation/code/modules/surgery/mechanical.dm rename to whitesands/code/modules/surgery/mechanical.dm diff --git a/waspstation/code/modules/surgery/organs/eyes.dm b/whitesands/code/modules/surgery/organs/eyes.dm similarity index 94% rename from waspstation/code/modules/surgery/organs/eyes.dm rename to whitesands/code/modules/surgery/organs/eyes.dm index 36a3458fbe5..e4bf13edcb6 100644 --- a/waspstation/code/modules/surgery/organs/eyes.dm +++ b/whitesands/code/modules/surgery/organs/eyes.dm @@ -1,7 +1,7 @@ /obj/item/organ/eyes/compound name = "compound eyes" desc = "These eyes seem to have increased sensitivity to bright light, with some improvement to low light vision. It's like these eyes are looking everywhere at once!" - icon = 'waspstation/icons/obj/surgery.dmi' + icon = 'whitesands/icons/obj/surgery.dmi' icon_state = "compound_eyes" see_in_dark = 6 flash_protect = FLASH_PROTECTION_SENSITIVE //Obligatory flash sensitivity for balance diff --git a/waspstation/code/modules/surgery/organs/liver.dm b/whitesands/code/modules/surgery/organs/liver.dm similarity index 89% rename from waspstation/code/modules/surgery/organs/liver.dm rename to whitesands/code/modules/surgery/organs/liver.dm index f467655fe07..4d35f5beda3 100644 --- a/waspstation/code/modules/surgery/organs/liver.dm +++ b/whitesands/code/modules/surgery/organs/liver.dm @@ -1,5 +1,5 @@ /obj/item/organ/liver/cybernetic/upgraded/ipc - icon = 'waspstation/icons/obj/surgery.dmi' + icon = 'whitesands/icons/obj/surgery.dmi' name = "substance processor" icon_state = "substance_processor" attack_verb = list("processed") diff --git a/waspstation/code/modules/surgery/organs/moth_wings.dm b/whitesands/code/modules/surgery/organs/moth_wings.dm similarity index 100% rename from waspstation/code/modules/surgery/organs/moth_wings.dm rename to whitesands/code/modules/surgery/organs/moth_wings.dm diff --git a/waspstation/code/modules/surgery/organs/tongue.dm b/whitesands/code/modules/surgery/organs/tongue.dm similarity index 100% rename from waspstation/code/modules/surgery/organs/tongue.dm rename to whitesands/code/modules/surgery/organs/tongue.dm diff --git a/waspstation/code/modules/uplink/uplink_items.dm b/whitesands/code/modules/uplink/uplink_items.dm similarity index 100% rename from waspstation/code/modules/uplink/uplink_items.dm rename to whitesands/code/modules/uplink/uplink_items.dm diff --git a/waspstation/code/modules/vehicles/pimpin_ride.dm b/whitesands/code/modules/vehicles/pimpin_ride.dm similarity index 88% rename from waspstation/code/modules/vehicles/pimpin_ride.dm rename to whitesands/code/modules/vehicles/pimpin_ride.dm index 5541844ce15..e840d522546 100644 --- a/waspstation/code/modules/vehicles/pimpin_ride.dm +++ b/whitesands/code/modules/vehicles/pimpin_ride.dm @@ -3,11 +3,11 @@ /obj/vehicle/ridden/lawnmower name = "lawn mower" desc = "Equipped with reliable safeties to prevent accidents in the workplace." - icon = 'waspstation/icons/obj/vehicles.dmi' + icon = 'whitesands/icons/obj/vehicles.dmi' icon_state = "lawnmower" var/emagged = FALSE - var/list/drive_sounds = list('waspstation/sound/effects/mowermove1.ogg', 'waspstation/sound/effects/mowermove2.ogg') - var/list/gib_sounds = list('waspstation/sound/effects/mowermovesquish.ogg') + var/list/drive_sounds = list('whitesands/sound/effects/mowermove1.ogg', 'whitesands/sound/effects/mowermove2.ogg') + var/list/gib_sounds = list('whitesands/sound/effects/mowermovesquish.ogg') var/driver /obj/vehicle/ridden/lawnmower/Initialize() diff --git a/waspstation/goon/License.md b/whitesands/goon/License.md similarity index 100% rename from waspstation/goon/License.md rename to whitesands/goon/License.md diff --git a/waspstation/goon/README.md b/whitesands/goon/README.md similarity index 100% rename from waspstation/goon/README.md rename to whitesands/goon/README.md diff --git a/waspstation/goon/icons/obj/spacepods/2x2.dmi b/whitesands/goon/icons/obj/spacepods/2x2.dmi similarity index 100% rename from waspstation/goon/icons/obj/spacepods/2x2.dmi rename to whitesands/goon/icons/obj/spacepods/2x2.dmi diff --git a/waspstation/goon/icons/obj/spacepods/construction_2x2.dmi b/whitesands/goon/icons/obj/spacepods/construction_2x2.dmi similarity index 100% rename from waspstation/goon/icons/obj/spacepods/construction_2x2.dmi rename to whitesands/goon/icons/obj/spacepods/construction_2x2.dmi diff --git a/waspstation/goon/icons/obj/spacepods/parts.dmi b/whitesands/goon/icons/obj/spacepods/parts.dmi similarity index 100% rename from waspstation/goon/icons/obj/spacepods/parts.dmi rename to whitesands/goon/icons/obj/spacepods/parts.dmi diff --git a/waspstation/icons/effects/beam.dmi b/whitesands/icons/effects/beam.dmi similarity index 100% rename from waspstation/icons/effects/beam.dmi rename to whitesands/icons/effects/beam.dmi diff --git a/waspstation/icons/effects/numbers.dmi b/whitesands/icons/effects/numbers.dmi similarity index 100% rename from waspstation/icons/effects/numbers.dmi rename to whitesands/icons/effects/numbers.dmi diff --git a/waspstation/icons/effects/overmap.dmi b/whitesands/icons/effects/overmap.dmi similarity index 100% rename from waspstation/icons/effects/overmap.dmi rename to whitesands/icons/effects/overmap.dmi diff --git a/waspstation/icons/effects/prefabdecals.dmi b/whitesands/icons/effects/prefabdecals.dmi similarity index 100% rename from waspstation/icons/effects/prefabdecals.dmi rename to whitesands/icons/effects/prefabdecals.dmi diff --git a/waspstation/icons/mob/actions/actions_borer.dmi b/whitesands/icons/mob/actions/actions_borer.dmi similarity index 100% rename from waspstation/icons/mob/actions/actions_borer.dmi rename to whitesands/icons/mob/actions/actions_borer.dmi diff --git a/waspstation/icons/mob/borer.dmi b/whitesands/icons/mob/borer.dmi similarity index 100% rename from waspstation/icons/mob/borer.dmi rename to whitesands/icons/mob/borer.dmi diff --git a/waspstation/icons/mob/clothing/back.dmi b/whitesands/icons/mob/clothing/back.dmi similarity index 100% rename from waspstation/icons/mob/clothing/back.dmi rename to whitesands/icons/mob/clothing/back.dmi diff --git a/waspstation/icons/mob/clothing/digialt.dmi b/whitesands/icons/mob/clothing/digialt.dmi similarity index 100% rename from waspstation/icons/mob/clothing/digialt.dmi rename to whitesands/icons/mob/clothing/digialt.dmi diff --git a/waspstation/icons/mob/clothing/eyes.dmi b/whitesands/icons/mob/clothing/eyes.dmi similarity index 100% rename from waspstation/icons/mob/clothing/eyes.dmi rename to whitesands/icons/mob/clothing/eyes.dmi diff --git a/waspstation/icons/mob/clothing/feet.dmi b/whitesands/icons/mob/clothing/feet.dmi similarity index 100% rename from waspstation/icons/mob/clothing/feet.dmi rename to whitesands/icons/mob/clothing/feet.dmi diff --git a/waspstation/icons/mob/clothing/hands.dmi b/whitesands/icons/mob/clothing/hands.dmi similarity index 100% rename from waspstation/icons/mob/clothing/hands.dmi rename to whitesands/icons/mob/clothing/hands.dmi diff --git a/waspstation/icons/mob/clothing/head.dmi b/whitesands/icons/mob/clothing/head.dmi similarity index 100% rename from waspstation/icons/mob/clothing/head.dmi rename to whitesands/icons/mob/clothing/head.dmi diff --git a/waspstation/icons/mob/clothing/neck.dmi b/whitesands/icons/mob/clothing/neck.dmi similarity index 100% rename from waspstation/icons/mob/clothing/neck.dmi rename to whitesands/icons/mob/clothing/neck.dmi diff --git a/waspstation/icons/mob/clothing/suits.dmi b/whitesands/icons/mob/clothing/suits.dmi similarity index 100% rename from waspstation/icons/mob/clothing/suits.dmi rename to whitesands/icons/mob/clothing/suits.dmi diff --git a/waspstation/icons/mob/clothing/under/SolGov.dmi b/whitesands/icons/mob/clothing/under/SolGov.dmi similarity index 100% rename from waspstation/icons/mob/clothing/under/SolGov.dmi rename to whitesands/icons/mob/clothing/under/SolGov.dmi diff --git a/waspstation/icons/mob/clothing/under/cargo.dmi b/whitesands/icons/mob/clothing/under/cargo.dmi similarity index 100% rename from waspstation/icons/mob/clothing/under/cargo.dmi rename to whitesands/icons/mob/clothing/under/cargo.dmi diff --git a/waspstation/icons/mob/clothing/under/centcom.dmi b/whitesands/icons/mob/clothing/under/centcom.dmi similarity index 100% rename from waspstation/icons/mob/clothing/under/centcom.dmi rename to whitesands/icons/mob/clothing/under/centcom.dmi diff --git a/waspstation/icons/mob/clothing/under/command.dmi b/whitesands/icons/mob/clothing/under/command.dmi similarity index 100% rename from waspstation/icons/mob/clothing/under/command.dmi rename to whitesands/icons/mob/clothing/under/command.dmi diff --git a/waspstation/icons/mob/clothing/under/engineering.dmi b/whitesands/icons/mob/clothing/under/engineering.dmi similarity index 100% rename from waspstation/icons/mob/clothing/under/engineering.dmi rename to whitesands/icons/mob/clothing/under/engineering.dmi diff --git a/waspstation/icons/mob/clothing/under/medical.dmi b/whitesands/icons/mob/clothing/under/medical.dmi similarity index 100% rename from waspstation/icons/mob/clothing/under/medical.dmi rename to whitesands/icons/mob/clothing/under/medical.dmi diff --git a/waspstation/icons/mob/clothing/under/rnd.dmi b/whitesands/icons/mob/clothing/under/rnd.dmi similarity index 100% rename from waspstation/icons/mob/clothing/under/rnd.dmi rename to whitesands/icons/mob/clothing/under/rnd.dmi diff --git a/waspstation/icons/mob/clothing/under/security.dmi b/whitesands/icons/mob/clothing/under/security.dmi similarity index 100% rename from waspstation/icons/mob/clothing/under/security.dmi rename to whitesands/icons/mob/clothing/under/security.dmi diff --git a/waspstation/icons/mob/clothing/under/service.dmi b/whitesands/icons/mob/clothing/under/service.dmi similarity index 100% rename from waspstation/icons/mob/clothing/under/service.dmi rename to whitesands/icons/mob/clothing/under/service.dmi diff --git a/waspstation/icons/mob/clothing/under/syndicate.dmi b/whitesands/icons/mob/clothing/under/syndicate.dmi similarity index 100% rename from waspstation/icons/mob/clothing/under/syndicate.dmi rename to whitesands/icons/mob/clothing/under/syndicate.dmi diff --git a/waspstation/icons/mob/inhands/clothing/lefthand.dmi b/whitesands/icons/mob/inhands/clothing/lefthand.dmi similarity index 100% rename from waspstation/icons/mob/inhands/clothing/lefthand.dmi rename to whitesands/icons/mob/inhands/clothing/lefthand.dmi diff --git a/waspstation/icons/mob/inhands/clothing/righthand.dmi b/whitesands/icons/mob/inhands/clothing/righthand.dmi similarity index 100% rename from waspstation/icons/mob/inhands/clothing/righthand.dmi rename to whitesands/icons/mob/inhands/clothing/righthand.dmi diff --git a/waspstation/icons/mob/inhands/equipment/tools_lefthand.dmi b/whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi similarity index 100% rename from waspstation/icons/mob/inhands/equipment/tools_lefthand.dmi rename to whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi diff --git a/waspstation/icons/mob/inhands/equipment/tools_righthand.dmi b/whitesands/icons/mob/inhands/equipment/tools_righthand.dmi similarity index 100% rename from waspstation/icons/mob/inhands/equipment/tools_righthand.dmi rename to whitesands/icons/mob/inhands/equipment/tools_righthand.dmi diff --git a/waspstation/icons/mob/inhands/weapons/64x_guns_left.dmi b/whitesands/icons/mob/inhands/weapons/64x_guns_left.dmi similarity index 100% rename from waspstation/icons/mob/inhands/weapons/64x_guns_left.dmi rename to whitesands/icons/mob/inhands/weapons/64x_guns_left.dmi diff --git a/waspstation/icons/mob/inhands/weapons/64x_guns_right.dmi b/whitesands/icons/mob/inhands/weapons/64x_guns_right.dmi similarity index 100% rename from waspstation/icons/mob/inhands/weapons/64x_guns_right.dmi rename to whitesands/icons/mob/inhands/weapons/64x_guns_right.dmi diff --git a/waspstation/icons/mob/inhands/weapons/swords_lefthand.dmi b/whitesands/icons/mob/inhands/weapons/swords_lefthand.dmi similarity index 100% rename from waspstation/icons/mob/inhands/weapons/swords_lefthand.dmi rename to whitesands/icons/mob/inhands/weapons/swords_lefthand.dmi diff --git a/waspstation/icons/mob/inhands/weapons/swords_righthand.dmi b/whitesands/icons/mob/inhands/weapons/swords_righthand.dmi similarity index 100% rename from waspstation/icons/mob/inhands/weapons/swords_righthand.dmi rename to whitesands/icons/mob/inhands/weapons/swords_righthand.dmi diff --git a/waspstation/icons/mob/moth_wings.dmi b/whitesands/icons/mob/moth_wings.dmi similarity index 100% rename from waspstation/icons/mob/moth_wings.dmi rename to whitesands/icons/mob/moth_wings.dmi diff --git a/waspstation/icons/mob/pets.dmi b/whitesands/icons/mob/pets.dmi similarity index 100% rename from waspstation/icons/mob/pets.dmi rename to whitesands/icons/mob/pets.dmi diff --git a/waspstation/icons/mob/robots.dmi b/whitesands/icons/mob/robots.dmi similarity index 100% rename from waspstation/icons/mob/robots.dmi rename to whitesands/icons/mob/robots.dmi diff --git a/waspstation/icons/mob/screen_ghost.dmi b/whitesands/icons/mob/screen_ghost.dmi similarity index 100% rename from waspstation/icons/mob/screen_ghost.dmi rename to whitesands/icons/mob/screen_ghost.dmi diff --git a/waspstation/icons/mob/simple_human.dmi b/whitesands/icons/mob/simple_human.dmi similarity index 100% rename from waspstation/icons/mob/simple_human.dmi rename to whitesands/icons/mob/simple_human.dmi diff --git a/waspstation/icons/mob/spider.dmi b/whitesands/icons/mob/spider.dmi similarity index 100% rename from waspstation/icons/mob/spider.dmi rename to whitesands/icons/mob/spider.dmi diff --git a/waspstation/icons/mob/spider_legs.dmi b/whitesands/icons/mob/spider_legs.dmi similarity index 100% rename from waspstation/icons/mob/spider_legs.dmi rename to whitesands/icons/mob/spider_legs.dmi diff --git a/waspstation/icons/mob/spider_mandibles.dmi b/whitesands/icons/mob/spider_mandibles.dmi similarity index 100% rename from waspstation/icons/mob/spider_mandibles.dmi rename to whitesands/icons/mob/spider_mandibles.dmi diff --git a/waspstation/icons/mob/spider_parts.dmi b/whitesands/icons/mob/spider_parts.dmi similarity index 100% rename from waspstation/icons/mob/spider_parts.dmi rename to whitesands/icons/mob/spider_parts.dmi diff --git a/waspstation/icons/mob/spider_spinneret.dmi b/whitesands/icons/mob/spider_spinneret.dmi similarity index 100% rename from waspstation/icons/mob/spider_spinneret.dmi rename to whitesands/icons/mob/spider_spinneret.dmi diff --git a/waspstation/icons/obj/ammo.dmi b/whitesands/icons/obj/ammo.dmi similarity index 100% rename from waspstation/icons/obj/ammo.dmi rename to whitesands/icons/obj/ammo.dmi diff --git a/waspstation/icons/obj/atmos.dmi b/whitesands/icons/obj/atmos.dmi similarity index 100% rename from waspstation/icons/obj/atmos.dmi rename to whitesands/icons/obj/atmos.dmi diff --git a/waspstation/icons/obj/atmospherics/components/relief_valve.dmi b/whitesands/icons/obj/atmospherics/components/relief_valve.dmi similarity index 100% rename from waspstation/icons/obj/atmospherics/components/relief_valve.dmi rename to whitesands/icons/obj/atmospherics/components/relief_valve.dmi diff --git a/waspstation/icons/obj/atmospherics/pipes/pipe_item.dmi b/whitesands/icons/obj/atmospherics/pipes/pipe_item.dmi similarity index 100% rename from waspstation/icons/obj/atmospherics/pipes/pipe_item.dmi rename to whitesands/icons/obj/atmospherics/pipes/pipe_item.dmi diff --git a/waspstation/icons/obj/bags.dmi b/whitesands/icons/obj/bags.dmi similarity index 100% rename from waspstation/icons/obj/bags.dmi rename to whitesands/icons/obj/bags.dmi diff --git a/waspstation/icons/obj/card.dmi b/whitesands/icons/obj/card.dmi similarity index 100% rename from waspstation/icons/obj/card.dmi rename to whitesands/icons/obj/card.dmi diff --git a/waspstation/icons/obj/chairs.dmi b/whitesands/icons/obj/chairs.dmi similarity index 100% rename from waspstation/icons/obj/chairs.dmi rename to whitesands/icons/obj/chairs.dmi diff --git a/waspstation/icons/obj/chemical.dmi b/whitesands/icons/obj/chemical.dmi similarity index 100% rename from waspstation/icons/obj/chemical.dmi rename to whitesands/icons/obj/chemical.dmi diff --git a/waspstation/icons/obj/cigarettes.dmi b/whitesands/icons/obj/cigarettes.dmi similarity index 100% rename from waspstation/icons/obj/cigarettes.dmi rename to whitesands/icons/obj/cigarettes.dmi diff --git a/waspstation/icons/obj/clothing/accessories.dmi b/whitesands/icons/obj/clothing/accessories.dmi similarity index 100% rename from waspstation/icons/obj/clothing/accessories.dmi rename to whitesands/icons/obj/clothing/accessories.dmi diff --git a/waspstation/icons/obj/clothing/belt_overlays.dmi b/whitesands/icons/obj/clothing/belt_overlays.dmi similarity index 100% rename from waspstation/icons/obj/clothing/belt_overlays.dmi rename to whitesands/icons/obj/clothing/belt_overlays.dmi diff --git a/waspstation/icons/obj/clothing/glasses.dmi b/whitesands/icons/obj/clothing/glasses.dmi similarity index 100% rename from waspstation/icons/obj/clothing/glasses.dmi rename to whitesands/icons/obj/clothing/glasses.dmi diff --git a/waspstation/icons/obj/clothing/gloves.dmi b/whitesands/icons/obj/clothing/gloves.dmi similarity index 100% rename from waspstation/icons/obj/clothing/gloves.dmi rename to whitesands/icons/obj/clothing/gloves.dmi diff --git a/waspstation/icons/obj/clothing/hats.dmi b/whitesands/icons/obj/clothing/hats.dmi similarity index 100% rename from waspstation/icons/obj/clothing/hats.dmi rename to whitesands/icons/obj/clothing/hats.dmi diff --git a/waspstation/icons/obj/clothing/neck.dmi b/whitesands/icons/obj/clothing/neck.dmi similarity index 100% rename from waspstation/icons/obj/clothing/neck.dmi rename to whitesands/icons/obj/clothing/neck.dmi diff --git a/waspstation/icons/obj/clothing/shoes.dmi b/whitesands/icons/obj/clothing/shoes.dmi similarity index 100% rename from waspstation/icons/obj/clothing/shoes.dmi rename to whitesands/icons/obj/clothing/shoes.dmi diff --git a/waspstation/icons/obj/clothing/suits.dmi b/whitesands/icons/obj/clothing/suits.dmi similarity index 100% rename from waspstation/icons/obj/clothing/suits.dmi rename to whitesands/icons/obj/clothing/suits.dmi diff --git a/waspstation/icons/obj/clothing/under/SolGov.dmi b/whitesands/icons/obj/clothing/under/SolGov.dmi similarity index 100% rename from waspstation/icons/obj/clothing/under/SolGov.dmi rename to whitesands/icons/obj/clothing/under/SolGov.dmi diff --git a/waspstation/icons/obj/clothing/under/cargo.dmi b/whitesands/icons/obj/clothing/under/cargo.dmi similarity index 100% rename from waspstation/icons/obj/clothing/under/cargo.dmi rename to whitesands/icons/obj/clothing/under/cargo.dmi diff --git a/waspstation/icons/obj/clothing/under/centcom.dmi b/whitesands/icons/obj/clothing/under/centcom.dmi similarity index 100% rename from waspstation/icons/obj/clothing/under/centcom.dmi rename to whitesands/icons/obj/clothing/under/centcom.dmi diff --git a/waspstation/icons/obj/clothing/under/command.dmi b/whitesands/icons/obj/clothing/under/command.dmi similarity index 100% rename from waspstation/icons/obj/clothing/under/command.dmi rename to whitesands/icons/obj/clothing/under/command.dmi diff --git a/waspstation/icons/obj/clothing/under/engineering.dmi b/whitesands/icons/obj/clothing/under/engineering.dmi similarity index 100% rename from waspstation/icons/obj/clothing/under/engineering.dmi rename to whitesands/icons/obj/clothing/under/engineering.dmi diff --git a/waspstation/icons/obj/clothing/under/medical.dmi b/whitesands/icons/obj/clothing/under/medical.dmi similarity index 100% rename from waspstation/icons/obj/clothing/under/medical.dmi rename to whitesands/icons/obj/clothing/under/medical.dmi diff --git a/waspstation/icons/obj/clothing/under/rnd.dmi b/whitesands/icons/obj/clothing/under/rnd.dmi similarity index 100% rename from waspstation/icons/obj/clothing/under/rnd.dmi rename to whitesands/icons/obj/clothing/under/rnd.dmi diff --git a/waspstation/icons/obj/clothing/under/security.dmi b/whitesands/icons/obj/clothing/under/security.dmi similarity index 100% rename from waspstation/icons/obj/clothing/under/security.dmi rename to whitesands/icons/obj/clothing/under/security.dmi diff --git a/waspstation/icons/obj/clothing/under/service.dmi b/whitesands/icons/obj/clothing/under/service.dmi similarity index 100% rename from waspstation/icons/obj/clothing/under/service.dmi rename to whitesands/icons/obj/clothing/under/service.dmi diff --git a/waspstation/icons/obj/clothing/under/syndicate.dmi b/whitesands/icons/obj/clothing/under/syndicate.dmi similarity index 100% rename from waspstation/icons/obj/clothing/under/syndicate.dmi rename to whitesands/icons/obj/clothing/under/syndicate.dmi diff --git a/waspstation/icons/obj/device.dmi b/whitesands/icons/obj/device.dmi similarity index 100% rename from waspstation/icons/obj/device.dmi rename to whitesands/icons/obj/device.dmi diff --git a/waspstation/icons/obj/doors/1x2blast_hor.dmi b/whitesands/icons/obj/doors/1x2blast_hor.dmi similarity index 100% rename from waspstation/icons/obj/doors/1x2blast_hor.dmi rename to whitesands/icons/obj/doors/1x2blast_hor.dmi diff --git a/waspstation/icons/obj/doors/1x2blast_vert.dmi b/whitesands/icons/obj/doors/1x2blast_vert.dmi similarity index 100% rename from waspstation/icons/obj/doors/1x2blast_vert.dmi rename to whitesands/icons/obj/doors/1x2blast_vert.dmi diff --git a/waspstation/icons/obj/doors/1x3blast_hor.dmi b/whitesands/icons/obj/doors/1x3blast_hor.dmi similarity index 100% rename from waspstation/icons/obj/doors/1x3blast_hor.dmi rename to whitesands/icons/obj/doors/1x3blast_hor.dmi diff --git a/waspstation/icons/obj/doors/1x3blast_vert.dmi b/whitesands/icons/obj/doors/1x3blast_vert.dmi similarity index 100% rename from waspstation/icons/obj/doors/1x3blast_vert.dmi rename to whitesands/icons/obj/doors/1x3blast_vert.dmi diff --git a/waspstation/icons/obj/doors/1x4blast_hor.dmi b/whitesands/icons/obj/doors/1x4blast_hor.dmi similarity index 100% rename from waspstation/icons/obj/doors/1x4blast_hor.dmi rename to whitesands/icons/obj/doors/1x4blast_hor.dmi diff --git a/waspstation/icons/obj/doors/1x4blast_vert.dmi b/whitesands/icons/obj/doors/1x4blast_vert.dmi similarity index 100% rename from waspstation/icons/obj/doors/1x4blast_vert.dmi rename to whitesands/icons/obj/doors/1x4blast_vert.dmi diff --git a/waspstation/icons/obj/doors/airlocks/shuttle/overlays.dmi b/whitesands/icons/obj/doors/airlocks/shuttle/overlays.dmi similarity index 100% rename from waspstation/icons/obj/doors/airlocks/shuttle/overlays.dmi rename to whitesands/icons/obj/doors/airlocks/shuttle/overlays.dmi diff --git a/waspstation/icons/obj/doors/airlocks/shuttle/shuttle.dmi b/whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi similarity index 100% rename from waspstation/icons/obj/doors/airlocks/shuttle/shuttle.dmi rename to whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi diff --git a/waspstation/icons/obj/drinks.dmi b/whitesands/icons/obj/drinks.dmi similarity index 100% rename from waspstation/icons/obj/drinks.dmi rename to whitesands/icons/obj/drinks.dmi diff --git a/waspstation/icons/obj/flags.dmi b/whitesands/icons/obj/flags.dmi similarity index 100% rename from waspstation/icons/obj/flags.dmi rename to whitesands/icons/obj/flags.dmi diff --git a/waspstation/icons/obj/guns/energy.dmi b/whitesands/icons/obj/guns/energy.dmi similarity index 100% rename from waspstation/icons/obj/guns/energy.dmi rename to whitesands/icons/obj/guns/energy.dmi diff --git a/waspstation/icons/obj/guns/projectile.dmi b/whitesands/icons/obj/guns/projectile.dmi similarity index 100% rename from waspstation/icons/obj/guns/projectile.dmi rename to whitesands/icons/obj/guns/projectile.dmi diff --git a/waspstation/icons/obj/items_and_weapons.dmi b/whitesands/icons/obj/items_and_weapons.dmi similarity index 100% rename from waspstation/icons/obj/items_and_weapons.dmi rename to whitesands/icons/obj/items_and_weapons.dmi diff --git a/waspstation/icons/obj/kitchen.dmi b/whitesands/icons/obj/kitchen.dmi similarity index 100% rename from waspstation/icons/obj/kitchen.dmi rename to whitesands/icons/obj/kitchen.dmi diff --git a/waspstation/icons/obj/lavaland/newlavalandplants.dmi b/whitesands/icons/obj/lavaland/newlavalandplants.dmi similarity index 100% rename from waspstation/icons/obj/lavaland/newlavalandplants.dmi rename to whitesands/icons/obj/lavaland/newlavalandplants.dmi diff --git a/waspstation/icons/obj/library.dmi b/whitesands/icons/obj/library.dmi similarity index 100% rename from waspstation/icons/obj/library.dmi rename to whitesands/icons/obj/library.dmi diff --git a/waspstation/icons/obj/machines/bsm.dmi b/whitesands/icons/obj/machines/bsm.dmi similarity index 100% rename from waspstation/icons/obj/machines/bsm.dmi rename to whitesands/icons/obj/machines/bsm.dmi diff --git a/waspstation/icons/obj/machines/cloning.dmi b/whitesands/icons/obj/machines/cloning.dmi similarity index 100% rename from waspstation/icons/obj/machines/cloning.dmi rename to whitesands/icons/obj/machines/cloning.dmi diff --git a/waspstation/icons/obj/machines/deepcore.dmi b/whitesands/icons/obj/machines/deepcore.dmi similarity index 100% rename from waspstation/icons/obj/machines/deepcore.dmi rename to whitesands/icons/obj/machines/deepcore.dmi diff --git a/waspstation/icons/obj/machines/drill.dmi b/whitesands/icons/obj/machines/drill.dmi similarity index 100% rename from waspstation/icons/obj/machines/drill.dmi rename to whitesands/icons/obj/machines/drill.dmi diff --git a/waspstation/icons/obj/machines/sleeper.dmi b/whitesands/icons/obj/machines/sleeper.dmi similarity index 100% rename from waspstation/icons/obj/machines/sleeper.dmi rename to whitesands/icons/obj/machines/sleeper.dmi diff --git a/waspstation/icons/obj/mining.dmi b/whitesands/icons/obj/mining.dmi similarity index 100% rename from waspstation/icons/obj/mining.dmi rename to whitesands/icons/obj/mining.dmi diff --git a/waspstation/icons/obj/monitors.dmi b/whitesands/icons/obj/monitors.dmi similarity index 100% rename from waspstation/icons/obj/monitors.dmi rename to whitesands/icons/obj/monitors.dmi diff --git a/waspstation/icons/obj/pda.dmi b/whitesands/icons/obj/pda.dmi similarity index 100% rename from waspstation/icons/obj/pda.dmi rename to whitesands/icons/obj/pda.dmi diff --git a/waspstation/icons/obj/plushes.dmi b/whitesands/icons/obj/plushes.dmi similarity index 100% rename from waspstation/icons/obj/plushes.dmi rename to whitesands/icons/obj/plushes.dmi diff --git a/waspstation/icons/obj/power.dmi b/whitesands/icons/obj/power.dmi similarity index 100% rename from waspstation/icons/obj/power.dmi rename to whitesands/icons/obj/power.dmi diff --git a/waspstation/icons/obj/radio.dmi b/whitesands/icons/obj/radio.dmi similarity index 100% rename from waspstation/icons/obj/radio.dmi rename to whitesands/icons/obj/radio.dmi diff --git a/waspstation/icons/obj/shuttle.dmi b/whitesands/icons/obj/shuttle.dmi similarity index 100% rename from waspstation/icons/obj/shuttle.dmi rename to whitesands/icons/obj/shuttle.dmi diff --git a/waspstation/icons/obj/smooth_structures/shuttle_window.dmi b/whitesands/icons/obj/smooth_structures/shuttle_window.dmi similarity index 100% rename from waspstation/icons/obj/smooth_structures/shuttle_window.dmi rename to whitesands/icons/obj/smooth_structures/shuttle_window.dmi diff --git a/waspstation/icons/obj/spacepods/2x2.dmi b/whitesands/icons/obj/spacepods/2x2.dmi similarity index 100% rename from waspstation/icons/obj/spacepods/2x2.dmi rename to whitesands/icons/obj/spacepods/2x2.dmi diff --git a/waspstation/icons/obj/spacepods/parts.dmi b/whitesands/icons/obj/spacepods/parts.dmi similarity index 100% rename from waspstation/icons/obj/spacepods/parts.dmi rename to whitesands/icons/obj/spacepods/parts.dmi diff --git a/waspstation/icons/obj/storage.dmi b/whitesands/icons/obj/storage.dmi similarity index 100% rename from waspstation/icons/obj/storage.dmi rename to whitesands/icons/obj/storage.dmi diff --git a/waspstation/icons/obj/structures_spawners.dmi b/whitesands/icons/obj/structures_spawners.dmi similarity index 100% rename from waspstation/icons/obj/structures_spawners.dmi rename to whitesands/icons/obj/structures_spawners.dmi diff --git a/waspstation/icons/obj/surgery.dmi b/whitesands/icons/obj/surgery.dmi similarity index 100% rename from waspstation/icons/obj/surgery.dmi rename to whitesands/icons/obj/surgery.dmi diff --git a/waspstation/icons/obj/syringe.dmi b/whitesands/icons/obj/syringe.dmi similarity index 100% rename from waspstation/icons/obj/syringe.dmi rename to whitesands/icons/obj/syringe.dmi diff --git a/waspstation/icons/obj/tapes.dmi b/whitesands/icons/obj/tapes.dmi similarity index 100% rename from waspstation/icons/obj/tapes.dmi rename to whitesands/icons/obj/tapes.dmi diff --git a/waspstation/icons/obj/terminals.dmi b/whitesands/icons/obj/terminals.dmi similarity index 100% rename from waspstation/icons/obj/terminals.dmi rename to whitesands/icons/obj/terminals.dmi diff --git a/waspstation/icons/obj/tools.dmi b/whitesands/icons/obj/tools.dmi similarity index 100% rename from waspstation/icons/obj/tools.dmi rename to whitesands/icons/obj/tools.dmi diff --git a/waspstation/icons/obj/vehicles.dmi b/whitesands/icons/obj/vehicles.dmi similarity index 100% rename from waspstation/icons/obj/vehicles.dmi rename to whitesands/icons/obj/vehicles.dmi diff --git a/waspstation/icons/obj/vending.dmi b/whitesands/icons/obj/vending.dmi similarity index 100% rename from waspstation/icons/obj/vending.dmi rename to whitesands/icons/obj/vending.dmi diff --git a/waspstation/icons/obj/wallmounts.dmi b/whitesands/icons/obj/wallmounts.dmi similarity index 100% rename from waspstation/icons/obj/wallmounts.dmi rename to whitesands/icons/obj/wallmounts.dmi diff --git a/waspstation/icons/rooms/box/engine.dmi b/whitesands/icons/rooms/box/engine.dmi similarity index 100% rename from waspstation/icons/rooms/box/engine.dmi rename to whitesands/icons/rooms/box/engine.dmi diff --git a/waspstation/icons/turf/decals.dmi b/whitesands/icons/turf/decals.dmi similarity index 100% rename from waspstation/icons/turf/decals.dmi rename to whitesands/icons/turf/decals.dmi diff --git a/waspstation/icons/turf/floors/medians.dmi b/whitesands/icons/turf/floors/medians.dmi similarity index 100% rename from waspstation/icons/turf/floors/medians.dmi rename to whitesands/icons/turf/floors/medians.dmi diff --git a/waspstation/icons/turf/floors/shuttle_floors.dmi b/whitesands/icons/turf/floors/shuttle_floors.dmi similarity index 100% rename from waspstation/icons/turf/floors/shuttle_floors.dmi rename to whitesands/icons/turf/floors/shuttle_floors.dmi diff --git a/waspstation/icons/turf/floors/whitesands/ws_floors.dmi b/whitesands/icons/turf/floors/whitesands/ws_floors.dmi similarity index 100% rename from waspstation/icons/turf/floors/whitesands/ws_floors.dmi rename to whitesands/icons/turf/floors/whitesands/ws_floors.dmi diff --git a/waspstation/icons/turf/overmap.dmi b/whitesands/icons/turf/overmap.dmi similarity index 100% rename from waspstation/icons/turf/overmap.dmi rename to whitesands/icons/turf/overmap.dmi diff --git a/waspstation/icons/turf/walls.dmi b/whitesands/icons/turf/walls.dmi similarity index 100% rename from waspstation/icons/turf/walls.dmi rename to whitesands/icons/turf/walls.dmi diff --git a/waspstation/icons/turf/walls/shuttle_wall.dmi b/whitesands/icons/turf/walls/shuttle_wall.dmi similarity index 100% rename from waspstation/icons/turf/walls/shuttle_wall.dmi rename to whitesands/icons/turf/walls/shuttle_wall.dmi diff --git a/waspstation/icons/turf/walls/whitesands/ws_walls.dmi b/whitesands/icons/turf/walls/whitesands/ws_walls.dmi similarity index 100% rename from waspstation/icons/turf/walls/whitesands/ws_walls.dmi rename to whitesands/icons/turf/walls/whitesands/ws_walls.dmi diff --git a/waspstation/sound/effects/footstep/squid1.ogg b/whitesands/sound/effects/footstep/squid1.ogg similarity index 100% rename from waspstation/sound/effects/footstep/squid1.ogg rename to whitesands/sound/effects/footstep/squid1.ogg diff --git a/waspstation/sound/effects/footstep/squid2.ogg b/whitesands/sound/effects/footstep/squid2.ogg similarity index 100% rename from waspstation/sound/effects/footstep/squid2.ogg rename to whitesands/sound/effects/footstep/squid2.ogg diff --git a/waspstation/sound/effects/footstep/squid3.ogg b/whitesands/sound/effects/footstep/squid3.ogg similarity index 100% rename from waspstation/sound/effects/footstep/squid3.ogg rename to whitesands/sound/effects/footstep/squid3.ogg diff --git a/waspstation/sound/effects/mowermove1.ogg b/whitesands/sound/effects/mowermove1.ogg similarity index 100% rename from waspstation/sound/effects/mowermove1.ogg rename to whitesands/sound/effects/mowermove1.ogg diff --git a/waspstation/sound/effects/mowermove2.ogg b/whitesands/sound/effects/mowermove2.ogg similarity index 100% rename from waspstation/sound/effects/mowermove2.ogg rename to whitesands/sound/effects/mowermove2.ogg diff --git a/waspstation/sound/effects/mowermovesquish.ogg b/whitesands/sound/effects/mowermovesquish.ogg similarity index 100% rename from waspstation/sound/effects/mowermovesquish.ogg rename to whitesands/sound/effects/mowermovesquish.ogg diff --git a/waspstation/sound/hornetnoises/Hornet_Fight_Death_01.ogg b/whitesands/sound/hornetnoises/Hornet_Fight_Death_01.ogg similarity index 100% rename from waspstation/sound/hornetnoises/Hornet_Fight_Death_01.ogg rename to whitesands/sound/hornetnoises/Hornet_Fight_Death_01.ogg diff --git a/waspstation/sound/hornetnoises/hornet_SHAW.ogg b/whitesands/sound/hornetnoises/hornet_SHAW.ogg similarity index 100% rename from waspstation/sound/hornetnoises/hornet_SHAW.ogg rename to whitesands/sound/hornetnoises/hornet_SHAW.ogg diff --git a/waspstation/sound/hornetnoises/hornet_gitgud.ogg b/whitesands/sound/hornetnoises/hornet_gitgud.ogg similarity index 100% rename from waspstation/sound/hornetnoises/hornet_gitgud.ogg rename to whitesands/sound/hornetnoises/hornet_gitgud.ogg diff --git a/waspstation/sound/items/tape.ogg b/whitesands/sound/items/tape.ogg similarity index 100% rename from waspstation/sound/items/tape.ogg rename to whitesands/sound/items/tape.ogg diff --git a/waspstation/sound/voice/speen.ogg b/whitesands/sound/voice/speen.ogg similarity index 100% rename from waspstation/sound/voice/speen.ogg rename to whitesands/sound/voice/speen.ogg diff --git a/waspstation/sound/voice/squid/squidscream.ogg b/whitesands/sound/voice/squid/squidscream.ogg similarity index 100% rename from waspstation/sound/voice/squid/squidscream.ogg rename to whitesands/sound/voice/squid/squidscream.ogg diff --git a/waspstation/sound/weapons/SolGov_sword_arm.ogg b/whitesands/sound/weapons/SolGov_sword_arm.ogg similarity index 100% rename from waspstation/sound/weapons/SolGov_sword_arm.ogg rename to whitesands/sound/weapons/SolGov_sword_arm.ogg diff --git a/waspstation/sound/weapons/gun/shotgun/quadfire.ogg b/whitesands/sound/weapons/gun/shotgun/quadfire.ogg similarity index 100% rename from waspstation/sound/weapons/gun/shotgun/quadfire.ogg rename to whitesands/sound/weapons/gun/shotgun/quadfire.ogg diff --git a/waspstation/sound/weapons/gun/shotgun/quadinsert.ogg b/whitesands/sound/weapons/gun/shotgun/quadinsert.ogg similarity index 100% rename from waspstation/sound/weapons/gun/shotgun/quadinsert.ogg rename to whitesands/sound/weapons/gun/shotgun/quadinsert.ogg diff --git a/waspstation/sound/weapons/gun/shotgun/quadrack.ogg b/whitesands/sound/weapons/gun/shotgun/quadrack.ogg similarity index 100% rename from waspstation/sound/weapons/gun/shotgun/quadrack.ogg rename to whitesands/sound/weapons/gun/shotgun/quadrack.ogg diff --git a/waspstation/tools/generate-spider-names.sh b/whitesands/tools/generate-spider-names.sh similarity index 100% rename from waspstation/tools/generate-spider-names.sh rename to whitesands/tools/generate-spider-names.sh diff --git a/waspstation/tools/merge-upstream-pull-request.sh b/whitesands/tools/merge-upstream-pull-request.sh similarity index 100% rename from waspstation/tools/merge-upstream-pull-request.sh rename to whitesands/tools/merge-upstream-pull-request.sh diff --git a/waspstation/tools/spidernames.js b/whitesands/tools/spidernames.js similarity index 100% rename from waspstation/tools/spidernames.js rename to whitesands/tools/spidernames.js
- Current Project Maintainers
 - Recent GitHub contributors
 + Current Project Maintainers
 + Recent GitHub contributors
 Thanks to: /tg/ Station 13, Beestation 13, Oraclestation 13, Baystation 12, /vg/station, NTstation, CDK Station devs, FacepunchStation, GoonStation devs, the original Space Station 13 developers, and the countless others who have contributed to the game, issue tracker or wiki. -
Have a bug to report? Visit our Issue Tracker.
 +
Have a bug to report? Visit our Issue Tracker.
 Please search first to ensure that the bug has not already been reported.