diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 7fea425861a..14c7e400363 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -104,8 +104,8 @@ The use of the : operator to override type safety checks is not allowed. You mus ### Type paths must begin with a / eg: `/datum/thing`, not `datum/thing` -### Type paths must be lowercase -eg: `/datum/thing/blue`, not `datum/thing/BLUE` or `datum/thing/Blue` +### Type paths must be snake case +eg: `/datum/thing/blue_bird`, not `datum/thing/BLUEBIRD` or `datum/thing/BlueBird` or `datum/thing/Bluebird` or `datum/thing/blueBird` ### Datum type paths must began with "datum" In DM, this is optional, but omitting it makes finding definitions harder. diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 9293681a9c4..63c1bcd22ce 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -792,7 +792,7 @@ /area/ruin/powered/beach) "xE" = ( /obj/structure/easel, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythree_twentythree, /turf/open/floor/plating/beach/sand, /area/ruin/powered/beach) "xS" = ( @@ -1377,9 +1377,9 @@ "SZ" = ( /obj/item/storage/crayons, /obj/structure/closet/crate/wooden, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, /turf/open/floor/plating/beach/sand, /area/ruin/powered/beach) "Ti" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index 8c4715da5e6..3f6151d72f8 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -794,7 +794,7 @@ }, /area/ruin/powered/clownplanet) "bz" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1 }, /obj/structure/disposalpipe/trunk, @@ -926,7 +926,7 @@ /turf/open/floor/carpet, /area/ruin/powered/clownplanet) "bN" = ( -/obj/machinery/disposal/deliveryChute, +/obj/machinery/disposal/delivery_chute, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -1272,7 +1272,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/explored) "LH" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ desc = "The following is engraved upon the chute: A FATE WORSE THAN DEATH LIES WITHIN"; dir = 1; name = "THE TRIAL OF HONKITUDE" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 4acac3e6c6c..4f939cb77f0 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -1638,7 +1638,7 @@ /obj/item/stack/wrapping_paper{ pixel_y = 5 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -1834,7 +1834,7 @@ name = "Virology Lab Exterior Airlock"; req_access_txt = "150" }, -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "lavaland_syndie_virology_exterior"; idSelf = "lavaland_syndie_virology_control"; name = "Virology Access Button"; @@ -2061,7 +2061,7 @@ /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/virology) "gX" = ( -/obj/machinery/doorButtons/airlock_controller{ +/obj/machinery/door_buttons/airlock_controller{ idExterior = "lavaland_syndie_virology_exterior"; idInterior = "lavaland_syndie_virology_interior"; idSelf = "lavaland_syndie_virology_control"; @@ -2091,7 +2091,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "lavaland_syndie_virology_interior"; idSelf = "lavaland_syndie_virology_control"; name = "Virology Access Button"; @@ -4796,7 +4796,7 @@ }, /obj/structure/bed/roller, /obj/machinery/iv_drip, -/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/o_minus, /obj/machinery/firealarm{ dir = 8; pixel_x = -26 diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 22d00d84119..a04a3e64ed5 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -393,7 +393,7 @@ "bV" = ( /obj/structure/rack, /obj/item/circuitboard/machine/circuit_imprinter, -/obj/item/aiModule/core/full/drone{ +/obj/item/ai_module/core/full/drone{ pixel_x = -4; pixel_y = -2 }, @@ -3911,7 +3911,7 @@ /turf/template_noop, /area/space/nearstation) "ZM" = ( -/obj/machinery/droneDispenser/derelict, +/obj/machinery/drone_dispenser/derelict, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index 858b65e4b41..10e2869fd54 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -9,10 +9,10 @@ /area/space/nearstation) "ac" = ( /turf/closed/wall/mineral/titanium, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ae" = ( /turf/closed/wall/mineral/titanium/overspace, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ag" = ( /obj/machinery/porta_turret{ dir = 8; @@ -20,29 +20,29 @@ set_obj_flags = "EMAGGED" }, /turf/open/floor/engine, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ah" = ( /turf/open/floor/engine, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ai" = ( /obj/machinery/light/small{ dir = 8 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "aj" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 4 }, /turf/open/floor/engine, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ak" = ( /obj/machinery/door/airlock/titanium, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "al" = ( /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "am" = ( /obj/structure/lattice, /turf/template_noop, @@ -53,67 +53,67 @@ dir = 4 }, /turf/open/floor/engine, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ao" = ( /obj/machinery/light/small, /turf/open/floor/engine, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ap" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "aq" = ( /turf/closed/wall/mineral/titanium, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "ar" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/titanium, /turf/open/floor/plating{ icon_state = "panelscorched" }, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "as" = ( /obj/structure/bed/roller, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "at" = ( /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "au" = ( /obj/item/restraints/handcuffs, /obj/item/restraints/handcuffs, /obj/structure/closet/crate, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "av" = ( /obj/item/scalpel, /obj/structure/closet/crate, /obj/item/tank/internals/anesthetic, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "aw" = ( /obj/item/bodybag, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "ax" = ( /obj/item/storage/box/syringes, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "az" = ( /obj/structure/table/optable, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "aA" = ( /obj/machinery/computer/operating{ dir = 8 }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "aB" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "aC" = ( /obj/structure/closet/crate/freezer, /obj/item/organ/appendix, @@ -123,7 +123,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "aD" = ( /obj/structure/closet/crate/freezer, /obj/item/organ/brain, @@ -133,15 +133,15 @@ dir = 1 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "aE" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "aF" = ( /obj/structure/table, /obj/item/storage/box, @@ -152,140 +152,140 @@ dir = 1 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "aG" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "aI" = ( /turf/closed/wall/mineral/titanium/overspace, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "aM" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "aN" = ( /obj/item/storage/box, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "aO" = ( /obj/item/hand_labeler, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "aP" = ( /obj/structure/closet/crate/large, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "aR" = ( /obj/structure/table/wood, /obj/item/stack/spacecash/c500, /obj/item/stack/spacecash/c100, /obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/wood, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "aS" = ( /obj/structure/bed, /obj/item/bedsheet/yellow, /turf/open/floor/wood, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "aT" = ( /turf/closed/wall/mineral/titanium, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "aU" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "aV" = ( /obj/structure/rack, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "aW" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "aX" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "aY" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall/mineral/titanium, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bb" = ( /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/gibspawner/human, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "bc" = ( /obj/item/clothing/glasses/regular/hipster, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "be" = ( /obj/machinery/door/airlock/titanium, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "bh" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/food/drinks/beer, /obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bi" = ( /obj/machinery/computer/teleporter, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bj" = ( /obj/machinery/teleport/station, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bk" = ( /obj/machinery/teleport/hub, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bl" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 4 }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bm" = ( /turf/open/floor/wood, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bn" = ( /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/wood, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bo" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bp" = ( /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bq" = ( /obj/machinery/door/airlock/external, /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bs" = ( /obj/structure/closet/crate, /obj/item/stack/spacecash/c1000, @@ -294,93 +294,93 @@ dir = 4 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bt" = ( /obj/structure/window/reinforced, /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 4 }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bu" = ( /turf/open/floor/wood{ icon_state = "wood-broken" }, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bv" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bw" = ( /obj/machinery/light/small, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bx" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "by" = ( /obj/machinery/light, /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "bA" = ( /obj/machinery/sleeper{ dir = 1 }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "bB" = ( /obj/machinery/sleep_console, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "bC" = ( /obj/machinery/light, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "bH" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bK" = ( /obj/machinery/door/poddoor/shutters{ id = "packerMed" }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "bL" = ( /obj/structure/closet/crate/large, /obj/effect/turf_decal/stripes/line{ dir = 10 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bM" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bN" = ( /obj/machinery/light/small, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bO" = ( /obj/structure/kitchenspike, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bP" = ( /obj/structure/closet/crate, /obj/item/analyzer, /obj/item/stack/spacecash/c10, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bQ" = ( /obj/structure/closet/crate, /obj/item/stack/spacecash/c1000, @@ -388,7 +388,7 @@ /obj/item/stack/spacecash/c500, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bR" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/food/snacks/hugemushroomslice, @@ -397,16 +397,16 @@ /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bU" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "bV" = ( /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bW" = ( /obj/machinery/power/apc/unlocked{ dir = 1; @@ -415,7 +415,7 @@ }, /obj/structure/cable, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "bX" = ( /obj/structure/table, /obj/item/screwdriver, @@ -427,7 +427,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "bY" = ( /obj/machinery/light{ dir = 1 @@ -437,7 +437,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "bZ" = ( /obj/machinery/hydroponics, /obj/effect/turf_decal/tile/green{ @@ -447,7 +447,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "ca" = ( /obj/structure/sink, /obj/effect/turf_decal/tile/yellow{ @@ -457,7 +457,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cb" = ( /obj/machinery/vending/hydroseeds{ slogan_delay = 700 @@ -469,7 +469,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cc" = ( /obj/machinery/vending/hydronutrients, /obj/effect/turf_decal/tile/yellow{ @@ -479,7 +479,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cd" = ( /obj/machinery/hydroponics, /obj/effect/turf_decal/tile/green, @@ -487,14 +487,14 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "ce" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cf" = ( /obj/structure/table, /obj/item/kitchen/knife/butcher, @@ -507,7 +507,7 @@ dir = 8 }, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cg" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, @@ -518,7 +518,7 @@ dir = 8 }, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "ch" = ( /obj/structure/table, /obj/machinery/microwave, @@ -529,7 +529,7 @@ dir = 8 }, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "ci" = ( /obj/machinery/processor, /obj/machinery/light{ @@ -545,7 +545,7 @@ dir = 8 }, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cj" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/beer, @@ -554,7 +554,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "ck" = ( /obj/structure/table, /obj/item/kitchen/knife, @@ -563,7 +563,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cl" = ( /obj/structure/table, /obj/machinery/light/small{ @@ -574,7 +574,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cm" = ( /obj/structure/table, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -583,7 +583,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cp" = ( /obj/item/reagent_containers/food/snacks/hugemushroomslice, /obj/effect/turf_decal/tile/bar, @@ -591,14 +591,14 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cq" = ( /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cr" = ( /obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cs" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -607,7 +607,7 @@ dir = 8 }, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "ct" = ( /obj/structure/window/reinforced{ dir = 4 @@ -619,7 +619,7 @@ dir = 8 }, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cu" = ( /obj/structure/chair/stool, /obj/effect/turf_decal/tile/bar, @@ -627,45 +627,45 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cv" = ( /obj/structure/kitchenspike, /turf/open/floor/plasteel/showroomfloor, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cw" = ( /turf/open/floor/plasteel/showroomfloor, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cx" = ( /obj/machinery/door/airlock/titanium, /turf/open/floor/plasteel/showroomfloor, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cy" = ( /turf/open/floor/plasteel/white, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cz" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plasteel/white, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cA" = ( /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/plasteel/white, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cB" = ( /obj/machinery/gibber, /turf/open/floor/plasteel/white, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cE" = ( /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cG" = ( /turf/closed/wall/mineral/titanium/interior, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "cJ" = ( /obj/item/reagent_containers/food/snacks/hugemushroomslice, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cK" = ( /obj/machinery/door/airlock/titanium, /obj/effect/turf_decal/tile/bar, @@ -673,7 +673,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cL" = ( /obj/structure/window/reinforced, /obj/effect/turf_decal/tile/blue{ @@ -683,7 +683,7 @@ dir = 8 }, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cM" = ( /obj/structure/window/reinforced, /obj/effect/turf_decal/tile/blue{ @@ -694,7 +694,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cN" = ( /obj/machinery/door/window, /obj/effect/turf_decal/tile/blue{ @@ -704,7 +704,7 @@ dir = 8 }, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cO" = ( /obj/structure/window/reinforced{ dir = 4 @@ -717,7 +717,7 @@ dir = 8 }, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cP" = ( /obj/item/reagent_containers/food/drinks/beer, /obj/effect/turf_decal/tile/bar, @@ -725,37 +725,37 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "cQ" = ( /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cR" = ( /obj/structure/closet/secure_closet/freezer/meat/open{ opened = 1 }, /turf/open/floor/plasteel/white, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cS" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/food/snacks/meat/slab, /obj/item/reagent_containers/food/snacks/meat/slab, /turf/open/floor/plasteel/white, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cT" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plasteel/white, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cU" = ( /obj/item/crowbar, /turf/open/floor/plasteel/white, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cV" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cW" = ( /obj/machinery/power/apc/unlocked{ dir = 1; @@ -764,33 +764,33 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cX" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "cY" = ( /obj/structure/table, /obj/item/paper/fluff/ruins/crashedship/captains_log, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "cZ" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "da" = ( /obj/structure/frame/computer{ anchored = 1 }, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "db" = ( /obj/structure/cable, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "dc" = ( /obj/machinery/hydroponics, /obj/effect/turf_decal/tile/green{ @@ -801,14 +801,14 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dd" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ dir = 8 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "de" = ( /obj/machinery/seed_extractor, /obj/item/seeds/plump/walkingmushroom, @@ -817,7 +817,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "df" = ( /obj/machinery/hydroponics, /obj/effect/turf_decal/tile/green, @@ -828,7 +828,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dg" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -836,22 +836,22 @@ }, /obj/structure/cable, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dk" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "dl" = ( /obj/structure/cable, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "dm" = ( /obj/structure/cable, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "dq" = ( /obj/item/multitool, /turf/open/floor/engine, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "dr" = ( /obj/structure/shuttle/engine/heater{ dir = 4 @@ -860,29 +860,29 @@ dir = 8 }, /turf/open/floor/engine/airless, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ds" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4 }, /turf/template_noop, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "dt" = ( /obj/structure/table, /obj/machinery/recharger, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "du" = ( /obj/structure/chair/stool, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "dv" = ( /obj/machinery/light{ dir = 4 }, /obj/structure/cable, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "dw" = ( /obj/machinery/light/small{ dir = 8 @@ -892,7 +892,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dA" = ( /obj/machinery/light/small{ dir = 4 @@ -902,16 +902,16 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dB" = ( /turf/closed/wall/r_wall, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dC" = ( /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/plasteel/showroomfloor, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "dD" = ( /obj/machinery/light/small{ dir = 8 @@ -920,27 +920,27 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "dG" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 1 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "dH" = ( /obj/item/shard, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "dJ" = ( /obj/machinery/door/airlock/titanium, /obj/structure/cable, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "dL" = ( /obj/machinery/power/shieldwallgen, /obj/structure/cable, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dN" = ( /obj/machinery/power/apc/unlocked{ dir = 1; @@ -952,21 +952,21 @@ }, /obj/structure/cable, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dO" = ( /obj/effect/turf_decal/loading_area{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dP" = ( /obj/machinery/conveyor{ dir = 4; id = "meatConvey1" }, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dQ" = ( /obj/machinery/conveyor{ dir = 4; @@ -974,22 +974,22 @@ }, /obj/structure/plasticflaps, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dR" = ( /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dS" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/closed/wall/r_wall, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1000,7 +1000,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dU" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -1010,7 +1010,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "dV" = ( /obj/structure/window/reinforced{ dir = 8 @@ -1019,13 +1019,13 @@ dir = 1 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "dW" = ( /obj/structure/window/reinforced{ dir = 1 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "dX" = ( /obj/structure/window/reinforced{ dir = 4 @@ -1034,7 +1034,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "dY" = ( /obj/structure/rack, /obj/item/storage/box/lights, @@ -1042,7 +1042,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ea" = ( /obj/machinery/power/smes/magical{ desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; @@ -1050,49 +1050,49 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "eb" = ( /obj/machinery/power/terminal{ dir = 8 }, /obj/structure/cable, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ed" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 4 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "ee" = ( /obj/structure/table, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "ef" = ( /obj/structure/chair{ dir = 8 }, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "eg" = ( /obj/item/shard{ icon_state = "medium" }, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "eh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "ei" = ( /obj/structure/window/reinforced{ dir = 4 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "ej" = ( /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "ek" = ( /obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/tile/bar, @@ -1100,7 +1100,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "el" = ( /obj/machinery/conveyor_switch/oneway{ id = "meatConvey1" @@ -1110,7 +1110,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "em" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -1120,7 +1120,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "en" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1133,20 +1133,20 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "eo" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plasteel/showroomfloor, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ep" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "eq" = ( /obj/structure/window/reinforced{ dir = 8 @@ -1158,17 +1158,17 @@ dir = 4 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "er" = ( /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "es" = ( /obj/structure/window/reinforced{ dir = 4 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "et" = ( /obj/structure/rack, /obj/item/storage/belt/utility/full, @@ -1176,12 +1176,12 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ey" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/gibspawner/xeno, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "eC" = ( /obj/machinery/light/small{ dir = 1 @@ -1191,17 +1191,17 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "eD" = ( /obj/structure/window/reinforced{ dir = 8 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "eE" = ( /obj/effect/gibspawner/human, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "eF" = ( /obj/machinery/door/window{ base_state = "right"; @@ -1209,7 +1209,7 @@ icon_state = "right" }, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "eG" = ( /obj/structure/rack, /obj/item/stock_parts/cell/high, @@ -1217,7 +1217,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "eH" = ( /obj/structure/window/reinforced{ dir = 8 @@ -1226,14 +1226,14 @@ dir = 6 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "eI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 8 }, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "eJ" = ( /obj/machinery/door/window{ base_state = "right"; @@ -1241,7 +1241,7 @@ icon_state = "right" }, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "eK" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/bar, @@ -1249,7 +1249,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "eL" = ( /obj/effect/gibspawner/generic, /obj/effect/turf_decal/tile/bar, @@ -1257,34 +1257,34 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "eP" = ( /obj/structure/rack, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "eS" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/power/port_gen/pacman/super, /turf/open/floor/engine, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "eT" = ( /obj/structure/closet, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "eU" = ( /obj/machinery/light{ dir = 4 }, /obj/structure/closet, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "eV" = ( /obj/item/wrench, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "eW" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -1294,7 +1294,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "eX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1304,31 +1304,31 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "eY" = ( /obj/structure/mopbucket, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "eZ" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/item/kitchen/knife, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fa" = ( /obj/item/stock_parts/cell/high, /obj/structure/cable, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fc" = ( /obj/machinery/door/airlock/titanium, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fe" = ( /obj/effect/gibspawner/xeno, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "ff" = ( /obj/structure/window/reinforced{ dir = 4 @@ -1336,7 +1336,7 @@ /turf/open/floor/plasteel{ icon_state = "panelscorched" }, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "fg" = ( /obj/structure/kitchenspike, /obj/effect/turf_decal/tile/bar, @@ -1344,7 +1344,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "fi" = ( /obj/machinery/conveyor{ dir = 4; @@ -1352,7 +1352,7 @@ }, /obj/item/kitchen/knife, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "fj" = ( /obj/machinery/conveyor{ dir = 4; @@ -1360,14 +1360,14 @@ }, /obj/structure/plasticflaps, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "fk" = ( /obj/machinery/conveyor{ dir = 4; id = "meatConvey2" }, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "fl" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -1377,32 +1377,32 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "fm" = ( /turf/closed/wall/mineral/titanium/interior, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "fn" = ( /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/window/reinforced, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fo" = ( /obj/structure/window/reinforced, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fp" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/window/reinforced, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fq" = ( /obj/item/stack/cable_coil, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fr" = ( /obj/machinery/light/small{ dir = 4 @@ -1411,44 +1411,44 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fs" = ( /obj/item/stack/sheet/mineral/uranium{ amount = 50 }, /turf/open/floor/engine, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ft" = ( /turf/open/floor/plating/airless{ icon_state = "platingdmg1" }, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fu" = ( /obj/structure/lattice, /turf/template_noop, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fv" = ( /turf/open/floor/plating/airless{ icon_state = "platingdmg3" }, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fw" = ( /obj/structure/cable, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fx" = ( /obj/item/shard{ icon_state = "small" }, /obj/structure/cable, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fy" = ( /obj/structure/cable, /turf/open/floor/plating/airless{ icon_state = "panelscorched" }, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fA" = ( /obj/item/kitchen/knife, /obj/effect/turf_decal/tile/bar, @@ -1457,7 +1457,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "fB" = ( /obj/machinery/conveyor_switch/oneway{ id = "meatConvey2" @@ -1467,61 +1467,61 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "fF" = ( /obj/item/mop, /turf/open/floor/plasteel/showroomfloor, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fG" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fH" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fI" = ( /turf/open/floor/plating/airless{ icon_state = "platingdmg2" }, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fJ" = ( /obj/item/shard, /turf/open/floor/plating/airless{ icon_state = "platingdmg1" }, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fK" = ( /obj/structure/chair/stool, /turf/open/floor/plating/airless{ icon_state = "platingdmg3" }, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fL" = ( /obj/item/stack/cable_coil{ amount = 5 }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fO" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/food/snacks/meat, /turf/open/floor/plasteel/showroomfloor, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fP" = ( /obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/showroomfloor, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fQ" = ( /obj/structure/reagent_dispensers, /turf/open/floor/plasteel/showroomfloor, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fS" = ( /turf/open/floor/plating/asteroid/airless, -/area/awaymission/BMPship) +/area/awaymission/bmpship) "fT" = ( /obj/structure/frame/computer{ anchored = 1; @@ -1530,7 +1530,7 @@ /turf/open/floor/plating/airless{ icon_state = "panelscorched" }, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fU" = ( /obj/structure/frame/computer{ anchored = 1; @@ -1539,7 +1539,7 @@ /turf/open/floor/plating/airless{ icon_state = "platingdmg1" }, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "fV" = ( /obj/machinery/light/small, /obj/effect/turf_decal/tile/bar, @@ -1547,83 +1547,83 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "fW" = ( /turf/open/floor/plasteel{ icon_state = "platingdmg3" }, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "fX" = ( /turf/open/floor/plasteel{ icon_state = "platingdmg1" }, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "fY" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/titanium, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "fZ" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/titanium, /obj/structure/cable, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ga" = ( /obj/machinery/door/airlock/titanium, /obj/structure/cable, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "gb" = ( /turf/closed/mineral/random, -/area/awaymission/BMPship) +/area/awaymission/bmpship) "gc" = ( /obj/item/multitool, /turf/open/floor/plating/airless{ icon_state = "platingdmg2" }, -/area/awaymission/BMPship) +/area/awaymission/bmpship) "gd" = ( /obj/machinery/door/airlock/titanium, /obj/structure/cable, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "ge" = ( /obj/machinery/door/airlock/titanium, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "gf" = ( /obj/machinery/light{ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "gg" = ( /obj/structure/chair/stool, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "gh" = ( /obj/structure/table, /obj/item/paper/fluff/ruins/crashedship/old_diary, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "gi" = ( /obj/structure/table, /obj/item/pen/red, /obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "gj" = ( /obj/structure/closet, /obj/item/clothing/under/misc/overalls, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "gk" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 1 }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gl" = ( /obj/machinery/porta_turret{ dir = 8; @@ -1631,80 +1631,80 @@ set_obj_flags = "EMAGGED" }, /turf/open/floor/engine, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gm" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/engine, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gn" = ( /obj/structure/cable, /turf/open/floor/plating/airless{ icon_state = "platingdmg3" }, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "go" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gp" = ( /turf/open/floor/plating/asteroid/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gq" = ( /obj/structure/rack, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gr" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plating/asteroid/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gs" = ( /turf/open/floor/plating/asteroid/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "gt" = ( /turf/open/floor/plating/airless{ icon_state = "platingdmg1" }, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "gv" = ( /obj/item/wallframe/apc, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "gx" = ( /obj/item/stack/cable_coil{ amount = 5 }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "gy" = ( /obj/structure/ore_box, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "gz" = ( /obj/machinery/computer/arcade, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "gA" = ( /obj/effect/decal/remains/human, /obj/structure/cable, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "gD" = ( /obj/item/wallframe/apc, /obj/structure/cable, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "gE" = ( /obj/effect/decal/remains/human, /obj/item/clothing/head/helmet/space/syndicate/green/dark, /obj/effect/gibspawner/generic, /turf/open/floor/plating/asteroid/airless, -/area/awaymission/BMPship) +/area/awaymission/bmpship) "gF" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 4 @@ -1713,78 +1713,78 @@ icon_state = "small" }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gG" = ( /turf/open/floor/engine, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gH" = ( /obj/machinery/door/airlock/titanium, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gI" = ( /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gJ" = ( /obj/effect/gibspawner/robot, /turf/open/floor/plasteel/airless{ icon_state = "floorscorched2" }, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gK" = ( /turf/closed/mineral/random, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gL" = ( /turf/open/floor/plating/airless{ icon_state = "platingdmg2" }, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "gM" = ( /obj/structure/mecha_wreckage/ripley, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "gN" = ( /obj/structure/bed, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "gO" = ( /obj/structure/bed, /obj/item/bedsheet, /obj/item/storage/wallet/random, /obj/structure/cable, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "gP" = ( /obj/structure/closet, /obj/item/clothing/under/rank/civilian/lawyer/bluesuit, /obj/item/clothing/suit/apron, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "gQ" = ( /obj/item/clothing/suit/space/syndicate/green/dark, /turf/open/floor/plating/asteroid/airless, -/area/awaymission/BMPship) +/area/awaymission/bmpship) "gR" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 6 }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "gS" = ( /turf/closed/wall/mineral/titanium, -/area/awaymission/BMPship) +/area/awaymission/bmpship) "gT" = ( /obj/effect/gibspawner/robot, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "gU" = ( /obj/structure/cable, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "gW" = ( /obj/machinery/door/airlock/titanium, /obj/structure/cable, /turf/open/floor/plating, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "gZ" = ( /obj/item/shard{ icon_state = "medium" @@ -1795,26 +1795,26 @@ /turf/open/floor/plating/airless{ icon_state = "panelscorched" }, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "hb" = ( /obj/effect/decal/remains/human, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hc" = ( /obj/structure/bed, /obj/item/bedsheet, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hd" = ( /obj/machinery/door/airlock/titanium, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "he" = ( /obj/structure/mirror{ pixel_y = 28 }, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hf" = ( /obj/structure/toilet{ dir = 8 @@ -1823,89 +1823,89 @@ dir = 1 }, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hg" = ( /turf/open/floor/plating/airless{ icon_state = "platingdmg3" }, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "hh" = ( /obj/item/clothing/suit/caution, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "hi" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "hj" = ( /obj/structure/closet/crate, /obj/item/stack/spacecash/c10, /obj/item/stack/spacecash/c200, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hk" = ( /obj/structure/closet/crate, /obj/item/stack/spacecash/c10, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hl" = ( /obj/structure/sink, /turf/open/floor/plasteel/cafeteria, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hn" = ( /obj/item/clothing/gloves/color/fyellow, /turf/open/floor/plating/asteroid/airless, -/area/awaymission/BMPship) +/area/awaymission/bmpship) "ho" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 1 }, /turf/open/floor/engine, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hp" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/engine, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hq" = ( /obj/item/storage/box/matches, /obj/item/storage/fancy/cigarettes/dromedaryco, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hr" = ( /obj/item/poster/random_contraband, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hs" = ( /obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plating, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "ht" = ( /turf/closed/wall/mineral/titanium/interior, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hu" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/engine, -/area/awaymission/BMPship/Aft) +/area/awaymission/bmpship/aft) "hv" = ( /turf/closed/mineral/diamond, -/area/awaymission/BMPship) +/area/awaymission/bmpship) "hw" = ( /turf/closed/mineral/bananium, -/area/awaymission/BMPship) +/area/awaymission/bmpship) "hE" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "vh" = ( /turf/template_noop, /area/space/nearstation) "wh" = ( /turf/template_noop, -/area/awaymission/BMPship) +/area/awaymission/bmpship) "xA" = ( /turf/closed/mineral/random/no_caves, -/area/awaymission/BMPship) +/area/awaymission/bmpship) "ya" = ( /obj/machinery/door/poddoor/shutters{ id = "packerMine" @@ -1915,23 +1915,23 @@ pixel_x = -24 }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "EQ" = ( /obj/structure/lattice, /turf/template_noop, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "Hy" = ( /obj/machinery/door/poddoor/shutters{ id = "packerMine" }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "Kj" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plating/asteroid/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "KU" = ( /obj/machinery/door/poddoor/shutters{ id = "packerMed" @@ -1941,10 +1941,10 @@ pixel_x = -24 }, /turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "Mx" = ( /turf/closed/mineral/random, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "QM" = ( /obj/machinery/light/small{ dir = 1 @@ -1952,14 +1952,14 @@ /turf/open/floor/plating/airless{ icon_state = "platingdmg1" }, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) "Xc" = ( /obj/structure/frame/computer{ anchored = 1; dir = 4 }, /turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) +/area/awaymission/bmpship/fore) "Zb" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -1967,7 +1967,7 @@ }, /obj/machinery/light/small, /turf/open/floor/plasteel, -/area/awaymission/BMPship/Midship) +/area/awaymission/bmpship/midship) (1,1,1) = {" aa diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 45f1d3a5927..130b034da78 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -168,7 +168,7 @@ /obj/item/stack/cable_coil, /obj/item/stack/sheet/mineral/wood, /obj/item/stack/sheet/mineral/wood, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/effect/turf_decal/delivery, /obj/machinery/airalarm/away{ pixel_y = 23 @@ -2552,11 +2552,11 @@ /area/ruin/space/has_grav/deepstorage/dorm) "gy" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_minus, /obj/item/reagent_containers/blood/random, /obj/item/reagent_containers/blood/random, /obj/item/reagent_containers/blood/random, diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm index f8d0de8e665..de668693492 100644 --- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm +++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm @@ -784,7 +784,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/aiModule/core/full/cybersun, +/obj/item/ai_module/core/full/cybersun, /obj/structure/table/reinforced, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/syndicate_forgotten_ship) @@ -1168,7 +1168,7 @@ req_one_access_txt = "150"; secure = 1 }, -/obj/item/clothing/head/HoS/beret/syndicate, +/obj/item/clothing/head/hos/beret/syndicate, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/under/syndicate, diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm index ea18a6dd41f..fccfa5afb0a 100644 --- a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm +++ b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm @@ -298,7 +298,7 @@ /area/ruin/space/has_grav/hellfactoryoffice) "aS" = ( /obj/structure/closet/crate, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/open/floor/plating, /area/ruin/space/has_grav/hellfactory) "aT" = ( @@ -510,7 +510,7 @@ /area/ruin/space/has_grav/hellfactory) "bA" = ( /obj/structure/closet/crate, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hellfactory) "bB" = ( @@ -981,7 +981,7 @@ "nT" = ( /obj/structure/rack, /obj/item/stack/wrapping_paper, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hellfactory) diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 11e776a296e..2bbdd039946 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -955,11 +955,11 @@ /area/ruin/space/has_grav/listeningstation) "bs" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/blood/OMinus{ +/obj/item/reagent_containers/blood/o_minus{ pixel_x = -3; pixel_y = 3 }, -/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/o_minus, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4; diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index a6fbd5754db..247630c4bf8 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -583,7 +583,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/ancientstation/comm) "bA" = ( -/obj/structure/AIcore/deactivated, +/obj/structure/ai_core/deactivated, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/ancientstation/deltaai) "bB" = ( diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index 96c89066fce..3b4aa9abd9a 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -191,8 +191,8 @@ /obj/structure/closet/crate/medical, /obj/item/clothing/neck/stethoscope, /obj/item/healthanalyzer, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_minus, /obj/machinery/power/apc{ dir = 4; name = "Crew Quarters APC"; diff --git a/_maps/RandomRuins/SpaceRuins/originalcontent.dmm b/_maps/RandomRuins/SpaceRuins/originalcontent.dmm index 7d718d69043..e1aed455248 100644 --- a/_maps/RandomRuins/SpaceRuins/originalcontent.dmm +++ b/_maps/RandomRuins/SpaceRuins/originalcontent.dmm @@ -825,9 +825,9 @@ dir = 6 }, /obj/structure/table/wood, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythree_twentythree, /obj/item/canvas, -/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/nineteen_nineteen, /turf/open/indestructible/paper, /area/ruin/powered) "co" = ( diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index a001d8df754..9c246da51d3 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -7,105 +7,105 @@ /area/space) "ac" = ( /turf/closed/mineral/volcanic, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "ad" = ( /turf/open/lava/smooth{ desc = "Looks hot."; initial_gas_mix = "n2=23;o2=14"; luminosity = 5 }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "ae" = ( /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "af" = ( /obj/item/greentext, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "ag" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "ah" = ( /turf/open/lava/smooth{ desc = "Looks hot."; initial_gas_mix = "n2=23;o2=14"; luminosity = 5 }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "ai" = ( /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aj" = ( /obj/structure/flora/rock, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "ak" = ( /turf/closed/mineral/random/high_chance, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "al" = ( /obj/effect/forcefield/cult, /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "am" = ( /obj/effect/decal/remains/human, /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "an" = ( /obj/structure/destructible/cult/pylon, /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "ao" = ( /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "ap" = ( /obj/structure/destructible/cult/pylon, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aq" = ( /obj/item/ectoplasm, /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "ar" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "as" = ( /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "at" = ( /obj/structure/spawner/skeleton, /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "au" = ( /obj/structure/destructible/cult/talisman, /obj/effect/decal/remains/human, @@ -118,7 +118,7 @@ /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "av" = ( /obj/structure/trap/stun{ desc = "A rune inscribed in the floor, the air feeling electrified around it."; @@ -127,16 +127,16 @@ /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aw" = ( /obj/effect/decal/remains/human, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "ax" = ( /turf/closed/wall/mineral/cult, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "ay" = ( /obj/structure/destructible/cult/tome, /obj/item/tome, @@ -147,39 +147,39 @@ /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "az" = ( /obj/structure/constructshell, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aA" = ( /obj/structure/girder/cult, /obj/item/stack/sheet/runed_metal, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aB" = ( /obj/structure/spawner/skeleton, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aC" = ( /obj/structure/bed, /obj/item/bedsheet/cult, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aD" = ( /obj/item/stack/sheet/runed_metal, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aE" = ( /obj/structure/destructible/cult/tome, /obj/item/stack/sheet/runed_metal{ @@ -192,7 +192,7 @@ /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aF" = ( /obj/structure/barricade/wooden{ desc = "A forcefield meant to block off areas. Time has aged this forcefield into a weakened state, you could probably smash through it."; @@ -203,30 +203,30 @@ /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aG" = ( /obj/item/ectoplasm, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aH" = ( /turf/closed/wall, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aI" = ( /obj/machinery/door/airlock/external, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aJ" = ( /turf/closed/wall/rust, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aK" = ( /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aL" = ( /obj/machinery/light/small{ dir = 4 @@ -234,7 +234,7 @@ /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aM" = ( /obj/structure/ladder/unbreakable{ height = 1; @@ -243,7 +243,7 @@ /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aN" = ( /obj/effect/mine/explosive{ desc = "Rusted mines planted out by the miners before, probably to keep the cave monsters at bay."; @@ -252,7 +252,7 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aO" = ( /obj/machinery/light/small{ dir = 8 @@ -260,7 +260,7 @@ /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aP" = ( /obj/structure/ladder/unbreakable{ height = 1; @@ -270,31 +270,31 @@ /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aQ" = ( /obj/item/stack/rods, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aR" = ( /obj/effect/forcefield/cult, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aS" = ( /obj/structure/girder/cult, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aT" = ( /obj/structure/ore_box, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aU" = ( /obj/machinery/light/small/built{ dir = 4 @@ -307,7 +307,7 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aV" = ( /obj/effect/forcefield/cult, /turf/open/lava/smooth{ @@ -315,13 +315,13 @@ initial_gas_mix = "n2=23;o2=14"; luminosity = 5 }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aW" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aX" = ( /obj/effect/bump_teleporter{ id = "minedeepdown"; @@ -330,7 +330,7 @@ /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "aY" = ( /obj/structure/trap/fire{ desc = "An old rune inscribed on the floor, giving off an intense amount of heat."; @@ -339,7 +339,7 @@ /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "aZ" = ( /obj/structure/trap/fire{ desc = "An old rune inscribed on the floor, giving off an intense amount of heat."; @@ -348,50 +348,50 @@ /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "ba" = ( /obj/structure/destructible/cult/talisman, /obj/item/book/granter/martial/plasma_fist/nobomb, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "bb" = ( /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bc" = ( /obj/structure/spider/stickyweb, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "be" = ( /obj/structure/spawner/mining/goliath, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bf" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "bg" = ( /mob/living/simple_animal/hostile/poison/giant_spider/nurse, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bh" = ( /mob/living/simple_animal/hostile/skeleton, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bm" = ( /obj/machinery/gateway/away{ calibrated = 0 @@ -399,14 +399,14 @@ /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "bo" = ( /obj/structure/flora/rock, /obj/item/soulstone/anybody, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bs" = ( /obj/structure/trap/stun{ desc = "A rune inscribed in the floor, the air feeling electrified around it."; @@ -415,53 +415,53 @@ /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "bt" = ( /obj/structure/spider/stickyweb, /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bu" = ( /obj/structure/spider/cocoon, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bv" = ( /obj/structure/destructible/cult/pylon, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bw" = ( /obj/effect/decal/cleanable/blood, /obj/structure/spawner/skeleton, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "bx" = ( /obj/item/organ/brain/alien, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "by" = ( /obj/item/mjollnir, /mob/living/simple_animal/hostile/poison/giant_spider/nurse, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bz" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "bA" = ( /obj/structure/destructible/cult/tome, /obj/item/necromantic_stone, @@ -469,31 +469,31 @@ /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "bB" = ( /obj/item/clothing/head/collectable/wizard, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bC" = ( /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bD" = ( /mob/living/simple_animal/hostile/skeleton, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bE" = ( /obj/structure/destructible/cult/pylon, /obj/effect/decal/cleanable/blood, /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "bF" = ( /obj/structure/ladder/unbreakable{ height = 2; @@ -503,54 +503,54 @@ /turf/open/floor/engine/cult{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "bG" = ( /obj/item/gun/ballistic/automatic/pistol/deagle/gold, /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "bH" = ( /obj/effect/decal/remains/human, /obj/item/clothing/under/misc/patriotsuit, /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "bI" = ( /obj/item/bedsheet/patriot, /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "bJ" = ( /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bK" = ( /turf/closed/mineral/volcanic, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bL" = ( /turf/closed/mineral/volcanic, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "bM" = ( /turf/open/lava/smooth{ desc = "Looks hot."; initial_gas_mix = "n2=23;o2=14"; luminosity = 5 }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "bN" = ( /turf/closed/mineral/random/high_chance, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bO" = ( /turf/open/lava/smooth{ desc = "Looks hot."; initial_gas_mix = "n2=23;o2=14"; luminosity = 5 }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bP" = ( /obj/structure/sign/warning/pods{ desc = "A warning sign which warns of potential mech traffic to and from different levels of the mine."; @@ -563,24 +563,24 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bQ" = ( /turf/closed/wall/rust, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bR" = ( /turf/closed/wall, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bS" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bT" = ( /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bU" = ( /obj/effect/bump_teleporter{ id = "minedeepdown"; @@ -589,12 +589,12 @@ /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bV" = ( /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "bW" = ( /obj/machinery/light/small{ dir = 8 @@ -602,20 +602,20 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bX" = ( /obj/structure/table, /obj/item/paper/crumpled/awaymissions/caves/unsafe_area, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bY" = ( /mob/living/simple_animal/hostile/skeleton, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "bZ" = ( /mob/living/simple_animal/hostile/retaliate/bat{ desc = "A rare breed of bat which roosts deep in caves."; @@ -624,13 +624,13 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "ca" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "cb" = ( /obj/structure/closet/crate/miningcar{ name = "Mining cart" @@ -641,13 +641,13 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cc" = ( /obj/structure/ore_box, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cd" = ( /obj/effect/mine/explosive{ desc = "Rusted mines planted out by the miners before, probably to keep the cave monsters at bay."; @@ -656,7 +656,7 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "ce" = ( /obj/structure/ladder/unbreakable{ height = 1; @@ -665,12 +665,12 @@ /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cf" = ( /turf/open/floor/plasteel/dark{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cg" = ( /turf/closed/wall, /area/awaymission/caves/research) @@ -682,13 +682,13 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "cj" = ( /obj/structure/flora/rock, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "ck" = ( /obj/structure/sign/warning/xeno_mining{ pixel_y = -32 @@ -696,16 +696,16 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cl" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cm" = ( /turf/closed/mineral/random/low_chance, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cn" = ( /turf/open/floor/plasteel{ initial_gas_mix = "n2=23;o2=14" @@ -732,7 +732,7 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cr" = ( /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" @@ -774,19 +774,19 @@ /turf/open/floor/plasteel/dark{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "cy" = ( /obj/effect/decal/remains/human, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "cz" = ( /obj/effect/landmark/awaystart, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "cA" = ( /obj/effect/decal/remains/xeno, /turf/open/floor/plating{ @@ -839,26 +839,26 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "cH" = ( /obj/machinery/door/airlock/external, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cK" = ( /obj/structure/sign/warning/securearea{ desc = "A warning sign which reads 'HOLY SHIT SWAGMAN WHAT ARE YOU DOING'."; name = "\improper HOLY SHIT SWAGMAN WHAT ARE YOU DOING" }, /turf/closed/wall, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cL" = ( /obj/structure/spawner/mining/basilisk, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cM" = ( /obj/machinery/light{ dir = 8 @@ -896,7 +896,7 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cR" = ( /obj/effect/landmark/awaystart, /turf/open/floor/plating{ @@ -932,7 +932,7 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "cV" = ( /obj/effect/decal/cleanable/xenoblood/xgibs, /turf/open/floor/plating{ @@ -974,7 +974,7 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "db" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -995,7 +995,7 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dd" = ( /obj/structure/closet/emcloset, /turf/open/floor/plasteel{ @@ -1027,71 +1027,71 @@ /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dh" = ( /obj/machinery/door/airlock/external, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "di" = ( /obj/structure/table, /obj/item/paper/fluff/awaymissions/caves/magma, /obj/item/pen, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dj" = ( /obj/structure/ladder/unbreakable{ height = 2; id = "minedeep" }, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dk" = ( /obj/structure/table, /obj/machinery/microwave, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dl" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dm" = ( /obj/structure/spider/stickyweb, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dn" = ( /obj/structure/chair{ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "do" = ( /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dp" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, /obj/item/clothing/glasses/meson, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dq" = ( /obj/machinery/light/small/built{ dir = 4 }, /obj/structure/spider/stickyweb, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dr" = ( /obj/structure/spider/stickyweb, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "ds" = ( /obj/structure/closet/secure_closet/personal, /obj/item/pickaxe/rusted{ pixel_x = 5 }, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dt" = ( /turf/closed/wall, /area/awaymission/caves/northblock) @@ -1104,13 +1104,13 @@ name = "rusted suit storage unit" }, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dw" = ( /obj/structure/bed, /obj/item/bedsheet, /obj/effect/landmark/awaystart, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "dx" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/decal/cleanable/cobweb, @@ -1229,13 +1229,13 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "dW" = ( /turf/closed/wall, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "dX" = ( /turf/closed/wall/rust, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "dY" = ( /obj/structure/bed, /obj/item/bedsheet, @@ -1285,33 +1285,33 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eg" = ( /obj/effect/decal/cleanable/robot_debris/old, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eh" = ( /obj/structure/table, /obj/item/radio, /obj/item/radio, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "ei" = ( /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "ej" = ( /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "ek" = ( /obj/structure/window{ dir = 8 }, /mob/living/simple_animal/hostile/mining_drone, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "el" = ( /obj/structure/closet/secure_closet/personal, /obj/item/gun/energy/laser/captain/scattershot, @@ -1345,11 +1345,11 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "er" = ( /obj/structure/chair/stool, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "es" = ( /obj/structure/window{ dir = 8 @@ -1357,7 +1357,7 @@ /obj/structure/window, /mob/living/simple_animal/hostile/mining_drone, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "et" = ( /obj/effect/decal/cleanable/shreds, /turf/open/floor/plating{ @@ -1369,27 +1369,27 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "ev" = ( /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "ew" = ( /obj/structure/table, /obj/item/mining_scanner, /obj/item/mining_scanner, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "ex" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/decal/cleanable/cobweb, /obj/item/survivalcapsule, /obj/item/extinguisher/mini, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "ey" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "ez" = ( /obj/machinery/light/small/built{ dir = 1 @@ -1399,16 +1399,16 @@ name = "rusted suit storage unit" }, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eA" = ( /obj/structure/table, /obj/item/paper/fluff/awaymissions/caves/work_notice, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eB" = ( /obj/structure/barricade/wooden, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eC" = ( /obj/structure/table, /obj/item/gps/mining, @@ -1417,17 +1417,17 @@ /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eD" = ( /obj/structure/closet/secure_closet/miner, /obj/item/survivalcapsule, /obj/item/extinguisher/mini, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eE" = ( /obj/effect/landmark/awaystart, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eF" = ( /turf/closed/wall, /area/awaymission/caves/listeningpost) @@ -1437,7 +1437,7 @@ "eH" = ( /obj/machinery/vending/sustenance, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eI" = ( /obj/structure/closet/crate/trashcart, /obj/item/switchblade, @@ -1457,7 +1457,7 @@ "eL" = ( /obj/machinery/vending/sovietsoda, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eM" = ( /obj/machinery/light/small{ dir = 8 @@ -1490,11 +1490,11 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eR" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eS" = ( /obj/machinery/light/small/built, /obj/machinery/suit_storage_unit/mining{ @@ -1502,11 +1502,11 @@ name = "rusted suit storage unit" }, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eT" = ( /obj/structure/closet/emcloset, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "eU" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -1549,7 +1549,7 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fc" = ( /obj/structure/closet/crate, /obj/item/paper/fluff/awaymissions/caves/shipment_receipt, @@ -1565,19 +1565,19 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fd" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fe" = ( /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "ff" = ( /obj/machinery/light/small{ dir = 4 @@ -1585,13 +1585,13 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fg" = ( /obj/structure/ore_box, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fh" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -1607,19 +1607,19 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fk" = ( /obj/item/grenade/syndieminibomb/concussion, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fl" = ( /obj/effect/decal/remains/human, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fm" = ( /turf/open/floor/plating, /area/awaymission/caves/listeningpost) @@ -1634,13 +1634,13 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fo" = ( /mob/living/simple_animal/hostile/asteroid/fugu, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fp" = ( /obj/structure/sign/warning/pods{ desc = "A warning sign which warns of potential mech traffic to and from different levels of the mine."; @@ -1653,12 +1653,12 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fq" = ( /obj/structure/bed, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fr" = ( /obj/machinery/light/small/built{ dir = 1 @@ -1666,37 +1666,37 @@ /obj/structure/spider/stickyweb, /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fs" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "ft" = ( /obj/structure/table, /obj/item/storage/firstaid/fire, /obj/item/storage/firstaid/fire, /obj/structure/spider/stickyweb, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fu" = ( /obj/structure/table, /obj/item/storage/firstaid/brute, -/obj/item/reagent_containers/blood/OPlus, +/obj/item/reagent_containers/blood/o_plus, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fv" = ( /obj/structure/glowshroom/single, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fw" = ( /obj/item/gun/energy/laser/captain/scattershot, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fx" = ( /obj/effect/bump_teleporter{ id = "mineintroup"; @@ -1705,30 +1705,30 @@ /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fy" = ( /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fz" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fA" = ( /obj/structure/bed, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fB" = ( /obj/structure/spider/stickyweb, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fC" = ( /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fD" = ( /obj/structure/spider/stickyweb, /obj/machinery/sleeper{ @@ -1736,30 +1736,30 @@ }, /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fE" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fF" = ( /obj/item/slimepotion/fireproof, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fG" = ( /obj/machinery/door/airlock/medical{ name = "Medical" }, /obj/structure/barricade/wooden, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fH" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fI" = ( /obj/structure/sign/departments/medbay{ pixel_x = -32 @@ -1767,31 +1767,31 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fJ" = ( /obj/structure/grille, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fK" = ( /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fL" = ( /obj/structure/sign/departments/examroom{ pixel_y = 32 }, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fM" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fN" = ( /obj/machinery/door/airlock/external, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fO" = ( /obj/machinery/light/small{ dir = 4 @@ -1799,50 +1799,50 @@ /turf/open/floor/plasteel/dark{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fP" = ( /obj/structure/grille, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fQ" = ( /turf/open/floor/plasteel/elevatorshaft{ initial_gas_mix = "n2=23;o2=14"; name = "elevator flooring" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fR" = ( /obj/structure/grille, /obj/structure/barricade/wooden, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fS" = ( /obj/structure/table, /obj/item/storage/firstaid/toxin, /obj/item/storage/firstaid/toxin, -/obj/item/reagent_containers/blood/OPlus, +/obj/item/reagent_containers/blood/o_plus, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fT" = ( /obj/machinery/iv_drip, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fU" = ( /obj/effect/landmark/awaystart, /turf/open/floor/plasteel/elevatorshaft{ initial_gas_mix = "n2=23;o2=14"; name = "elevator flooring" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fW" = ( /obj/structure/girder, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "fX" = ( /obj/structure/closet/crate/miningcar{ name = "Mining cart" @@ -1856,12 +1856,12 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "fY" = ( /obj/structure/table, /obj/machinery/microwave, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "ga" = ( /obj/structure/ladder/unbreakable{ height = 2; @@ -1870,17 +1870,17 @@ /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gb" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gc" = ( /obj/item/stack/rods, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gd" = ( /obj/item/toy/beach_ball{ desc = "Its a beachball with a face crudely drawn onto it with some soot."; @@ -1889,7 +1889,7 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "ge" = ( /obj/machinery/light/small{ dir = 1 @@ -1897,118 +1897,118 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gf" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gg" = ( /obj/structure/table/reinforced, /obj/item/storage/box/donkpockets, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gh" = ( /obj/structure/table/reinforced, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gi" = ( /obj/structure/table/reinforced, /obj/item/stack/rods, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gj" = ( /obj/machinery/door/airlock/mining{ name = "Kitchen" }, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gk" = ( /obj/effect/landmark/awaystart, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "gl" = ( /obj/item/trash/plate, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gm" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gn" = ( /obj/item/grown/log, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "go" = ( /obj/structure/chair/stool, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gp" = ( /obj/structure/table_frame, /turf/open/floor/plating{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gq" = ( /obj/structure/chair/stool, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gr" = ( /obj/structure/table, /obj/item/kitchen/fork, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gs" = ( /obj/item/assembly/igniter, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "gt" = ( /obj/structure/table_frame, /obj/item/stack/sheet/metal, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gu" = ( /obj/item/stack/rods, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gv" = ( /obj/structure/table_frame, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gw" = ( /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gx" = ( /obj/structure/table, /obj/item/kitchen/fork, /obj/item/trash/plate, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gy" = ( /obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/plasteel, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gz" = ( /obj/machinery/door/airlock/external{ name = "Mess Hall" }, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gA" = ( /obj/machinery/light/small{ dir = 1 @@ -2016,25 +2016,25 @@ /turf/open/floor/plasteel/dark{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gB" = ( /obj/machinery/mech_bay_recharge_port, /turf/open/floor/plasteel{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gC" = ( /obj/mecha/working/ripley/mining{ ruin_mecha = 1 }, /turf/open/floor/plasteel/recharge_floor, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gD" = ( /obj/structure/spawner/mining/hivelord, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gE" = ( /obj/machinery/light/small{ dir = 4 @@ -2042,7 +2042,7 @@ /turf/open/floor/plasteel{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gF" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -2050,64 +2050,64 @@ /turf/open/floor/plasteel{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gG" = ( /obj/structure/mecha_wreckage/durand, /turf/open/floor/plasteel/recharge_floor, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gH" = ( /obj/structure/table, /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill, /obj/item/paper/fluff/awaymissions/caves/mech_notice, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gI" = ( /obj/structure/chair/stool, /turf/open/floor/plasteel{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gJ" = ( /turf/open/floor/plasteel{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gK" = ( /obj/structure/girder, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gL" = ( /obj/item/stack/rods, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gM" = ( /obj/structure/mecha_wreckage/ripley, /turf/open/floor/plasteel/recharge_floor, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gN" = ( /obj/structure/holohoop, /turf/open/floor/plasteel/dark{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gO" = ( /obj/structure/closet/emcloset, /turf/open/floor/plasteel{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gP" = ( /obj/item/toy/beach_ball/holoball, /turf/open/floor/plasteel/dark{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gQ" = ( /obj/structure/spawner/mining/basilisk, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gR" = ( /obj/structure/closet/crate/miningcar{ name = "Mining cart" @@ -2118,19 +2118,19 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gS" = ( /obj/structure/girder, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gT" = ( /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/plating, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gU" = ( /obj/structure/holohoop{ dir = 1 @@ -2138,7 +2138,7 @@ /turf/open/floor/plasteel/dark{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gV" = ( /obj/effect/mine/explosive{ desc = "Rusted mines planted out by the miners before, probably to keep the cave monsters at bay."; @@ -2147,11 +2147,11 @@ /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "gX" = ( /obj/effect/baseturf_helper/lava, /turf/closed/mineral/volcanic, -/area/awaymission/caves/BMP_asteroid/level_three) +/area/awaymission/caves/bmp_asteroid/level_three) "gY" = ( /obj/effect/baseturf_helper/lava, /turf/open/lava/smooth{ @@ -2159,15 +2159,15 @@ initial_gas_mix = "n2=23;o2=14"; luminosity = 5 }, -/area/awaymission/caves/BMP_asteroid/level_four) +/area/awaymission/caves/bmp_asteroid/level_four) "gZ" = ( /obj/effect/baseturf_helper/lava, /turf/closed/mineral/volcanic, -/area/awaymission/caves/BMP_asteroid/level_two) +/area/awaymission/caves/bmp_asteroid/level_two) "ha" = ( /obj/effect/baseturf_helper/lava, /turf/closed/mineral/volcanic, -/area/awaymission/caves/BMP_asteroid) +/area/awaymission/caves/bmp_asteroid) "hb" = ( /obj/effect/baseturf_helper/asteroid/basalt, /turf/closed/wall, diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 2f160b40710..58ee677789f 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -7377,7 +7377,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 6 }, -/obj/machinery/doorButtons/airlock_controller{ +/obj/machinery/door_buttons/airlock_controller{ idExterior = "snowdin_turbine_exterior"; idInterior = "snowdin_turbine_interior"; idSelf = "snowdin_turbine_access"; @@ -7700,7 +7700,7 @@ brightness = 3; dir = 8 }, -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "snowdin_turbine_interior"; idSelf = "snowdin_turbine_access"; layer = 3.1; @@ -7721,7 +7721,7 @@ /obj/machinery/atmospherics/components/binary/volume_pump{ name = "Mix To Turbine" }, -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "snowdin_turbine_exterior"; idSelf = "snowdin_turbine_access"; name = "Turbine airlock control"; @@ -12786,7 +12786,7 @@ /obj/structure/statue/snow/snowman{ name = "Snow-Luc Price" }, -/obj/item/clothing/head/HoS{ +/obj/item/clothing/head/hos{ pixel_y = 10 }, /turf/open/floor/plating/asteroid/snow, diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 3c73800f206..9fade911978 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -1184,6 +1184,7 @@ "cM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5; + }, /turf/open/floor/plating{ heat_capacity = 1e+006 @@ -3478,7 +3479,7 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "hn" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/reagent_containers/glass/rag, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -3510,7 +3511,7 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "hq" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, @@ -3797,6 +3798,7 @@ "hU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4; + }, /obj/structure/table, /obj/item/book/manual/chef_recipes, @@ -3809,6 +3811,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4; + }, /turf/open/floor/plating{ heat_capacity = 1e+006 @@ -9284,6 +9287,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4; + }, /obj/machinery/door/airlock/maintenance{ name = "Research Maintenance"; diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index d951879d858..96472099dcd 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -722,7 +722,7 @@ /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "acn" = ( -/obj/item/storage/secure/safe/HoS{ +/obj/item/storage/secure/safe/hos{ pixel_x = 35 }, /obj/structure/closet/secure_closet/hos, @@ -1595,7 +1595,7 @@ /area/security/main) "aeB" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/pen, /turf/open/floor/plasteel, /area/security/main) @@ -11462,7 +11462,7 @@ pixel_x = 1; pixel_y = 9 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/open/floor/wood, /area/library) "aHc" = ( @@ -11645,10 +11645,10 @@ /obj/structure/table, /obj/item/weldingtool, /obj/item/crowbar, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /turf/open/floor/plasteel, /area/storage/primary) "aHF" = ( @@ -14846,7 +14846,7 @@ "aRj" = ( /obj/structure/table/reinforced, /obj/item/storage/secure/briefcase, -/obj/item/storage/box/PDAs{ +/obj/item/storage/box/pdas{ pixel_x = 4; pixel_y = 4 }, @@ -16254,7 +16254,7 @@ /obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aVD" = ( @@ -17685,7 +17685,7 @@ /area/ai_monitored/turret_protected/ai_upload) "aZS" = ( /obj/structure/table, -/obj/item/aiModule/supplied/freeform, +/obj/item/ai_module/supplied/freeform, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "aZT" = ( @@ -17703,7 +17703,7 @@ /area/ai_monitored/turret_protected/ai_upload) "aZU" = ( /obj/structure/table, -/obj/item/aiModule/supplied/quarantine, +/obj/item/ai_module/supplied/quarantine, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "aZV" = ( @@ -18498,7 +18498,7 @@ /obj/structure/table, /obj/effect/landmark/event_spawn, /obj/structure/cable, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "bch" = ( @@ -19439,7 +19439,7 @@ pixel_x = 3; pixel_y = 4 }, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = -1; pixel_y = -1 }, @@ -19501,7 +19501,7 @@ /turf/open/floor/plating, /area/quartermaster/office) "bfn" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8 }, /obj/structure/disposalpipe/trunk{ @@ -20326,7 +20326,7 @@ /obj/structure/disposalpipe/trunk{ dir = 2 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /obj/structure/window/reinforced, @@ -22473,7 +22473,7 @@ /area/crew_quarters/heads/hop) "bnQ" = ( /obj/structure/bed/dogbed/ian, -/mob/living/simple_animal/pet/dog/corgi/Ian{ +/mob/living/simple_animal/pet/dog/corgi/ian{ dir = 8 }, /turf/open/floor/plasteel, @@ -22981,7 +22981,7 @@ "bpt" = ( /obj/structure/table, /obj/item/hand_labeler, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/open/floor/plasteel/white, /area/medical/pharmacy) "bpu" = ( @@ -23273,8 +23273,8 @@ layer = 2.9 }, /obj/structure/table/reinforced, -/obj/item/destTagger, -/obj/item/destTagger, +/obj/item/dest_tagger, +/obj/item/dest_tagger, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -24656,7 +24656,7 @@ "buO" = ( /obj/structure/table, /obj/item/folder/blue, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = -1; pixel_y = -1 }, @@ -26107,8 +26107,8 @@ /area/medical/sleeper) "bzd" = ( /obj/structure/table, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/pen, /obj/machinery/requests_console{ department = "Medbay"; @@ -27357,7 +27357,7 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "bCj" = ( -/obj/structure/closet/secure_closet/RD, +/obj/structure/closet/secure_closet/research_director, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "bCk" = ( @@ -28299,7 +28299,7 @@ "bEX" = ( /obj/structure/table, /obj/item/aicard, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /turf/open/floor/plating, /area/storage/tech) "bEZ" = ( @@ -28527,7 +28527,7 @@ dir = 8 }, /obj/structure/bed/dogbed/runtime, -/mob/living/simple_animal/pet/cat/Runtime, +/mob/living/simple_animal/pet/cat/runtime, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "bFF" = ( @@ -28743,7 +28743,7 @@ /area/storage/tech) "bGt" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/AI, +/obj/effect/spawner/lootdrop/techstorage/ai, /turf/open/floor/plasteel, /area/storage/tech) "bGu" = ( @@ -29321,7 +29321,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bIf" = ( -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; @@ -29525,7 +29525,7 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "bIw" = ( -/obj/structure/closet/secure_closet/CMO, +/obj/structure/closet/secure_closet/chief_medical, /obj/machinery/light{ dir = 4 }, @@ -29797,7 +29797,7 @@ /area/storage/tech) "bJh" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/RnD_secure, +/obj/effect/spawner/lootdrop/techstorage/rnd_secure, /turf/open/floor/plasteel, /area/storage/tech) "bJi" = ( @@ -30354,7 +30354,7 @@ pixel_x = -12; pixel_y = 2 }, -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; @@ -33038,7 +33038,7 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bST" = ( -/obj/machinery/doorButtons/airlock_controller{ +/obj/machinery/door_buttons/airlock_controller{ idExterior = "virology_airlock_exterior"; idInterior = "virology_airlock_interior"; idSelf = "virology_airlock_control"; @@ -35679,7 +35679,7 @@ dir = 8 }, /obj/structure/cable, -/mob/living/simple_animal/parrot/Poly, +/mob/living/simple_animal/parrot/poly, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "cbr" = ( @@ -39631,8 +39631,8 @@ /area/bridge/meeting_room) "cvA" = ( /obj/structure/table, -/obj/item/aiModule/core/full/asimov, -/obj/item/aiModule/core/freeformcore, +/obj/item/ai_module/core/full/asimov, +/obj/item/ai_module/core/freeformcore, /obj/machinery/door/window{ base_state = "right"; dir = 4; @@ -39649,7 +39649,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/aiModule/core/full/custom, +/obj/item/ai_module/core/full/custom, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "cvO" = ( @@ -40658,23 +40658,23 @@ /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/blood, -/obj/item/reagent_containers/blood/AMinus, -/obj/item/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/a_minus, +/obj/item/reagent_containers/blood/b_minus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/b_plus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_plus{ pixel_x = -2; pixel_y = -1 }, /obj/item/reagent_containers/blood/random, /obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/a_plus, /obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel, /area/medical/sleeper) @@ -42540,14 +42540,14 @@ /area/maintenance/disposal/incinerator) "ddp" = ( /obj/structure/table, -/obj/item/aiModule/supplied/oxygen, -/obj/item/aiModule/zeroth/oneHuman, +/obj/item/ai_module/supplied/oxygen, +/obj/item/ai_module/zeroth/onehuman, /obj/machinery/door/window{ dir = 8; name = "High-Risk Modules"; req_access_txt = "20" }, -/obj/item/aiModule/reset/purge, +/obj/item/ai_module/reset/purge, /obj/structure/window/reinforced, /obj/effect/spawner/lootdrop/aimodule_harmful, /obj/structure/window/reinforced{ @@ -42556,7 +42556,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/aiModule/supplied/protectStation, +/obj/item/ai_module/supplied/protect_station, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "ddy" = ( @@ -43436,7 +43436,7 @@ /area/ai_monitored/turret_protected/ai) "eAi" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -43949,9 +43949,9 @@ /obj/item/storage/box, /obj/item/storage/box, /obj/item/storage/box, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/open/floor/plasteel, /area/quartermaster/office) @@ -44900,7 +44900,7 @@ /area/hydroponics/garden) "hec" = ( /obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/Renault, +/mob/living/simple_animal/pet/fox/renault, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "hfA" = ( @@ -45045,7 +45045,7 @@ brightness = 3; dir = 8 }, -/mob/living/simple_animal/mouse/brown/Tom, +/mob/living/simple_animal/mouse/brown/tom, /turf/open/floor/plating, /area/security/prison/safe) "hzx" = ( @@ -47140,7 +47140,7 @@ /obj/item/stack/sheet/cardboard{ amount = 14 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/effect/turf_decal/stripes/line{ dir = 1 }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 4b3f36d36d5..a0fcdd9aafc 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -295,7 +295,7 @@ "aaG" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/light{ dir = 8 @@ -1638,7 +1638,7 @@ /area/construction/mining/aux_base) "aeE" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/stack/cable_coil{ pixel_x = 3; pixel_y = 3 @@ -3929,7 +3929,7 @@ /area/vacant_room/office) "alm" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/newscaster{ pixel_y = 32 @@ -4150,7 +4150,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/storage/box/donkpockets, /obj/item/kitchen/knife/butcher, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) @@ -4839,7 +4839,7 @@ /area/security/checkpoint/customs) "ank" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -6014,7 +6014,7 @@ "apA" = ( /obj/structure/table/wood, /obj/item/folder/blue, -/obj/item/clothing/head/collectable/HoP, +/obj/item/clothing/head/collectable/hop, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -6812,7 +6812,7 @@ /area/maintenance/starboard/fore) "ard" = ( /obj/structure/table/wood, -/obj/item/toy/talking/AI, +/obj/item/toy/talking/ai, /turf/open/floor/plating, /area/maintenance/starboard/fore) "are" = ( @@ -6827,7 +6827,7 @@ /turf/open/floor/plasteel, /area/maintenance/disposal) "arf" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /obj/structure/window/reinforced, @@ -9075,15 +9075,15 @@ /area/maintenance/port/fore) "avu" = ( /obj/structure/easel, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/fore) "avv" = ( /obj/structure/easel, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, /turf/open/floor/wood{ icon_state = "wood-broken7" }, @@ -9234,7 +9234,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/crowbar, /obj/item/hand_labeler, /obj/machinery/newscaster{ @@ -9938,7 +9938,7 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "axa" = ( -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/structure/table, /obj/effect/turf_decal/bot, @@ -10986,8 +10986,8 @@ /area/maintenance/port/fore) "ayZ" = ( /obj/structure/table/wood, -/obj/item/canvas/twentythreeXnineteen, -/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/twentythree_nineteen, +/obj/item/canvas/nineteen_nineteen, /obj/item/storage/crayons, /obj/item/storage/crayons, /obj/effect/decal/cleanable/dirt, @@ -12090,7 +12090,7 @@ /area/hydroponics/garden/abandoned) "aBn" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/effect/decal/cleanable/dirt, /obj/item/hand_labeler, /obj/item/reagent_containers/food/snacks/grown/tea, @@ -16829,7 +16829,7 @@ /area/crew_quarters/bar) "aKu" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) @@ -18215,8 +18215,8 @@ pixel_y = 32 }, /obj/structure/easel, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar/atrium) "aNf" = ( @@ -19224,7 +19224,7 @@ /obj/item/stack/wrapping_paper{ pixel_y = 5 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/power/apc{ areastring = "/area/quartermaster/sorting"; @@ -20362,7 +20362,7 @@ "aQF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1 }, /turf/open/floor/plating, @@ -21162,7 +21162,7 @@ /area/quartermaster/storage) "aSn" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -21308,7 +21308,7 @@ "aSy" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/light{ dir = 4 @@ -21607,7 +21607,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -28114,7 +28114,7 @@ "bdH" = ( /obj/structure/rack, /obj/item/book/manual/chef_recipes, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/airalarm{ dir = 4; @@ -28583,7 +28583,7 @@ /area/engine/atmos) "beF" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -32603,7 +32603,7 @@ dir = 8 }, /obj/item/clipboard, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -33087,7 +33087,7 @@ /area/crew_quarters/heads/hos) "bmC" = ( /obj/structure/table/wood, -/obj/item/storage/secure/safe/HoS{ +/obj/item/storage/secure/safe/hos{ pixel_x = 32 }, /obj/item/flashlight/lamp, @@ -37096,7 +37096,7 @@ /area/crew_quarters/heads/hos) "btC" = ( /obj/structure/closet/secure_closet/hos, -/obj/item/clothing/head/HoS/beret, +/obj/item/clothing/head/hos/beret, /obj/item/clothing/suit/armor/hos/trenchcoat, /obj/item/clothing/under/rank/security/head_of_security/grey, /obj/effect/turf_decal/stripes/line{ @@ -37464,7 +37464,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/book/manual/hydroponics_pod_people, /obj/item/hand_labeler, /obj/effect/turf_decal/bot, @@ -38743,7 +38743,7 @@ "bwK" = ( /obj/structure/rack, /obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/lootdrop/techstorage/AI, +/obj/effect/spawner/lootdrop/techstorage/ai, /turf/open/floor/plasteel, /area/storage/tech) "bwL" = ( @@ -38751,7 +38751,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/effect/spawner/lootdrop/techstorage/RnD_secure, +/obj/effect/spawner/lootdrop/techstorage/rnd_secure, /obj/structure/cable, /turf/open/floor/plasteel, /area/storage/tech) @@ -41343,7 +41343,7 @@ /area/storage/tech) "bBn" = ( /obj/structure/table/reinforced, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /obj/item/assembly/flash/handheld, /obj/item/assembly/flash/handheld, /obj/effect/turf_decal/bot, @@ -45940,7 +45940,7 @@ /area/storage/primary) "bIz" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -46504,7 +46504,7 @@ /area/security/brig) "bJz" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -50763,7 +50763,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/mob/living/simple_animal/pet/fox/Renault, +/mob/living/simple_animal/pet/fox/renault, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "bQQ" = ( @@ -50880,7 +50880,7 @@ /area/storage/tools) "bRc" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow, @@ -54089,7 +54089,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/mob/living/simple_animal/parrot/Poly, +/mob/living/simple_animal/parrot/poly, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "bWg" = ( @@ -55530,7 +55530,7 @@ /area/engine/transit_tube) "bYr" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -57730,7 +57730,7 @@ "ccC" = ( /obj/structure/table/wood, /obj/machinery/light, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/computer/security/telescreen/vault{ @@ -59424,7 +59424,7 @@ lootcount = 2; lootdoubles = 0 }, -/obj/item/aiModule/supplied/oxygen{ +/obj/item/ai_module/supplied/oxygen{ pixel_x = -3; pixel_y = -3 }, @@ -60264,12 +60264,12 @@ req_access_txt = "20" }, /obj/structure/window/reinforced, -/obj/item/aiModule/core/freeformcore{ +/obj/item/ai_module/core/freeformcore{ pixel_x = 3; pixel_y = 3 }, -/obj/item/aiModule/core/full/custom, -/obj/item/aiModule/core/full/asimov{ +/obj/item/ai_module/core/full/custom, +/obj/item/ai_module/core/full/asimov{ pixel_x = -3; pixel_y = -3 }, @@ -60358,12 +60358,12 @@ req_access_txt = "20" }, /obj/structure/window/reinforced, -/obj/item/aiModule/supplied/protectStation{ +/obj/item/ai_module/supplied/protect_station{ pixel_x = 3; pixel_y = 3 }, -/obj/item/aiModule/zeroth/oneHuman, -/obj/item/aiModule/reset/purge{ +/obj/item/ai_module/zeroth/onehuman, +/obj/item/ai_module/reset/purge{ pixel_x = -3; pixel_y = -3 }, @@ -61824,7 +61824,7 @@ /area/aisat) "ckn" = ( /obj/structure/table/reinforced, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /obj/item/radio/intercom{ pixel_x = -26 }, @@ -61892,7 +61892,7 @@ /area/ai_monitored/turret_protected/ai_upload) "ckt" = ( /obj/structure/table/reinforced, -/obj/item/aiModule/supplied/quarantine, +/obj/item/ai_module/supplied/quarantine, /obj/item/radio/intercom{ broadcasting = 1; frequency = 1447; @@ -62148,7 +62148,7 @@ pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/mob/living/simple_animal/pet/dog/corgi/Ian, +/mob/living/simple_animal/pet/dog/corgi/ian, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "cla" = ( @@ -62572,7 +62572,7 @@ /area/security/range) "clM" = ( /obj/structure/table/reinforced, -/obj/item/aiModule/supplied/freeform, +/obj/item/ai_module/supplied/freeform, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -62960,7 +62960,7 @@ /area/teleporter) "cmI" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/structure/extinguisher_cabinet{ pixel_y = 32 @@ -67947,9 +67947,9 @@ /area/library) "cwr" = ( /obj/structure/easel, -/obj/item/canvas/twentythreeXnineteen, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythree_nineteen, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -67964,9 +67964,9 @@ /area/library) "cws" = ( /obj/structure/easel, -/obj/item/canvas/nineteenXnineteen, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/nineteen_nineteen, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, /obj/machinery/light_switch{ pixel_y = 26 }, @@ -68098,7 +68098,7 @@ /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "cwI" = ( -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/newscaster{ pixel_x = 32 @@ -73859,7 +73859,7 @@ /area/engine/engineering) "cHj" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -73975,7 +73975,7 @@ /area/engine/storage) "cHv" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/open/floor/plating, /area/maintenance/port) @@ -82706,7 +82706,7 @@ /obj/structure/table, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/machinery/light, /obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, @@ -84989,9 +84989,9 @@ /area/crew_quarters/fitness/recreation) "dbL" = ( /obj/structure/easel, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, /obj/machinery/light/small{ dir = 4 }, @@ -85899,7 +85899,7 @@ /area/crew_quarters/fitness/recreation) "ddz" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = -3; pixel_y = 3 }, @@ -89232,7 +89232,7 @@ /area/science/lab) "djZ" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -89377,7 +89377,7 @@ /area/medical/pharmacy) "dkj" = ( /obj/structure/table/glass, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/airalarm{ dir = 1; @@ -92507,7 +92507,7 @@ /obj/item/stack/sheet/metal{ amount = 30 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/stack/sheet/glass{ amount = 30 }, @@ -93769,7 +93769,7 @@ /area/crew_quarters/abandoned_gambling_den) "dul" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -95838,7 +95838,7 @@ /turf/open/floor/plasteel, /area/science/mixing) "dzA" = ( -/obj/structure/closet/secure_closet/RD, +/obj/structure/closet/secure_closet/research_director, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, @@ -96010,7 +96010,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/mob/living/simple_animal/pet/cat/Runtime, +/mob/living/simple_animal/pet/cat/runtime, /turf/open/floor/plasteel, /area/crew_quarters/heads/cmo) "dAc" = ( @@ -99117,7 +99117,7 @@ /turf/open/floor/plasteel, /area/medical/morgue) "dGw" = ( -/obj/structure/closet/secure_closet/CMO, +/obj/structure/closet/secure_closet/chief_medical, /obj/item/clothing/under/rank/medical/doctor, /obj/item/clothing/head/nursehat, /obj/effect/turf_decal/stripes/line{ @@ -100406,7 +100406,7 @@ /area/medical/morgue) "dJg" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/open/floor/plating, /area/medical/morgue) @@ -103609,7 +103609,7 @@ /area/security/checkpoint/customs/auxiliary) "dPf" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -103690,7 +103690,7 @@ name = "Virology Exterior Airlock"; req_access_txt = "39" }, -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ dir = 1; idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; @@ -104517,7 +104517,7 @@ name = "Virology Interior Airlock"; req_access_txt = "39" }, -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; @@ -104537,7 +104537,7 @@ /turf/open/floor/plasteel, /area/medical/virology) "dQY" = ( -/obj/machinery/doorButtons/airlock_controller{ +/obj/machinery/door_buttons/airlock_controller{ idExterior = "virology_airlock_exterior"; idInterior = "virology_airlock_interior"; idSelf = "virology_airlock_control"; @@ -107502,7 +107502,7 @@ /area/maintenance/port/aft) "dXB" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/structure/sign/warning/nosmoking{ pixel_x = -32 @@ -107788,7 +107788,7 @@ /obj/machinery/airalarm{ pixel_y = 22 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/item/radio/intercom{ pixel_x = 26 @@ -107844,8 +107844,8 @@ "dYp" = ( /obj/structure/easel, /obj/effect/decal/cleanable/dirt, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, /obj/machinery/light/small, /turf/open/floor/plating, /area/library/abandoned) @@ -109309,7 +109309,7 @@ /area/maintenance/port/aft) "ebL" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, @@ -111704,7 +111704,7 @@ }, /obj/structure/table, /obj/item/clipboard, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -115880,7 +115880,7 @@ /area/medical/chemistry) "uMN" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/firealarm{ dir = 4; diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index b86d4c7c92c..45a21db5862 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -349,7 +349,7 @@ /obj/item/stack/sheet/cardboard{ amount = 14 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -932,7 +932,7 @@ /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "acn" = ( -/obj/item/storage/secure/safe/HoS{ +/obj/item/storage/secure/safe/hos{ pixel_x = 35 }, /obj/structure/closet/secure_closet/hos, @@ -1863,7 +1863,7 @@ brightness = 3; dir = 8 }, -/mob/living/simple_animal/mouse/brown/Tom, +/mob/living/simple_animal/mouse/brown/tom, /turf/open/floor/plating, /area/security/prison/safe) "aeq" = ( @@ -1950,7 +1950,7 @@ /area/security/main) "aeB" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/pen, /turf/open/floor/plasteel, /area/security/main) @@ -14250,7 +14250,7 @@ pixel_x = 1; pixel_y = 9 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/open/floor/wood, /area/library) "aHc" = ( @@ -14468,10 +14468,10 @@ /obj/structure/table, /obj/item/weldingtool, /obj/item/crowbar, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /turf/open/floor/plasteel, /area/storage/primary) "aHF" = ( @@ -18261,7 +18261,7 @@ "aRj" = ( /obj/structure/table/reinforced, /obj/item/storage/secure/briefcase, -/obj/item/storage/box/PDAs{ +/obj/item/storage/box/pdas{ pixel_x = 4; pixel_y = 4 }, @@ -20029,7 +20029,7 @@ /obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aVC" = ( @@ -22510,7 +22510,7 @@ /area/bridge/meeting_room) "bbj" = ( /obj/structure/table, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /obj/machinery/light{ dir = 8 }, @@ -23558,8 +23558,8 @@ /area/maintenance/port) "beb" = ( /obj/structure/table, -/obj/item/aiModule/core/full/asimov, -/obj/item/aiModule/core/freeformcore, +/obj/item/ai_module/core/full/asimov, +/obj/item/ai_module/core/freeformcore, /obj/machinery/door/window{ base_state = "right"; dir = 4; @@ -23576,7 +23576,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/aiModule/core/full/custom, +/obj/item/ai_module/core/full/custom, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "bec" = ( @@ -23618,14 +23618,14 @@ /area/ai_monitored/turret_protected/ai_upload) "beg" = ( /obj/structure/table, -/obj/item/aiModule/supplied/oxygen, -/obj/item/aiModule/zeroth/oneHuman, +/obj/item/ai_module/supplied/oxygen, +/obj/item/ai_module/zeroth/onehuman, /obj/machinery/door/window{ dir = 8; name = "High-Risk Modules"; req_access_txt = "20" }, -/obj/item/aiModule/reset/purge, +/obj/item/ai_module/reset/purge, /obj/structure/window/reinforced, /obj/effect/spawner/lootdrop/aimodule_harmful, /obj/structure/window/reinforced{ @@ -23634,7 +23634,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/aiModule/supplied/protectStation, +/obj/item/ai_module/supplied/protect_station, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "beh" = ( @@ -23971,7 +23971,7 @@ pixel_x = 3; pixel_y = 4 }, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = -1; pixel_y = -1 }, @@ -24098,7 +24098,7 @@ /turf/open/floor/plating, /area/quartermaster/office) "bfn" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8 }, /obj/structure/disposalpipe/trunk{ @@ -25068,7 +25068,7 @@ /obj/structure/disposalpipe/trunk{ dir = 2 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /obj/structure/window/reinforced, @@ -27454,7 +27454,7 @@ /area/science/research) "bnn" = ( /obj/structure/table, -/obj/item/aiModule/supplied/quarantine, +/obj/item/ai_module/supplied/quarantine, /obj/machinery/camera/motion{ c_tag = "AI Upload West"; dir = 4; @@ -27497,7 +27497,7 @@ /area/maintenance/starboard) "bnt" = ( /obj/structure/table, -/obj/item/aiModule/supplied/freeform, +/obj/item/ai_module/supplied/freeform, /obj/structure/sign/plaques/kiddie{ pixel_x = 32 }, @@ -27733,7 +27733,7 @@ "bnQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/bed/dogbed/ian, -/mob/living/simple_animal/pet/dog/corgi/Ian{ +/mob/living/simple_animal/pet/dog/corgi/ian{ dir = 8 }, /turf/open/floor/plasteel, @@ -28415,7 +28415,7 @@ "bpt" = ( /obj/structure/table, /obj/item/hand_labeler, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/open/floor/plasteel/white, /area/medical/pharmacy) "bpu" = ( @@ -28767,8 +28767,8 @@ layer = 2.9 }, /obj/structure/table/reinforced, -/obj/item/destTagger, -/obj/item/destTagger, +/obj/item/dest_tagger, +/obj/item/dest_tagger, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -30740,7 +30740,7 @@ "buO" = ( /obj/structure/table, /obj/item/folder/blue, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = -1; pixel_y = -1 }, @@ -32536,8 +32536,8 @@ /area/medical/sleeper) "bzd" = ( /obj/structure/table, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/pen, /obj/machinery/requests_console{ department = "Medbay"; @@ -33924,7 +33924,7 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "bCj" = ( -/obj/structure/closet/secure_closet/RD, +/obj/structure/closet/secure_closet/research_director, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "bCk" = ( @@ -35075,7 +35075,7 @@ "bEX" = ( /obj/structure/table, /obj/item/aicard, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /turf/open/floor/plating, /area/storage/tech) "bEY" = ( @@ -35339,7 +35339,7 @@ dir = 8 }, /obj/structure/bed/dogbed/runtime, -/mob/living/simple_animal/pet/cat/Runtime, +/mob/living/simple_animal/pet/cat/runtime, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "bFF" = ( @@ -35655,7 +35655,7 @@ /area/storage/tech) "bGt" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/AI, +/obj/effect/spawner/lootdrop/techstorage/ai, /turf/open/floor/plasteel, /area/storage/tech) "bGu" = ( @@ -36367,7 +36367,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bIf" = ( -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; @@ -36578,7 +36578,7 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "bIw" = ( -/obj/structure/closet/secure_closet/CMO, +/obj/structure/closet/secure_closet/chief_medical, /obj/machinery/light{ dir = 4 }, @@ -36850,7 +36850,7 @@ /area/storage/tech) "bJh" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/RnD_secure, +/obj/effect/spawner/lootdrop/techstorage/rnd_secure, /turf/open/floor/plasteel, /area/storage/tech) "bJi" = ( @@ -37564,7 +37564,7 @@ pixel_x = -12; pixel_y = 2 }, -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; @@ -40314,7 +40314,7 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bST" = ( -/obj/machinery/doorButtons/airlock_controller{ +/obj/machinery/door_buttons/airlock_controller{ idExterior = "virology_airlock_exterior"; idInterior = "virology_airlock_interior"; idSelf = "virology_airlock_control"; @@ -43093,7 +43093,7 @@ dir = 8 }, /obj/structure/cable, -/mob/living/simple_animal/parrot/Poly, +/mob/living/simple_animal/parrot/poly, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "cbr" = ( @@ -49466,23 +49466,23 @@ /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/blood, -/obj/item/reagent_containers/blood/AMinus, -/obj/item/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/a_minus, +/obj/item/reagent_containers/blood/b_minus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/b_plus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_plus{ pixel_x = -2; pixel_y = -1 }, /obj/item/reagent_containers/blood/random, /obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/a_plus, /obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel, /area/medical/sleeper) @@ -51462,7 +51462,7 @@ /area/science/misc_lab) "eAi" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -51630,9 +51630,9 @@ /obj/item/storage/box, /obj/item/storage/box, /obj/item/storage/box, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/open/floor/plasteel, /area/quartermaster/office) @@ -51948,7 +51948,7 @@ /area/maintenance/port) "hec" = ( /obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/Renault, +/mob/living/simple_animal/pet/fox/renault, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "hhs" = ( diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm index da8e926b969..dfe9ef4b0f6 100644 --- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm +++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm @@ -445,9 +445,9 @@ /area/mine/eva) "bG" = ( /obj/structure/table, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -1008,17 +1008,17 @@ pixel_x = -3; pixel_y = -3 }, -/obj/item/reagent_containers/blood/AMinus, -/obj/item/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/a_minus, +/obj/item/reagent_containers/blood/b_minus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/b_plus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_plus{ pixel_x = -2; pixel_y = -1 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 4cfef4e7cfe..c1e11d21450 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1277,7 +1277,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 }, -/mob/living/simple_animal/pet/cat/Runtime, +/mob/living/simple_animal/pet/cat/runtime, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/cmo) "acU" = ( @@ -1479,7 +1479,7 @@ /area/security/prison) "adx" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4; name = "Prisoner Transfer" }, @@ -2181,7 +2181,7 @@ pixel_y = 30 }, /obj/machinery/computer/med_data/laptop, -/obj/item/storage/secure/safe/HoS{ +/obj/item/storage/secure/safe/hos{ pixel_x = 36; pixel_y = 28 }, @@ -5511,7 +5511,7 @@ /turf/open/floor/plating, /area/maintenance/disposal) "aly" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /obj/structure/window/reinforced, @@ -16630,9 +16630,9 @@ /area/quartermaster/storage) "aMG" = ( /obj/structure/table, -/obj/item/aiModule/core/full/asimov, +/obj/item/ai_module/core/full/asimov, /obj/effect/spawner/lootdrop/aimodule_harmless, -/obj/item/aiModule/core/freeformcore, +/obj/item/ai_module/core/freeformcore, /obj/machinery/door/window{ base_state = "right"; dir = 4; @@ -16642,7 +16642,7 @@ }, /obj/structure/window/reinforced, /obj/effect/spawner/lootdrop/aimodule_neutral, -/obj/item/aiModule/core/full/custom, +/obj/item/ai_module/core/full/custom, /obj/machinery/flasher{ id = "AI"; pixel_y = 24 @@ -16665,10 +16665,10 @@ pixel_y = 24 }, /obj/effect/spawner/lootdrop/aimodule_harmful, -/obj/item/aiModule/supplied/oxygen, -/obj/item/aiModule/supplied/protectStation, -/obj/item/aiModule/zeroth/oneHuman, -/obj/item/aiModule/reset/purge, +/obj/item/ai_module/supplied/oxygen, +/obj/item/ai_module/supplied/protect_station, +/obj/item/ai_module/zeroth/onehuman, +/obj/item/ai_module/reset/purge, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "aMJ" = ( @@ -17789,7 +17789,7 @@ /area/quartermaster/warehouse) "aPt" = ( /obj/structure/table, -/obj/item/aiModule/supplied/quarantine, +/obj/item/ai_module/supplied/quarantine, /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) @@ -17810,7 +17810,7 @@ /area/ai_monitored/turret_protected/ai_upload) "aPx" = ( /obj/structure/table, -/obj/item/aiModule/supplied/freeform, +/obj/item/ai_module/supplied/freeform, /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) @@ -18216,7 +18216,7 @@ /area/quartermaster/warehouse) "aQz" = ( /obj/structure/table, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /obj/machinery/light{ dir = 8 }, @@ -19718,11 +19718,11 @@ /obj/structure/closet/crate{ icon_state = "crateopen" }, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap{ pixel_y = 2 }, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_y = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -21598,7 +21598,7 @@ "aYn" = ( /obj/structure/table, /obj/item/aicard, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /turf/open/floor/plasteel/dark, /area/storage/tech) "aYo" = ( @@ -21841,7 +21841,7 @@ dir = 1; pixel_x = 14 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /obj/structure/disposalpipe/trunk{ @@ -22952,7 +22952,7 @@ /area/maintenance/starboard/fore) "bbk" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/AI, +/obj/effect/spawner/lootdrop/techstorage/ai, /turf/open/floor/plasteel/dark, /area/storage/tech) "bbl" = ( @@ -23302,11 +23302,11 @@ /area/maintenance/port/fore) "bbN" = ( /obj/structure/table, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = 2; pixel_y = -3 }, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = -3; pixel_y = 5 }, @@ -23495,7 +23495,7 @@ /area/storage/tech) "bcv" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/RnD_secure, +/obj/effect/spawner/lootdrop/techstorage/rnd_secure, /turf/open/floor/plasteel/dark, /area/storage/tech) "bcw" = ( @@ -23935,7 +23935,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 2 }, /obj/effect/turf_decal/stripes/line{ @@ -23955,11 +23955,11 @@ /obj/item/hand_labeler{ pixel_y = 11 }, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = 2; pixel_y = -3 }, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = 2; pixel_y = -3 }, @@ -23981,11 +23981,11 @@ /area/quartermaster/sorting) "bdq" = ( /obj/structure/table, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = -7; pixel_y = 9 }, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = -2 }, @@ -23999,7 +23999,7 @@ /area/quartermaster/sorting) "bdr" = ( /obj/structure/table, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = -9; pixel_y = -9 }, @@ -24489,7 +24489,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/mob/living/simple_animal/parrot/Poly, +/mob/living/simple_animal/parrot/poly, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "bek" = ( @@ -24762,7 +24762,7 @@ /area/quartermaster/sorting) "bfd" = ( /obj/structure/table, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = -8; pixel_y = -3 }, @@ -26456,7 +26456,7 @@ /obj/item/pen/red{ pixel_y = 10 }, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = 9; pixel_y = 10 }, @@ -26483,7 +26483,7 @@ pixel_y = 6 }, /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -27025,7 +27025,7 @@ /turf/open/floor/plating, /area/quartermaster/sorting) "bkp" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1; name = "Service Deliveries" }, @@ -27038,7 +27038,7 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "bkq" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1; name = "Security Deliveries" }, @@ -27051,7 +27051,7 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "bkr" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1; name = "Engineering Deliveries" }, @@ -27064,7 +27064,7 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "bks" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1; name = "Medical Deliveries" }, @@ -29119,8 +29119,8 @@ dir = 4 }, /obj/structure/easel, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, /turf/open/floor/plasteel, /area/storage/art) "boP" = ( @@ -29136,8 +29136,8 @@ /area/crew_quarters/bar) "boR" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/gun/ballistic/shotgun/doublebarrel, /obj/machinery/camera{ c_tag = "Bar - Backroom" @@ -30881,7 +30881,7 @@ pixel_y = 32 }, /obj/structure/bed/dogbed/ian, -/mob/living/simple_animal/pet/dog/corgi/Ian, +/mob/living/simple_animal/pet/dog/corgi/ian, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "bsQ" = ( @@ -32216,7 +32216,7 @@ /area/crew_quarters/heads/hop) "bwj" = ( /obj/item/hand_labeler, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/structure/table/wood, /obj/structure/cable, /turf/open/floor/wood, @@ -33767,7 +33767,7 @@ pixel_y = -29 }, /obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/Renault, +/mob/living/simple_animal/pet/fox/renault, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) "bAf" = ( @@ -34198,7 +34198,7 @@ dir = 1 }, /obj/structure/table/wood, -/obj/item/storage/box/PDAs{ +/obj/item/storage/box/pdas{ pixel_x = 4; pixel_y = 4 }, @@ -37886,10 +37886,10 @@ "bJI" = ( /obj/structure/window/reinforced, /obj/structure/table, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -38620,7 +38620,7 @@ dir = 8; name = "Disposals Chute" }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8; name = "disposals chute"; pixel_x = 5 @@ -40143,10 +40143,10 @@ dir = 4 }, /obj/structure/rack, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = 6 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/item/book/manual/chef_recipes{ pixel_x = 2; @@ -41087,7 +41087,7 @@ pixel_x = -27 }, /obj/item/folder/blue, -/obj/item/clothing/head/collectable/HoP{ +/obj/item/clothing/head/collectable/hop{ name = "novelty HoP hat" }, /obj/machinery/light/small{ @@ -41180,7 +41180,7 @@ pixel_y = 6 }, /obj/structure/table/wood, -/obj/item/toy/talking/AI{ +/obj/item/toy/talking/ai{ name = "\improper Nanotrasen-brand toy AI"; pixel_y = 6 }, @@ -41194,7 +41194,7 @@ /obj/item/toy/gun, /obj/item/restraints/handcuffs, /obj/structure/table/wood, -/obj/item/clothing/head/collectable/HoS{ +/obj/item/clothing/head/collectable/hos{ name = "novelty HoS hat" }, /obj/machinery/firealarm{ @@ -43866,15 +43866,15 @@ /obj/item/reagent_containers/blood/random, /obj/item/reagent_containers/blood/random, /obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/o_plus{ pixel_x = -2; pixel_y = -1 }, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/BPlus, -/obj/item/reagent_containers/blood/BMinus, -/obj/item/reagent_containers/blood/APlus, -/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/b_plus, +/obj/item/reagent_containers/blood/b_minus, +/obj/item/reagent_containers/blood/a_plus, +/obj/item/reagent_containers/blood/a_minus, /obj/item/reagent_containers/blood/lizard, /obj/item/reagent_containers/blood/ethereal, /obj/item/reagent_containers/blood{ @@ -44131,11 +44131,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bYf" = ( -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/structure/table/glass, /obj/effect/turf_decal/tile/green{ @@ -49579,7 +49579,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/secondary) "ckl" = ( -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "ckm" = ( @@ -50513,11 +50513,11 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "cmC" = ( -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/structure/table/glass, /obj/effect/turf_decal/tile/yellow, @@ -50565,8 +50565,8 @@ /area/science/lab) "cmG" = ( /obj/structure/table, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/open/floor/plasteel/white, /area/science/lab) @@ -51014,7 +51014,7 @@ /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) "cnG" = ( -/obj/structure/closet/secure_closet/CMO, +/obj/structure/closet/secure_closet/chief_medical, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, @@ -54727,7 +54727,7 @@ }, /area/crew_quarters/heads/hor) "cwS" = ( -/obj/structure/closet/secure_closet/RD, +/obj/structure/closet/secure_closet/research_director, /obj/machinery/keycard_auth{ pixel_y = -24 }, @@ -61921,8 +61921,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/robotics/lab) @@ -62251,7 +62251,7 @@ /turf/closed/wall/r_wall, /area/science/xenobiology) "cRv" = ( -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "xeno_airlock_exterior"; idSelf = "xeno_airlock_control"; name = "Access Button"; @@ -64092,7 +64092,7 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "dbZ" = ( -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "xeno_airlock_interior"; idSelf = "xeno_airlock_control"; name = "Access Button"; @@ -64305,7 +64305,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/doorButtons/airlock_controller{ +/obj/machinery/door_buttons/airlock_controller{ idExterior = "xeno_airlock_exterior"; idInterior = "xeno_airlock_interior"; idSelf = "xeno_airlock_control"; @@ -69794,7 +69794,7 @@ "gnA" = ( /obj/structure/lattice/catwalk, /obj/structure/easel, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythree_twentythree, /turf/open/space/basic, /area/space/nearstation) "gnT" = ( @@ -69964,7 +69964,7 @@ name = "Virology Interior Airlock"; req_access_txt = "39" }, -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; @@ -70419,7 +70419,7 @@ /obj/item/stack/sheet/cardboard{ amount = 14 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/open/floor/plasteel, /area/security/prison) "hog" = ( @@ -70852,7 +70852,7 @@ dir = 2; pixel_x = 0 }, -/mob/living/simple_animal/mouse/brown/Tom, +/mob/living/simple_animal/mouse/brown/tom, /turf/open/floor/plating, /area/security/prison/safe) "icO" = ( @@ -71498,7 +71498,7 @@ name = "Virology Exterior Airlock"; req_access_txt = "39" }, -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ dir = 1; idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; @@ -71790,7 +71790,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/doorButtons/airlock_controller{ +/obj/machinery/door_buttons/airlock_controller{ idExterior = "virology_airlock_exterior"; idInterior = "virology_airlock_interior"; idSelf = "virology_airlock_control"; @@ -76703,7 +76703,7 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "sjs" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1; name = "Science Deliveries" }, diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 38f7525c92e..c9b7f6e9ec2 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -539,9 +539,9 @@ /area/mine/eva) "bG" = ( /obj/structure/table, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -1221,17 +1221,17 @@ pixel_x = -3; pixel_y = -3 }, -/obj/item/reagent_containers/blood/AMinus, -/obj/item/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/a_minus, +/obj/item/reagent_containers/blood/b_minus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/b_plus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_plus{ pixel_x = -2; pixel_y = -1 }, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index d853564f8d4..8a226a1da76 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -695,7 +695,7 @@ "acF" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on, /turf/open/floor/plating/airless, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "acI" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -736,7 +736,7 @@ /area/space/nearstation) "acP" = ( /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "acR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/dark, @@ -751,23 +751,23 @@ /area/ai_monitored/turret_protected/ai) "acU" = ( /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "acV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "acW" = ( /obj/machinery/computer/station_alert, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "acX" = ( /obj/machinery/computer/monitor, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "acY" = ( /obj/machinery/computer/atmos_alert, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "acZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -831,32 +831,32 @@ pixel_y = 4 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adf" = ( /obj/machinery/light/small{ dir = 1 }, /obj/machinery/computer/rdconsole/robotics, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adg" = ( /obj/machinery/mecha_part_fabricator, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adi" = ( /obj/structure/chair/office{ dir = 1 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adk" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -901,21 +901,21 @@ "adp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adq" = ( /obj/structure/chair/office{ dir = 1 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adr" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "ads" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adt" = ( /obj/machinery/camera{ c_tag = "MiniSat Maintenance Port Fore"; @@ -923,13 +923,13 @@ network = list("minisat") }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adu" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adv" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "MiniSat Maintenance"; @@ -942,7 +942,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adw" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/airalarm{ @@ -993,11 +993,11 @@ dir = 8 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adC" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adD" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4; @@ -1009,26 +1009,26 @@ network = list("minisat") }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adH" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "MiniSat Maintenance"; @@ -1039,23 +1039,23 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adJ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adK" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -1081,19 +1081,19 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adP" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adQ" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "MiniSat Maintenance"; @@ -1104,7 +1104,7 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "adR" = ( /obj/structure/grille, /obj/structure/lattice, @@ -1113,22 +1113,22 @@ "adS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adV" = ( /turf/open/space, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adW" = ( /obj/structure/lattice, /obj/machinery/light/small{ @@ -1140,7 +1140,7 @@ network = list("minisat") }, /turf/open/space, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "adX" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat_interior) @@ -1153,7 +1153,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "adZ" = ( /turf/open/space, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "aea" = ( /obj/structure/lattice, /obj/machinery/light/small{ @@ -1165,19 +1165,19 @@ network = list("minisat") }, /turf/open/space, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "aeb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "aec" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "aed" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -1185,11 +1185,11 @@ /area/space/nearstation) "aee" = ( /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "aef" = ( /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "aeg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/porta_turret/ai{ @@ -1215,10 +1215,10 @@ "aek" = ( /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "ael" = ( /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "aem" = ( /turf/closed/wall/r_wall, /area/security/prison) @@ -1262,7 +1262,7 @@ /area/security/prison) "aes" = ( /obj/structure/easel, -/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/nineteen_nineteen, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, @@ -1291,13 +1291,13 @@ dir = 4 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "aew" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "aex" = ( /obj/structure/lattice, /obj/machinery/light/small, @@ -1308,7 +1308,7 @@ network = list("minisat") }, /turf/open/space, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "aey" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/cable, @@ -1324,19 +1324,19 @@ network = list("minisat") }, /turf/open/space, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "aeA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "aeB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "aeC" = ( /obj/machinery/hydroponics/constructable, /obj/item/seeds/grass, @@ -1379,24 +1379,24 @@ dir = 8 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "aeK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "aeL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "aeM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "aeN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -1425,13 +1425,13 @@ "aeQ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "aeR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "aeS" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "MiniSat Maintenance"; @@ -1441,7 +1441,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "aeT" = ( /obj/structure/bookcase, /turf/open/floor/plasteel/dark, @@ -1480,21 +1480,21 @@ dir = 1 }, /obj/machinery/power/apc{ - areastring = "/area/ai_monitored/turret_protected/AIsatextAP"; + areastring = "/area/ai_monitored/turret_protected/ai_sat_ext_ap"; dir = 8; name = "MiniSat Port Maintenance APC"; pixel_x = -25 }, /obj/structure/cable, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "aeZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /obj/structure/cable, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "afa" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -1508,14 +1508,14 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "afb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/cable, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "afc" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "MiniSat Maintenance"; @@ -1524,7 +1524,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "afd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -1587,14 +1587,14 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "afj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "afk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -1608,22 +1608,22 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "afl" = ( /obj/structure/cable, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "afm" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/power/apc{ - areastring = "/area/ai_monitored/turret_protected/AIsatextAS"; + areastring = "/area/ai_monitored/turret_protected/ai_sat_ext_as"; dir = 4; name = "MiniSat Starboard Maintenance APC"; pixel_x = 24 }, /obj/structure/cable, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "afn" = ( /obj/machinery/computer/bookmanagement, /obj/structure/table, @@ -1675,21 +1675,21 @@ dir = 6 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "afu" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4; name = "Air Out" }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "afv" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "afw" = ( /obj/machinery/light/small{ dir = 8 @@ -1742,7 +1742,7 @@ }, /obj/item/stack/cable_coil, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "afC" = ( /obj/machinery/light{ dir = 8 @@ -1803,19 +1803,19 @@ dir = 1 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "afL" = ( /obj/structure/table, /obj/item/wrench, /obj/item/tank/internals/emergency_oxygen, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "afM" = ( /obj/structure/table, /obj/item/crowbar, /obj/item/clothing/mask/gas, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "afN" = ( /obj/machinery/teleport/hub, /obj/effect/turf_decal/stripes/line{ @@ -1849,7 +1849,7 @@ "afS" = ( /obj/machinery/recharge_station, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "afT" = ( /obj/structure/rack, /obj/item/storage/toolbox/electrical{ @@ -1864,7 +1864,7 @@ layer = 4 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "afU" = ( /turf/closed/wall, /area/security/execution/transfer) @@ -4804,8 +4804,8 @@ dir = 4; layer = 2.9 }, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_minus, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -8505,7 +8505,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/storage/box/PDAs, +/obj/item/storage/box/pdas, /turf/open/floor/plasteel/dark, /area/bridge) "avW" = ( @@ -10665,7 +10665,7 @@ pixel_y = 32 }, /obj/structure/bed/dogbed/ian, -/mob/living/simple_animal/pet/dog/corgi/Ian, +/mob/living/simple_animal/pet/dog/corgi/ian, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "aBG" = ( @@ -11030,7 +11030,7 @@ /obj/structure/sign/poster/official/obey{ pixel_y = 32 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ name = "Crate Disposal Chute"; pixel_y = 6 }, @@ -11116,13 +11116,13 @@ /area/bridge) "aCG" = ( /obj/structure/table, -/obj/item/aiModule/supplied/quarantine, +/obj/item/ai_module/supplied/quarantine, /obj/machinery/camera/motion{ c_tag = "AI Upload Port"; dir = 4; network = list("aiupload") }, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /obj/machinery/flasher{ id = "brigentry"; pixel_x = -28 @@ -11173,7 +11173,7 @@ /area/ai_monitored/turret_protected/ai_upload) "aCM" = ( /obj/structure/table, -/obj/item/aiModule/supplied/freeform, +/obj/item/ai_module/supplied/freeform, /obj/machinery/camera/motion{ c_tag = "AI Upload Starboard"; dir = 8; @@ -11939,9 +11939,9 @@ /area/bridge) "aED" = ( /obj/structure/table, -/obj/item/aiModule/core/full/asimov, +/obj/item/ai_module/core/full/asimov, /obj/effect/spawner/lootdrop/aimodule_harmless, -/obj/item/aiModule/core/freeformcore, +/obj/item/ai_module/core/freeformcore, /obj/machinery/door/window{ base_state = "right"; dir = 4; @@ -11950,7 +11950,7 @@ req_access_txt = "20" }, /obj/effect/spawner/lootdrop/aimodule_neutral, -/obj/item/aiModule/core/full/custom, +/obj/item/ai_module/core/full/custom, /obj/structure/window/reinforced{ dir = 1; pixel_y = 1 @@ -11997,16 +11997,16 @@ /area/ai_monitored/turret_protected/ai_upload) "aEI" = ( /obj/structure/table, -/obj/item/aiModule/supplied/oxygen, -/obj/item/aiModule/zeroth/oneHuman, +/obj/item/ai_module/supplied/oxygen, +/obj/item/ai_module/zeroth/onehuman, /obj/machinery/door/window{ dir = 8; name = "High-Risk Modules"; req_access_txt = "20" }, -/obj/item/aiModule/reset/purge, +/obj/item/ai_module/reset/purge, /obj/effect/spawner/lootdrop/aimodule_harmful, -/obj/item/aiModule/supplied/protectStation, +/obj/item/ai_module/supplied/protect_station, /obj/structure/window/reinforced{ dir = 1; pixel_y = 1 @@ -12060,7 +12060,7 @@ /area/crew_quarters/heads/hop) "aEN" = ( /obj/structure/table/wood, -/obj/item/storage/box/PDAs{ +/obj/item/storage/box/pdas{ pixel_x = 4; pixel_y = 4 }, @@ -12294,8 +12294,8 @@ /obj/structure/table, /obj/item/weldingtool, /obj/item/crowbar, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -14300,7 +14300,7 @@ dir = 4 }, /obj/structure/easel, -/obj/item/canvas/twentythreeXnineteen, +/obj/item/canvas/twentythree_nineteen, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -14670,7 +14670,7 @@ /turf/open/floor/plating, /area/quartermaster/sorting) "aMn" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8 }, /obj/structure/disposalpipe/trunk{ @@ -15229,7 +15229,7 @@ pixel_x = 3; pixel_y = 4 }, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = -1; pixel_y = -1 }, @@ -15319,7 +15319,7 @@ /turf/open/floor/plating, /area/maintenance/disposal) "aNX" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8 }, /obj/structure/disposalpipe/trunk{ @@ -15455,8 +15455,8 @@ amount = 20; layer = 3.3 }, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/nineteen_nineteen, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -18323,9 +18323,9 @@ /area/maintenance/department/cargo) "aVI" = ( /obj/structure/closet, -/obj/item/canvas/twentythreeXnineteen, -/obj/item/canvas/nineteenXnineteen, -/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythree_nineteen, +/obj/item/canvas/nineteen_nineteen, +/obj/item/canvas/twentythree_twentythree, /obj/item/storage/crayons, /turf/open/floor/plating, /area/maintenance/department/cargo) @@ -29170,7 +29170,7 @@ /area/medical/chemistry) "bwW" = ( /obj/structure/rack, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, @@ -30884,7 +30884,7 @@ name = "Virology Exterior Airlock"; req_access_txt = "39" }, -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; @@ -30974,7 +30974,7 @@ dir = 8 }, /obj/structure/cable, -/mob/living/simple_animal/pet/cat/Runtime, +/mob/living/simple_animal/pet/cat/runtime, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) "bBi" = ( @@ -31054,7 +31054,7 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/hor) "bBq" = ( -/obj/structure/closet/secure_closet/RD, +/obj/structure/closet/secure_closet/research_director, /obj/machinery/power/apc{ dir = 8; name = "RD Office APC"; @@ -32670,7 +32670,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bED" = ( -/obj/structure/closet/secure_closet/CMO, +/obj/structure/closet/secure_closet/chief_medical, /obj/item/valentine, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -33277,7 +33277,7 @@ name = "Virology Interior Airlock"; req_access_txt = "39" }, -/obj/machinery/doorButtons/access_button{ +/obj/machinery/door_buttons/access_button{ idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; @@ -33822,7 +33822,7 @@ /turf/open/floor/plasteel/freezer, /area/medical/virology) "bGS" = ( -/obj/machinery/doorButtons/airlock_controller{ +/obj/machinery/door_buttons/airlock_controller{ idExterior = "virology_airlock_exterior"; idInterior = "virology_airlock_interior"; idSelf = "virology_airlock_control"; @@ -37905,7 +37905,7 @@ pixel_x = -26 }, /obj/item/aicard, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /obj/item/assembly/flash/handheld, /obj/effect/turf_decal/tile/green{ dir = 1 @@ -40227,7 +40227,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/mob/living/simple_animal/parrot/Poly, +/mob/living/simple_animal/parrot/poly, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bVE" = ( @@ -40552,7 +40552,7 @@ /area/crew_quarters/heads/chief) "bWs" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/RnD_secure, +/obj/effect/spawner/lootdrop/techstorage/rnd_secure, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -40586,7 +40586,7 @@ /area/storage/tech) "bWu" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/AI, +/obj/effect/spawner/lootdrop/techstorage/ai, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -44114,7 +44114,7 @@ dir = 4 }, /obj/structure/easel, -/obj/item/canvas/twentythreeXnineteen, +/obj/item/canvas/twentythree_nineteen, /turf/open/floor/plasteel/grimy, /area/chapel/main/monastery) "ciq" = ( @@ -45418,20 +45418,20 @@ /area/ai_monitored/turret_protected/aisat_interior) "cnD" = ( /turf/open/space/basic, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "cnE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/lattice, /turf/open/space/basic, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "cnG" = ( /turf/open/space/basic, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "cnH" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/space/basic, -/area/ai_monitored/turret_protected/AIsatextAS) +/area/ai_monitored/turret_protected/ai_sat_ext_as) "cnJ" = ( /obj/effect/turf_decal/delivery, /obj/machinery/vending/wardrobe/sec_wardrobe, @@ -45895,7 +45895,7 @@ /area/crew_quarters/kitchen) "cpz" = ( /obj/structure/rack, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) @@ -48259,7 +48259,7 @@ /area/library) "czP" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/coin/gold, /turf/open/floor/plasteel/dark, /area/library) @@ -49710,7 +49710,7 @@ /turf/open/floor/plasteel/white, /area/science/explab) "eYM" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /obj/structure/disposalpipe/trunk, @@ -52278,7 +52278,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/area/ai_monitored/turret_protected/ai_sat_ext_ap) "kkk" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/shaker, @@ -55451,7 +55451,7 @@ /area/medical/medbay/central) "qrw" = ( /obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -56660,7 +56660,7 @@ /area/engine/engineering) "tdp" = ( /obj/structure/rack, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -58781,15 +58781,15 @@ /area/security/detectives_office) "xkB" = ( /obj/structure/closet/crate, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXnineteen, -/obj/item/canvas/twentythreeXnineteen, -/obj/item/canvas/twentythreeXnineteen, -/obj/item/canvas/nineteenXnineteen, -/obj/item/canvas/nineteenXnineteen, -/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_twentythree, +/obj/item/canvas/twentythree_nineteen, +/obj/item/canvas/twentythree_nineteen, +/obj/item/canvas/twentythree_nineteen, +/obj/item/canvas/nineteen_nineteen, +/obj/item/canvas/nineteen_nineteen, +/obj/item/canvas/nineteen_nineteen, /obj/item/wirecutters, /obj/machinery/firealarm{ dir = 1; diff --git a/_maps/map_files/debug/multiz.dmm b/_maps/map_files/debug/multiz.dmm index fcc49f6c7e0..5192c16f697 100644 --- a/_maps/map_files/debug/multiz.dmm +++ b/_maps/map_files/debug/multiz.dmm @@ -415,7 +415,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bF" = ( -/obj/structure/closet/secure_closet/CMO, +/obj/structure/closet/secure_closet/chief_medical, /turf/open/floor/plasteel, /area/hallway/primary/central) "bG" = ( diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 159de484c17..246424e300f 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -2359,7 +2359,7 @@ /turf/open/floor/plasteel, /area/science) "BD" = ( -/obj/structure/closet/secure_closet/CMO{ +/obj/structure/closet/secure_closet/chief_medical{ locked = 0 }, /obj/effect/turf_decal/tile/blue, @@ -2436,7 +2436,7 @@ /turf/open/floor/plasteel, /area/science) "Iy" = ( -/obj/structure/closet/secure_closet/RD{ +/obj/structure/closet/secure_closet/research_director{ locked = 0 }, /obj/effect/turf_decal/tile/blue, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 4cf1e3c3648..6c12d396595 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -3615,7 +3615,7 @@ /turf/open/floor/plasteel, /area/centcom/supply) "jq" = ( -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/structure/table, /obj/effect/turf_decal/bot, @@ -4799,7 +4799,7 @@ "lS" = ( /obj/structure/fans/tiny/invisible, /turf/open/floor/holofloor/hyperspace, -/area/centcom/supplypod/flyMeToTheMoon) +/area/centcom/supplypod/fly_me_to_the_moon) "lT" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Security"; @@ -5191,7 +5191,7 @@ "mK" = ( /obj/structure/table, /obj/item/clipboard, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/stack/cable_coil, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/green{ @@ -5656,7 +5656,7 @@ pixel_y = -24 }, /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/stack/cable_coil, /obj/item/hand_labeler, /obj/effect/turf_decal/tile/neutral{ @@ -6176,7 +6176,7 @@ /area/centcom/supply) "ot" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/stripes/line, /obj/machinery/light{ @@ -7041,7 +7041,7 @@ /area/centcom/ferry) "pS" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) "pT" = ( @@ -9426,7 +9426,7 @@ /area/centcom/ferry) "uP" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/crowbar/power, /obj/item/wrench, /obj/item/hand_labeler, @@ -11155,7 +11155,7 @@ /turf/open/floor/plasteel/dark, /area/centcom/ferry) "ze" = ( -/obj/structure/closet/secure_closet/ertEngi, +/obj/structure/closet/secure_closet/ert_engi, /obj/structure/sign/directions/engineering{ pixel_y = 24 }, @@ -11163,7 +11163,7 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "zf" = ( -/obj/structure/closet/secure_closet/ertEngi, +/obj/structure/closet/secure_closet/ert_engi, /obj/machinery/airalarm{ pixel_y = 24 }, @@ -11212,7 +11212,7 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "zj" = ( -/obj/structure/closet/secure_closet/ertCom, +/obj/structure/closet/secure_closet/ert_com, /obj/structure/sign/directions/command{ pixel_y = 24 }, @@ -12611,7 +12611,7 @@ /turf/open/floor/plasteel/dark, /area/centcom/ferry) "CB" = ( -/obj/structure/closet/secure_closet/ertMed, +/obj/structure/closet/secure_closet/ert_med, /obj/structure/sign/directions/medical{ dir = 1; pixel_y = -24 @@ -12622,7 +12622,7 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "CC" = ( -/obj/structure/closet/secure_closet/ertMed, +/obj/structure/closet/secure_closet/ert_med, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_y = -32; @@ -12658,14 +12658,14 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "CF" = ( -/obj/structure/closet/secure_closet/ertSec, +/obj/structure/closet/secure_closet/ert_sec, /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/plasteel, /area/centcom/ferry) "CG" = ( -/obj/structure/closet/secure_closet/ertSec, +/obj/structure/closet/secure_closet/ert_sec, /obj/structure/sign/directions/security{ dir = 1; pixel_y = -24 @@ -17149,7 +17149,7 @@ /area/centcom/holding) "NE" = ( /turf/open/floor/plasteel, -/area/centcom/supplypod/podStorage) +/area/centcom/supplypod/pod_storage) "NG" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Security"; diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index ceadce5aeed..b5f1a20df4c 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -1251,23 +1251,23 @@ /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/blood, -/obj/item/reagent_containers/blood/AMinus, -/obj/item/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/a_minus, +/obj/item/reagent_containers/blood/b_minus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/b_plus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_plus{ pixel_x = -2; pixel_y = -1 }, /obj/item/reagent_containers/blood/random, /obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/a_plus, /obj/item/reagent_containers/blood/random, /obj/effect/turf_decal/tile/blue{ dir = 1 diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index 0b891ef9c17..9ebc91d7d3e 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -707,23 +707,23 @@ /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/blood, -/obj/item/reagent_containers/blood/AMinus, -/obj/item/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/a_minus, +/obj/item/reagent_containers/blood/b_minus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/b_plus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_plus{ pixel_x = -2; pixel_y = -1 }, /obj/item/reagent_containers/blood/random, /obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/a_plus, /obj/item/reagent_containers/blood/random, /turf/open/floor/carpet/cyan, /area/shuttle/escape/luxury) diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm index c35642727f7..469bb552716 100644 --- a/_maps/shuttles/ruin_caravan_victim.dmm +++ b/_maps/shuttles/ruin_caravan_victim.dmm @@ -359,7 +359,7 @@ dir = 1 }, /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/crowbar, /obj/item/flashlight{ pixel_x = 1; diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index f5d70f14db5..8ed2bef5005 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -2207,7 +2207,7 @@ pixel_x = -3; pixel_y = -3 }, -/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/o_minus, /obj/item/reagent_containers/blood/random, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/bot, diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 54cef8a2582..26381b25d8c 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -149,7 +149,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define iscameramob(A) (istype(A, /mob/camera)) -#define isaicamera(A) (istype(A, /mob/camera/aiEye)) +#define isaicamera(A) (istype(A, /mob/camera/ai_eye)) //Objects #define isobj(A) istype(A, /obj) //override the byond proc because it returns true on children of /atom/movable that aren't objs diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index a7f830dedce..6967d38b5ac 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -28,7 +28,7 @@ #define STATUS_EFFECT_EXERCISED /datum/status_effect/exercised //Prevents heart disease -#define STATUS_EFFECT_HIPPOCRATIC_OATH /datum/status_effect/hippocraticOath //Gives you an aura of healing as well as regrowing the Rod of Asclepius if lost +#define STATUS_EFFECT_HIPPOCRATIC_OATH /datum/status_effect/hippocratic_oath //Gives you an aura of healing as well as regrowing the Rod of Asclepius if lost #define STATUS_EFFECT_GOOD_MUSIC /datum/status_effect/good_music @@ -89,7 +89,7 @@ #define STATUS_EFFECT_ICHORIAL_STAIN /datum/status_effect/ichorial_stain //Prevents a servant from being revived by vitality matrices for one minute. -#define STATUS_EFFECT_GONBOLAPACIFY /datum/status_effect/gonbolaPacify //Gives the user gondola traits while the gonbola is attached to them. +#define STATUS_EFFECT_GONBOLAPACIFY /datum/status_effect/gonbola_pacify //Gives the user gondola traits while the gonbola is attached to them. #define STATUS_EFFECT_SPASMS /datum/status_effect/spasms //causes random muscle spasms diff --git a/code/__HELPERS/AStar.dm b/code/__HELPERS/AStar.dm index 1b9fbe855d3..cab2536d346 100644 --- a/code/__HELPERS/AStar.dm +++ b/code/__HELPERS/AStar.dm @@ -26,23 +26,23 @@ Actual Adjacent procs : #define PF_TIEBREAKER 0.005 //tiebreker weight.To help to choose between equal paths ////////////////////// -//datum/PathNode object +//datum/pathnode object ////////////////////// #define MASK_ODD 85 #define MASK_EVEN 170 //A* nodes variables -/datum/PathNode +/datum/pathnode var/turf/source //turf associated with the PathNode - var/datum/PathNode/prevNode //link to the parent PathNode + var/datum/pathnode/prevNode //link to the parent PathNode var/f //A* Node weight (f = g + h) var/g //A* movement cost variable var/h //A* heuristic variable var/nt //count the number of Nodes traversed var/bf //bitflag for dir to expand.Some sufficiently advanced motherfuckery -/datum/PathNode/New(s,p,pg,ph,pnt,_bf) +/datum/pathnode/New(s,p,pg,ph,pnt,_bf) source = s prevNode = p g = pg @@ -51,14 +51,14 @@ Actual Adjacent procs : nt = pnt bf = _bf -/datum/PathNode/proc/setp(p,pg,ph,pnt) +/datum/pathnode/proc/setp(p,pg,ph,pnt) prevNode = p g = pg h = ph f = g + h*(1+ PF_TIEBREAKER) nt = pnt -/datum/PathNode/proc/calc_f() +/datum/pathnode/proc/calc_f() f = g + h ////////////////////// @@ -66,11 +66,11 @@ Actual Adjacent procs : ////////////////////// //the weighting function, used in the A* algorithm -/proc/PathWeightCompare(datum/PathNode/a, datum/PathNode/b) +/proc/PathWeightCompare(datum/pathnode/a, datum/pathnode/b) return a.f - b.f //reversed so that the Heap is a MinHeap rather than a MaxHeap -/proc/HeapPathWeightCompare(datum/PathNode/a, datum/PathNode/b) +/proc/HeapPathWeightCompare(datum/pathnode/a, datum/pathnode/b) return b.f - a.f //wrapper that returns an empty list if A* failed to find a path @@ -111,11 +111,11 @@ Actual Adjacent procs : if(call(start, dist)(end) > maxnodes) return FALSE maxnodedepth = maxnodes //no need to consider path longer than maxnodes - var/datum/Heap/open = new /datum/Heap(/proc/HeapPathWeightCompare) //the open list + var/datum/heap/open = new /datum/heap(/proc/HeapPathWeightCompare) //the open list var/list/openc = new() //open list for node check var/list/path = null //the returned path, if any //initialization - var/datum/PathNode/cur = new /datum/PathNode(start,null,0,call(start,dist)(end),0,15,1)//current processed turf + var/datum/pathnode/cur = new /datum/pathnode(start,null,0,call(start,dist)(end),0,15,1)//current processed turf open.Insert(cur) openc[start] = cur //then run the main loop @@ -143,7 +143,7 @@ Actual Adjacent procs : if(cur.bf & f) var/T = get_step(cur.source,f) if(T != exclude) - var/datum/PathNode/CN = openc[T] //current checking turf + var/datum/pathnode/CN = openc[T] //current checking turf var/r=((f & MASK_ODD)<<1)|((f & MASK_EVEN)>>1) //getting reverse direction throught swapping even and odd bits.((f & 01010101)<<1)|((f & 10101010)>>1) var/newg = cur.g + call(cur.source,dist)(T) if(CN) diff --git a/code/__HELPERS/heap.dm b/code/__HELPERS/heap.dm index 916e7fc05c5..9928e79cc18 100644 --- a/code/__HELPERS/heap.dm +++ b/code/__HELPERS/heap.dm @@ -1,28 +1,28 @@ ////////////////////// -//datum/Heap object +//datum/heap object ////////////////////// -/datum/Heap +/datum/heap var/list/L var/cmp -/datum/Heap/New(compare) +/datum/heap/New(compare) L = new() cmp = compare -/datum/Heap/proc/IsEmpty() +/datum/heap/proc/IsEmpty() return !L.len //Insert and place at its position a new node in the heap -/datum/Heap/proc/Insert(atom/A) +/datum/heap/proc/Insert(atom/A) L.Add(A) Swim(L.len) //removes and returns the first element of the heap //(i.e the max or the min dependant on the comparison function) -/datum/Heap/proc/Pop() +/datum/heap/proc/Pop() if(!L.len) return 0 . = L[1] @@ -33,7 +33,7 @@ Sink(1) //Get a node up to its right position in the heap -/datum/Heap/proc/Swim(var/index) +/datum/heap/proc/Swim(var/index) var/parent = round(index * 0.5) while(parent > 0 && (call(cmp)(L[index],L[parent]) > 0)) @@ -42,7 +42,7 @@ parent = round(index * 0.5) //Get a node down to its right position in the heap -/datum/Heap/proc/Sink(var/index) +/datum/heap/proc/Sink(var/index) var/g_child = GetGreaterChild(index) while(g_child > 0 && (call(cmp)(L[index],L[g_child]) < 0)) @@ -52,7 +52,7 @@ //Returns the greater (relative to the comparison proc) of a node children //or 0 if there's no child -/datum/Heap/proc/GetGreaterChild(var/index) +/datum/heap/proc/GetGreaterChild(var/index) if(index * 2 > L.len) return 0 @@ -65,12 +65,12 @@ return index * 2 //Replaces a given node so it verify the heap condition -/datum/Heap/proc/ReSort(atom/A) +/datum/heap/proc/ReSort(atom/A) var/index = L.Find(A) Swim(index) Sink(index) -/datum/Heap/proc/List() +/datum/heap/proc/List() . = L.Copy() diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index c0efebaa459..f78f95db29b 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -152,7 +152,7 @@ mob add_overlay(I) // Testing object types (and layers) - add_overlay(/obj/effect/overlayTest) + add_overlay(/obj/effect/overlay_test) loc = locate (10,10,1) verb @@ -199,7 +199,7 @@ mob getFlatIcon(src) Browse_Icon() -/obj/effect/overlayTest +/obj/effect/overlay_test icon = 'old_or_unused.dmi' icon_state = "blue" pixel_x = -24 diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index b7eda31f6ee..0caa4e860ff 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -616,7 +616,7 @@ var/datum/admins/A = GLOB.protected_admins[i] sql_admins += list(list("ckey" = A.target, "rank" = A.rank.name)) SSdbcore.MassInsert(format_table_name("admin"), sql_admins, duplicate_key = TRUE) - var/datum/DBQuery/query_admin_rank_update = SSdbcore.NewQuery("UPDATE [format_table_name("player")] p INNER JOIN [format_table_name("admin")] a ON p.ckey = a.ckey SET p.lastadminrank = a.rank") + var/datum/db_query/query_admin_rank_update = SSdbcore.NewQuery("UPDATE [format_table_name("player")] p INNER JOIN [format_table_name("admin")] a ON p.ckey = a.ckey SET p.lastadminrank = a.rank") query_admin_rank_update.Execute() qdel(query_admin_rank_update) @@ -650,7 +650,7 @@ if(!flags.len) continue var/flags_to_check = flags.Join(" != [R_EVERYTHING] AND ") + " != [R_EVERYTHING]" - var/datum/DBQuery/query_check_everything_ranks = SSdbcore.NewQuery( + var/datum/db_query/query_check_everything_ranks = SSdbcore.NewQuery( "SELECT flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")] WHERE rank = :rank AND ([flags_to_check])", list("rank" = R.name) ) @@ -659,7 +659,7 @@ return if(query_check_everything_ranks.NextRow()) //no row is returned if the rank already has the correct flag value var/flags_to_update = flags.Join(" = [R_EVERYTHING], ") + " = [R_EVERYTHING]" - var/datum/DBQuery/query_update_everything_ranks = SSdbcore.NewQuery( + var/datum/db_query/query_update_everything_ranks = SSdbcore.NewQuery( "UPDATE [format_table_name("admin_ranks")] SET [flags_to_update] WHERE rank = :rank", list("rank" = R.name) ) diff --git a/code/__HELPERS/sorts/InsertSort.dm b/code/__HELPERS/sorts/InsertSort.dm index 4c8c207abe6..2d5ca408ce3 100644 --- a/code/__HELPERS/sorts/InsertSort.dm +++ b/code/__HELPERS/sorts/InsertSort.dm @@ -8,7 +8,7 @@ if(toIndex <= 0) toIndex += L.len + 1 - var/datum/sortInstance/SI = GLOB.sortInstance + var/datum/sort_instance/SI = GLOB.sortInstance if(!SI) SI = new SI.L = L diff --git a/code/__HELPERS/sorts/MergeSort.dm b/code/__HELPERS/sorts/MergeSort.dm index 9c85f37f7c6..4692534edff 100644 --- a/code/__HELPERS/sorts/MergeSort.dm +++ b/code/__HELPERS/sorts/MergeSort.dm @@ -8,7 +8,7 @@ if(toIndex <= 0) toIndex += L.len + 1 - var/datum/sortInstance/SI = GLOB.sortInstance + var/datum/sort_instance/SI = GLOB.sortInstance if(!SI) SI = new SI.L = L diff --git a/code/__HELPERS/sorts/TimSort.dm b/code/__HELPERS/sorts/TimSort.dm index 7191d1ee55c..44f6d170df4 100644 --- a/code/__HELPERS/sorts/TimSort.dm +++ b/code/__HELPERS/sorts/TimSort.dm @@ -8,7 +8,7 @@ if(toIndex <= 0) toIndex += L.len + 1 - var/datum/sortInstance/SI = GLOB.sortInstance + var/datum/sort_instance/SI = GLOB.sortInstance if(!SI) SI = new diff --git a/code/__HELPERS/sorts/__main.dm b/code/__HELPERS/sorts/__main.dm index 9d1672b9fa4..b6f371fa9e8 100644 --- a/code/__HELPERS/sorts/__main.dm +++ b/code/__HELPERS/sorts/__main.dm @@ -9,8 +9,8 @@ #define MIN_GALLOP 7 //This is a global instance to allow much of this code to be reused. The interfaces are kept separately -GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) -/datum/sortInstance +GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) +/datum/sort_instance //The array being sorted. var/list/L @@ -31,7 +31,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) var/list/runLens = list() -/datum/sortInstance/proc/timSort(start, end) +/datum/sort_instance/proc/timSort(start, end) runBases.Cut() runLens.Cut() @@ -96,7 +96,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) hi the index after the last element in the range to be sorted start the index of the first element in the range that is not already known to be sorted */ -/datum/sortInstance/proc/binarySort(lo, hi, start) +/datum/sort_instance/proc/binarySort(lo, hi, start) //ASSERT(lo <= start && start <= hi) if(start <= lo) start = lo + 1 @@ -133,7 +133,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) definition of "descending" is needed so that the call can safely reverse a descending sequence without violating stability. */ -/datum/sortInstance/proc/countRunAndMakeAscending(lo, hi) +/datum/sort_instance/proc/countRunAndMakeAscending(lo, hi) //ASSERT(lo < hi) var/runHi = lo + 1 @@ -163,7 +163,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) //Returns the minimum acceptable run length for an array of the specified length. //Natural runs shorter than this will be extended with binarySort -/datum/sortInstance/proc/minRunLength(n) +/datum/sort_instance/proc/minRunLength(n) //ASSERT(n >= 0) var/r = 0 //becomes 1 if any bits are shifted off while(n >= MIN_MERGE) @@ -176,7 +176,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) // runLen[i-2] > runLen[i-1] //This method is called each time a new run is pushed onto the stack. //So the invariants are guaranteed to hold for i= 2) var/n = runBases.len - 1 if(n > 1 && runLens[n-1] <= runLens[n] + runLens[n+1]) @@ -191,7 +191,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) //Merges all runs on the stack until only one remains. //Called only once, to finalise the sort -/datum/sortInstance/proc/mergeForceCollapse() +/datum/sort_instance/proc/mergeForceCollapse() while(runBases.len >= 2) var/n = runBases.len - 1 if(n > 1 && runLens[n-1] < runLens[n+1]) @@ -202,7 +202,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) //Merges the two consecutive runs at stack indices i and i+1 //Run i must be the penultimate or antepenultimate run on the stack //In other words, i must be equal to stackSize-2 or stackSize-3 -/datum/sortInstance/proc/mergeAt(i) +/datum/sort_instance/proc/mergeAt(i) //ASSERT(runBases.len >= 2) //ASSERT(i >= 1) //ASSERT(i == runBases.len - 1 || i == runBases.len - 2) @@ -256,7 +256,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) Returns the index at which to insert element 'key' */ -/datum/sortInstance/proc/gallopLeft(key, base, len, hint) +/datum/sort_instance/proc/gallopLeft(key, base, len, hint) //ASSERT(len > 0 && hint >= 0 && hint < len) var/lastOffset = 0 @@ -315,7 +315,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) * @param c the comparator used to order the range, and to search * @return the int k, 0 <= k <= n such that a[b + k - 1] <= key < a[b + k] */ -/datum/sortInstance/proc/gallopRight(key, base, len, hint) +/datum/sort_instance/proc/gallopRight(key, base, len, hint) //ASSERT(len > 0 && hint >= 0 && hint < len) var/offset = 1 @@ -363,7 +363,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) //Merges two adjacent runs in-place in a stable fashion. //For performance this method should only be called when len1 <= len2! -/datum/sortInstance/proc/mergeLo(base1, len1, base2, len2) +/datum/sort_instance/proc/mergeLo(base1, len1, base2, len2) //ASSERT(len1 > 0 && len2 > 0 && base1 + len1 == base2) var/cursor1 = base1 @@ -465,7 +465,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) //ASSERT(len1 > 1) -/datum/sortInstance/proc/mergeHi(base1, len1, base2, len2) +/datum/sort_instance/proc/mergeHi(base1, len1, base2, len2) //ASSERT(len1 > 0 && len2 > 0 && base1 + len1 == base2) var/cursor1 = base1 + len1 - 1 //start at end of sublists @@ -565,7 +565,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) //ASSERT(len2 > 0) -/datum/sortInstance/proc/mergeSort(start, end) +/datum/sort_instance/proc/mergeSort(start, end) var/remaining = end - start //If array is small, do an insertion sort @@ -609,7 +609,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) return L -/datum/sortInstance/proc/mergeAt2(i) +/datum/sort_instance/proc/mergeAt2(i) var/cursor1 = runBases[i] var/cursor2 = runBases[i+1] diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index e1c50a0a989..db2c6ebeaff 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -117,7 +117,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/assembly/igniter = 1, /obj/item/assembly/health = 1, - /obj/item/stack/packageWrap = 1, + /obj/item/stack/package_wrap = 1, ) = 1, list(//medical and chemicals diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm index b9118da5f16..be1c020db16 100644 --- a/code/_onclick/hud/blob_overmind.dm +++ b/code/_onclick/hud/blob_overmind.dm @@ -8,32 +8,32 @@ /obj/screen/blob/MouseExited() closeToolTip(usr) -/obj/screen/blob/BlobHelp +/obj/screen/blob/blob_help icon_state = "ui_help" name = "Blob Help" desc = "Help on playing blob!" -/obj/screen/blob/BlobHelp/Click() +/obj/screen/blob/blob_help/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.blob_help() -/obj/screen/blob/JumpToNode +/obj/screen/blob/jump_to_node icon_state = "ui_tonode" name = "Jump to Node" desc = "Moves your camera to a selected blob node." -/obj/screen/blob/JumpToNode/Click() +/obj/screen/blob/jump_to_node/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.jump_to_node() -/obj/screen/blob/JumpToCore +/obj/screen/blob/jump_to_core icon_state = "ui_tocore" name = "Jump to Core" desc = "Moves your camera to your blob core." -/obj/screen/blob/JumpToCore/MouseEntered(location,control,params) +/obj/screen/blob/jump_to_core/MouseEntered(location,control,params) if(hud && hud.mymob && isovermind(hud.mymob)) var/mob/camera/blob/B = hud.mymob if(!B.placed) @@ -44,59 +44,59 @@ desc = initial(desc) ..() -/obj/screen/blob/JumpToCore/Click() +/obj/screen/blob/jump_to_core/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr if(!B.placed) B.place_blob_core(0) B.transport_core() -/obj/screen/blob/Blobbernaut +/obj/screen/blob/blobbernaut icon_state = "ui_blobbernaut" name = "Produce Blobbernaut (40)" desc = "Produces a strong, smart blobbernaut from a factory blob for 40 resources.
The factory blob used will become fragile and unable to produce spores." -/obj/screen/blob/Blobbernaut/Click() +/obj/screen/blob/blobbernaut/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_blobbernaut() -/obj/screen/blob/ResourceBlob +/obj/screen/blob/resource_blob icon_state = "ui_resource" name = "Produce Resource Blob (40)" desc = "Produces a resource blob for 40 resources.
Resource blobs will give you resources every few seconds." -/obj/screen/blob/ResourceBlob/Click() +/obj/screen/blob/resource_blob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_resource() -/obj/screen/blob/NodeBlob +/obj/screen/blob/node_blob icon_state = "ui_node" name = "Produce Node Blob (50)" desc = "Produces a node blob for 50 resources.
Node blobs will expand and activate nearby resource and factory blobs." -/obj/screen/blob/NodeBlob/Click() +/obj/screen/blob/node_blob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_node() -/obj/screen/blob/FactoryBlob +/obj/screen/blob/factory_blob icon_state = "ui_factory" name = "Produce Factory Blob (60)" desc = "Produces a factory blob for 60 resources.
Factory blobs will produce spores every few seconds." -/obj/screen/blob/FactoryBlob/Click() +/obj/screen/blob/factory_blob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_factory() -/obj/screen/blob/ReadaptStrain +/obj/screen/blob/readapt_strain icon_state = "ui_chemswap" name = "Readapt Strain (40)" desc = "Allows you to choose a new strain from 4 random choices for 40 resources." -/obj/screen/blob/ReadaptStrain/MouseEntered(location,control,params) +/obj/screen/blob/readapt_strain/MouseEntered(location,control,params) if(hud && hud.mymob && isovermind(hud.mymob)) var/mob/camera/blob/B = hud.mymob if(B.free_strain_rerolls) @@ -107,17 +107,17 @@ desc = initial(desc) ..() -/obj/screen/blob/ReadaptStrain/Click() +/obj/screen/blob/readapt_strain/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.strain_reroll() -/obj/screen/blob/RelocateCore +/obj/screen/blob/relocate_core icon_state = "ui_swap" name = "Relocate Core (80)" desc = "Swaps a node and your core for 80 resources." -/obj/screen/blob/RelocateCore/Click() +/obj/screen/blob/relocate_core/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.relocate_core() @@ -140,47 +140,47 @@ healths.hud = src infodisplay += healths - using = new /obj/screen/blob/BlobHelp() + using = new /obj/screen/blob/blob_help() using.screen_loc = "WEST:6,NORTH:-3" using.hud = src static_inventory += using - using = new /obj/screen/blob/JumpToNode() + using = new /obj/screen/blob/jump_to_node() using.screen_loc = ui_inventory using.hud = src static_inventory += using - using = new /obj/screen/blob/JumpToCore() + using = new /obj/screen/blob/jump_to_core() using.screen_loc = ui_zonesel using.hud = src static_inventory += using - using = new /obj/screen/blob/Blobbernaut() + using = new /obj/screen/blob/blobbernaut() using.screen_loc = ui_belt using.hud = src static_inventory += using - using = new /obj/screen/blob/ResourceBlob() + using = new /obj/screen/blob/resource_blob() using.screen_loc = ui_back using.hud = src static_inventory += using - using = new /obj/screen/blob/NodeBlob() + using = new /obj/screen/blob/node_blob() using.screen_loc = ui_hand_position(2) using.hud = src static_inventory += using - using = new /obj/screen/blob/FactoryBlob() + using = new /obj/screen/blob/factory_blob() using.screen_loc = ui_hand_position(1) using.hud = src static_inventory += using - using = new /obj/screen/blob/ReadaptStrain() + using = new /obj/screen/blob/readapt_strain() using.screen_loc = ui_storage1 using.hud = src static_inventory += using - using = new /obj/screen/blob/RelocateCore() + using = new /obj/screen/blob/relocate_core() using.screen_loc = ui_storage2 using.hud = src static_inventory += using diff --git a/code/_onclick/hud/guardian.dm b/code/_onclick/hud/guardian.dm index b753c8f5fb0..e0bf5b39968 100644 --- a/code/_onclick/hud/guardian.dm +++ b/code/_onclick/hud/guardian.dm @@ -16,12 +16,12 @@ healths.hud = src infodisplay += healths - using = new /obj/screen/guardian/Manifest() + using = new /obj/screen/guardian/manifest() using.screen_loc = ui_hand_position(2) using.hud = src static_inventory += using - using = new /obj/screen/guardian/Recall() + using = new /obj/screen/guardian/recall() using.screen_loc = ui_hand_position(1) using.hud = src static_inventory += using @@ -31,12 +31,12 @@ using.hud = src static_inventory += using - using = new /obj/screen/guardian/ToggleLight() + using = new /obj/screen/guardian/toggle_light() using.screen_loc = ui_inventory using.hud = src static_inventory += using - using = new /obj/screen/guardian/Communicate() + using = new /obj/screen/guardian/communicate() using.screen_loc = ui_back using.hud = src static_inventory += using @@ -56,14 +56,14 @@ inv_box.hud = src static_inventory += inv_box - using = new /obj/screen/guardian/Communicate() + using = new /obj/screen/guardian/communicate() using.screen_loc = ui_sstore1 using.hud = src static_inventory += using else - using = new /obj/screen/guardian/Communicate() + using = new /obj/screen/guardian/communicate() using.screen_loc = ui_id using.hud = src static_inventory += using @@ -79,12 +79,12 @@ healths.hud = src infodisplay += healths - using = new /obj/screen/guardian/Manifest() + using = new /obj/screen/guardian/manifest() using.screen_loc = ui_belt using.hud = src static_inventory += using - using = new /obj/screen/guardian/Recall() + using = new /obj/screen/guardian/recall() using.screen_loc = ui_back using.hud = src static_inventory += using @@ -94,7 +94,7 @@ using.hud = src static_inventory += using - using = new /obj/screen/guardian/ToggleLight() + using = new /obj/screen/guardian/toggle_light() using.screen_loc = ui_inventory using.hud = src static_inventory += using @@ -118,62 +118,62 @@ /obj/screen/guardian icon = 'icons/mob/guardian.dmi' -/obj/screen/guardian/Manifest +/obj/screen/guardian/manifest icon_state = "manifest" name = "Manifest" desc = "Spring forth into battle!" -/obj/screen/guardian/Manifest/Click() +/obj/screen/guardian/manifest/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.Manifest() -/obj/screen/guardian/Recall +/obj/screen/guardian/recall icon_state = "recall" name = "Recall" desc = "Return to your user." -/obj/screen/guardian/Recall/Click() +/obj/screen/guardian/recall/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.Recall() -/obj/screen/guardian/ToggleMode +/obj/screen/guardian/toggle_mode icon_state = "toggle" name = "Toggle Mode" desc = "Switch between ability modes." -/obj/screen/guardian/ToggleMode/Click() +/obj/screen/guardian/toggle_mode/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.ToggleMode() -/obj/screen/guardian/ToggleMode/Inactive +/obj/screen/guardian/toggle_mode/inactive icon_state = "notoggle" //greyed out so it doesn't look like it'll work -/obj/screen/guardian/ToggleMode/Assassin +/obj/screen/guardian/toggle_mode/assassin icon_state = "stealth" name = "Toggle Stealth" desc = "Enter or exit stealth." -/obj/screen/guardian/Communicate +/obj/screen/guardian/communicate icon_state = "communicate" name = "Communicate" desc = "Communicate telepathically with your user." -/obj/screen/guardian/Communicate/Click() +/obj/screen/guardian/communicate/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.Communicate() -/obj/screen/guardian/ToggleLight +/obj/screen/guardian/toggle_light icon_state = "light" name = "Toggle Light" desc = "Glow like star dust." -/obj/screen/guardian/ToggleLight/Click() +/obj/screen/guardian/toggle_light/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.ToggleLight() diff --git a/code/_onclick/hud/swarmer.dm b/code/_onclick/hud/swarmer.dm index 80cc01c3b30..253f58cac1a 100644 --- a/code/_onclick/hud/swarmer.dm +++ b/code/_onclick/hud/swarmer.dm @@ -3,62 +3,62 @@ /obj/screen/swarmer icon = 'icons/mob/swarmer.dmi' -/obj/screen/swarmer/FabricateTrap +/obj/screen/swarmer/fabricate_trap icon_state = "ui_trap" name = "Create trap (Costs 5 Resources)" desc = "Creates a trap that will nonlethally shock any non-swarmer that attempts to cross it. (Costs 5 resources)" -/obj/screen/swarmer/FabricateTrap/Click() +/obj/screen/swarmer/fabricate_trap/Click() if(isswarmer(usr)) var/mob/living/simple_animal/hostile/swarmer/S = usr S.CreateTrap() -/obj/screen/swarmer/Barricade +/obj/screen/swarmer/barricade icon_state = "ui_barricade" name = "Create barricade (Costs 5 Resources)" desc = "Creates a destructible barricade that will stop any non swarmer from passing it. Also allows disabler beams to pass through. (Costs 5 resources)" -/obj/screen/swarmer/Barricade/Click() +/obj/screen/swarmer/barricade/Click() if(isswarmer(usr)) var/mob/living/simple_animal/hostile/swarmer/S = usr S.CreateBarricade() -/obj/screen/swarmer/Replicate +/obj/screen/swarmer/replicate icon_state = "ui_replicate" name = "Replicate (Costs 50 Resources)" desc = "Creates another of our kind." -/obj/screen/swarmer/Replicate/Click() +/obj/screen/swarmer/replicate/Click() if(isswarmer(usr)) var/mob/living/simple_animal/hostile/swarmer/S = usr S.CreateSwarmer() -/obj/screen/swarmer/RepairSelf +/obj/screen/swarmer/repair_self icon_state = "ui_self_repair" name = "Repair self" desc = "Repairs damage to our body." -/obj/screen/swarmer/RepairSelf/Click() +/obj/screen/swarmer/repair_self/Click() if(isswarmer(usr)) var/mob/living/simple_animal/hostile/swarmer/S = usr S.RepairSelf() -/obj/screen/swarmer/ToggleLight +/obj/screen/swarmer/toggle_light icon_state = "ui_light" name = "Toggle light" desc = "Toggles our inbuilt light on or off." -/obj/screen/swarmer/ToggleLight/Click() +/obj/screen/swarmer/toggle_light/Click() if(isswarmer(usr)) var/mob/living/simple_animal/hostile/swarmer/S = usr S.ToggleLight() -/obj/screen/swarmer/ContactSwarmers +/obj/screen/swarmer/contact_swarmers icon_state = "ui_contact_swarmers" name = "Contact swarmers" desc = "Sends a message to all other swarmers, should they exist." -/obj/screen/swarmer/ContactSwarmers/Click() +/obj/screen/swarmer/contact_swarmers/Click() if(isswarmer(usr)) var/mob/living/simple_animal/hostile/swarmer/S = usr S.ContactSwarmers() @@ -67,32 +67,32 @@ ..() var/obj/screen/using - using = new /obj/screen/swarmer/FabricateTrap() + using = new /obj/screen/swarmer/fabricate_trap() using.screen_loc = ui_hand_position(2) using.hud = src static_inventory += using - using = new /obj/screen/swarmer/Barricade() + using = new /obj/screen/swarmer/barricade() using.screen_loc = ui_hand_position(1) using.hud = src static_inventory += using - using = new /obj/screen/swarmer/Replicate() + using = new /obj/screen/swarmer/replicate() using.screen_loc = ui_zonesel using.hud = src static_inventory += using - using = new /obj/screen/swarmer/RepairSelf() + using = new /obj/screen/swarmer/repair_self() using.screen_loc = ui_storage1 using.hud = src static_inventory += using - using = new /obj/screen/swarmer/ToggleLight() + using = new /obj/screen/swarmer/toggle_light() using.screen_loc = ui_back using.hud = src static_inventory += using - using = new /obj/screen/swarmer/ContactSwarmers() + using = new /obj/screen/swarmer/contact_swarmers() using.screen_loc = ui_inventory using.hud = src static_inventory += using diff --git a/code/controllers/subsystem/achievements.dm b/code/controllers/subsystem/achievements.dm index 6c5b8cefaa2..83c60c8a234 100644 --- a/code/controllers/subsystem/achievements.dm +++ b/code/controllers/subsystem/achievements.dm @@ -52,7 +52,7 @@ SUBSYSTEM_DEF(achievements) /datum/controller/subsystem/achievements/proc/update_metadata() var/list/current_metadata = list() //select metadata here - var/datum/DBQuery/Q = SSdbcore.NewQuery("SELECT achievement_key,achievement_version FROM [format_table_name("achievement_metadata")]") + var/datum/db_query/Q = SSdbcore.NewQuery("SELECT achievement_key,achievement_version FROM [format_table_name("achievement_metadata")]") if(!Q.Execute(async = TRUE)) qdel(Q) return diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index bd38dafd2d7..be019902b6d 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -43,7 +43,7 @@ SUBSYSTEM_DEF(blackbox) return var/playercount = LAZYLEN(GLOB.player_list) var/admincount = GLOB.admins.len - var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery({" + var/datum/db_query/query_record_playercount = SSdbcore.NewQuery({" INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port, round_id) VALUES (:playercount, :admincount, :time, INET_ATON(:server_ip), :server_port, :round_id) "}, list( @@ -289,7 +289,7 @@ Versioning if(!SSdbcore.Connect()) return - var/datum/DBQuery/query_log_ahelp = SSdbcore.NewQuery({" + var/datum/db_query/query_log_ahelp = SSdbcore.NewQuery({" INSERT INTO [format_table_name("ticket")] (ticket, action, message, recipient, sender, server_ip, server_port, round_id, timestamp) VALUES (:ticket, :action, :message, :recipient, :sender, INET_ATON(:server_ip), :server_port, :round_id, :time) "}, list("ticket" = ticket, "action" = action, "message" = message, "recipient" = recipient, "sender" = sender, "server_ip" = world.internet_address || "0", "server_port" = world.port, "round_id" = GLOB.round_id, "time" = SQLtime())) @@ -315,7 +315,7 @@ Versioning if(!SSdbcore.Connect()) return - var/datum/DBQuery/query_report_death = SSdbcore.NewQuery({" + var/datum/db_query/query_report_death = SSdbcore.NewQuery({" INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, last_words, suicide) VALUES (:pod, :x_coord, :y_coord, :z_coord, :map, INET_ATON(:internet_address), :port, :round_id, :time, :job, :special, :name, :key, :laname, :lakey, :brute, :fire, :brain, :oxy, :tox, :clone, :stamina, :last_words, :suicide) "}, list( diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index b1ef00c7266..f896159cd44 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -29,7 +29,7 @@ SUBSYSTEM_DEF(dbcore) /datum/controller/subsystem/dbcore/fire() for(var/I in active_queries) - var/datum/DBQuery/Q = I + var/datum/db_query/Q = I if(world.time - Q.last_activity_time > (5 MINUTES)) message_admins("Found undeleted query, please check the server logs and notify coders.") log_sql("Undeleted query: \"[Q.sql]\" LA: [Q.last_activity] LAT: [Q.last_activity_time]") @@ -43,7 +43,7 @@ SUBSYSTEM_DEF(dbcore) /datum/controller/subsystem/dbcore/Shutdown() //This is as close as we can get to the true round end before Disconnect() without changing where it's called, defeating the reason this is a subsystem if(SSdbcore.Connect()) - var/datum/DBQuery/query_round_shutdown = SSdbcore.NewQuery( + var/datum/db_query/query_round_shutdown = SSdbcore.NewQuery( "UPDATE [format_table_name("round")] SET shutdown_datetime = Now(), end_state = :end_state WHERE id = :round_id", list("end_state" = SSticker.end_state, "round_id" = GLOB.round_id) ) @@ -107,7 +107,7 @@ SUBSYSTEM_DEF(dbcore) if(CONFIG_GET(flag/sql_enabled)) if(Connect()) log_world("Database connection established.") - var/datum/DBQuery/query_db_version = NewQuery("SELECT major, minor FROM [format_table_name("schema_revision")] ORDER BY date DESC LIMIT 1") + var/datum/db_query/query_db_version = NewQuery("SELECT major, minor FROM [format_table_name("schema_revision")] ORDER BY date DESC LIMIT 1") query_db_version.Execute() if(query_db_version.NextRow()) db_major = text2num(query_db_version.item[1]) @@ -127,7 +127,7 @@ SUBSYSTEM_DEF(dbcore) /datum/controller/subsystem/dbcore/proc/SetRoundID() if(!Connect()) return - var/datum/DBQuery/query_round_initialize = SSdbcore.NewQuery( + var/datum/db_query/query_round_initialize = SSdbcore.NewQuery( "INSERT INTO [format_table_name("round")] (initialize_datetime, server_ip, server_port) VALUES (Now(), INET_ATON(:internet_address), :port)", list("internet_address" = world.internet_address || "0", "port" = "[world.port]") ) @@ -138,7 +138,7 @@ SUBSYSTEM_DEF(dbcore) /datum/controller/subsystem/dbcore/proc/SetRoundStart() if(!Connect()) return - var/datum/DBQuery/query_round_start = SSdbcore.NewQuery( + var/datum/db_query/query_round_start = SSdbcore.NewQuery( "UPDATE [format_table_name("round")] SET start_datetime = Now() WHERE id = :round_id", list("round_id" = GLOB.round_id) ) @@ -148,7 +148,7 @@ SUBSYSTEM_DEF(dbcore) /datum/controller/subsystem/dbcore/proc/SetRoundEnd() if(!Connect()) return - var/datum/DBQuery/query_round_end = SSdbcore.NewQuery( + var/datum/db_query/query_round_end = SSdbcore.NewQuery( "UPDATE [format_table_name("round")] SET end_datetime = Now(), game_mode_result = :game_mode_result, station_name = :station_name WHERE id = :round_id", list("game_mode_result" = SSticker.mode_result, "station_name" = station_name(), "round_id" = GLOB.round_id) ) @@ -181,23 +181,23 @@ SUBSYSTEM_DEF(dbcore) log_admin_private("ERROR: Advanced admin proc call led to sql query: [sql_query]. Query has been blocked") message_admins("ERROR: Advanced admin proc call led to sql query. Query has been blocked") return FALSE - return new /datum/DBQuery(connection, sql_query, arguments) + return new /datum/db_query(connection, sql_query, arguments) /datum/controller/subsystem/dbcore/proc/QuerySelect(list/querys, warn = FALSE, qdel = FALSE) if (!islist(querys)) - if (!istype(querys, /datum/DBQuery)) + if (!istype(querys, /datum/db_query)) CRASH("Invalid query passed to QuerySelect: [querys]") querys = list(querys) for (var/thing in querys) - var/datum/DBQuery/query = thing + var/datum/db_query/query = thing if (warn) - INVOKE_ASYNC(query, /datum/DBQuery.proc/warn_execute) + INVOKE_ASYNC(query, /datum/db_query.proc/warn_execute) else - INVOKE_ASYNC(query, /datum/DBQuery.proc/Execute) + INVOKE_ASYNC(query, /datum/db_query.proc/Execute) for (var/thing in querys) - var/datum/DBQuery/query = thing + var/datum/db_query/query = thing UNTIL(!query.in_progress) if (qdel) qdel(query) @@ -269,14 +269,14 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table else if (duplicate_key != FALSE) query_parts += duplicate_key - var/datum/DBQuery/Query = NewQuery(query_parts.Join(), arguments) + var/datum/db_query/Query = NewQuery(query_parts.Join(), arguments) if (warn) . = Query.warn_execute(async) else . = Query.Execute(async) qdel(Query) -/datum/DBQuery +/datum/db_query // Inputs var/connection var/sql @@ -296,7 +296,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table var/list/item //list of data values populated by NextRow() -/datum/DBQuery/New(connection, sql, arguments) +/datum/db_query/New(connection, sql, arguments) SSdbcore.active_queries[src] = TRUE Activity("Created") item = list() @@ -305,25 +305,25 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table src.sql = sql src.arguments = arguments -/datum/DBQuery/Destroy() +/datum/db_query/Destroy() Close() SSdbcore.active_queries -= src return ..() -/datum/DBQuery/CanProcCall(proc_name) +/datum/db_query/CanProcCall(proc_name) //fuck off kevinz return FALSE -/datum/DBQuery/proc/Activity(activity) +/datum/db_query/proc/Activity(activity) last_activity = activity last_activity_time = world.time -/datum/DBQuery/proc/warn_execute(async = TRUE) +/datum/db_query/proc/warn_execute(async = TRUE) . = Execute(async) if(!.) to_chat(usr, "A SQL error occurred during this operation, check the server logs.") -/datum/DBQuery/proc/Execute(async = TRUE, log_error = TRUE) +/datum/db_query/proc/Execute(async = TRUE, log_error = TRUE) Activity("Execute") if(in_progress) CRASH("Attempted to start a new query while waiting on the old one") @@ -347,7 +347,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table log_query_debug("Query used: [sql]") slow_query_check() -/datum/DBQuery/proc/run_query(async) +/datum/db_query/proc/run_query(async) var/job_result_str if (async) @@ -376,10 +376,10 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table last_error = "offline" return FALSE -/datum/DBQuery/proc/slow_query_check() +/datum/db_query/proc/slow_query_check() message_admins("HEY! A database query timed out. Did the server just hang? \[YES\]|\[NO\]") -/datum/DBQuery/proc/NextRow(async = TRUE) +/datum/db_query/proc/NextRow(async = TRUE) Activity("NextRow") if (rows && next_row_to_take <= rows.len) @@ -389,9 +389,9 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table else return FALSE -/datum/DBQuery/proc/ErrorMsg() +/datum/db_query/proc/ErrorMsg() return last_error -/datum/DBQuery/proc/Close() +/datum/db_query/proc/Close() rows = null item = null diff --git a/code/controllers/subsystem/discord.dm b/code/controllers/subsystem/discord.dm index 5cf11cea43e..610dccc98e6 100644 --- a/code/controllers/subsystem/discord.dm +++ b/code/controllers/subsystem/discord.dm @@ -84,7 +84,7 @@ SUBSYSTEM_DEF(discord) /datum/controller/subsystem/discord/proc/lookup_id(lookup_ckey) //We cast the discord ID to varchar to prevent BYOND mangling //it into it's scientific notation - var/datum/DBQuery/query_get_discord_id = SSdbcore.NewQuery( + var/datum/db_query/query_get_discord_id = SSdbcore.NewQuery( "SELECT CAST(discord_id AS CHAR(25)) FROM [format_table_name("player")] WHERE ckey = :ckey", list("ckey" = lookup_ckey) ) @@ -97,7 +97,7 @@ SUBSYSTEM_DEF(discord) // Returns ckey from ID /datum/controller/subsystem/discord/proc/lookup_ckey(lookup_id) - var/datum/DBQuery/query_get_discord_ckey = SSdbcore.NewQuery( + var/datum/db_query/query_get_discord_ckey = SSdbcore.NewQuery( "SELECT ckey FROM [format_table_name("player")] WHERE discord_id = :discord_id", list("discord_id" = lookup_id) ) @@ -110,7 +110,7 @@ SUBSYSTEM_DEF(discord) // Finalises link /datum/controller/subsystem/discord/proc/link_account(ckey) - var/datum/DBQuery/link_account = SSdbcore.NewQuery( + var/datum/db_query/link_account = SSdbcore.NewQuery( "UPDATE [format_table_name("player")] SET discord_id = :discord_id WHERE ckey = :ckey", list("discord_id" = account_link_cache[ckey], "ckey" = ckey) ) @@ -120,7 +120,7 @@ SUBSYSTEM_DEF(discord) // Unlink account (Admin verb used) /datum/controller/subsystem/discord/proc/unlink_account(ckey) - var/datum/DBQuery/unlink_account = SSdbcore.NewQuery( + var/datum/db_query/unlink_account = SSdbcore.NewQuery( "UPDATE [format_table_name("player")] SET discord_id = NULL WHERE ckey = :ckey", list("ckey" = ckey) ) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 3b6b03c6ef2..62513b6ac9d 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -253,7 +253,7 @@ SUBSYSTEM_DEF(mapping) LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION) if(SSdbcore.Connect()) - var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery({" + var/datum/db_query/query_round_map_name = SSdbcore.NewQuery({" UPDATE [format_table_name("round")] SET map_name = :map_name WHERE id = :round_id "}, list("map_name" = config.map_name, "round_id" = GLOB.round_id)) query_round_map_name.Execute() diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 2583ae99c87..f6ea93c9925 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -10,11 +10,11 @@ SUBSYSTEM_DEF(pai) /datum/controller/subsystem/pai/Topic(href, href_list[]) if(href_list["download"]) - var/datum/paiCandidate/candidate = locate(href_list["candidate"]) in candidates + var/datum/pai_candidate/candidate = locate(href_list["candidate"]) in candidates var/obj/item/paicard/card = locate(href_list["device"]) in pai_card_list if(card.pai) return - if(istype(card, /obj/item/paicard) && istype(candidate, /datum/paiCandidate)) + if(istype(card, /obj/item/paicard) && istype(candidate, /datum/pai_candidate)) if(check_ready(candidate) != candidate) return FALSE var/mob/living/silicon/pai/pai = new(card) @@ -31,7 +31,7 @@ SUBSYSTEM_DEF(pai) usr << browse(null, "window=findPai") if(href_list["new"]) - var/datum/paiCandidate/candidate = locate(href_list["candidate"]) in candidates + var/datum/pai_candidate/candidate = locate(href_list["candidate"]) in candidates var/option = href_list["option"] var/t = "" @@ -77,12 +77,12 @@ SUBSYSTEM_DEF(pai) recruitWindow(usr) /datum/controller/subsystem/pai/proc/recruitWindow(mob/M) - var/datum/paiCandidate/candidate - for(var/datum/paiCandidate/c in candidates) + var/datum/pai_candidate/candidate + for(var/datum/pai_candidate/c in candidates) if(c.key == M.key) candidate = c if(!candidate) - candidate = new /datum/paiCandidate() + candidate = new /datum/pai_candidate() candidate.key = M.key candidates.Add(candidate) @@ -130,7 +130,7 @@ SUBSYSTEM_DEF(pai) /datum/controller/subsystem/pai/proc/spam_again() ghost_spam = FALSE -/datum/controller/subsystem/pai/proc/check_ready(var/datum/paiCandidate/C) +/datum/controller/subsystem/pai/proc/check_ready(var/datum/pai_candidate/C) if(!C.ready) return FALSE for(var/mob/dead/observer/O in GLOB.player_list) @@ -149,7 +149,7 @@ SUBSYSTEM_DEF(pai) to_chat(G, "[user] is requesting a pAI personality! Use the pAI button to submit yourself as one.") addtimer(CALLBACK(src, .proc/spam_again), spam_delay) var/list/available = list() - for(var/datum/paiCandidate/c in SSpai.candidates) + for(var/datum/pai_candidate/c in SSpai.candidates) available.Add(check_ready(c)) var/dat = "" @@ -175,7 +175,7 @@ SUBSYSTEM_DEF(pai) dat += "" - for(var/datum/paiCandidate/c in available) + for(var/datum/pai_candidate/c in available) dat += "" dat += "" dat += "" @@ -186,7 +186,7 @@ SUBSYSTEM_DEF(pai) user << browse(dat, "window=findPai") -/datum/paiCandidate +/datum/pai_candidate var/name var/key var/description diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index ab75a1c619a..2e2ba59e9c5 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -36,7 +36,7 @@ SUBSYSTEM_DEF(persistence) return ..() /datum/controller/subsystem/persistence/proc/LoadPoly() - for(var/mob/living/simple_animal/parrot/Poly/P in GLOB.alive_mob_list) + for(var/mob/living/simple_animal/parrot/poly/P in GLOB.alive_mob_list) twitterize(P.speech_buffer, "polytalk") break //Who's been duping the bird?! diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index 1b94792048a..d9ce72242ac 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -81,7 +81,7 @@ SUBSYSTEM_DEF(server_maint) if(!thing) continue var/client/C = thing - var/datum/chatOutput/co = C.chatOutput + var/datum/chat_output/co = C.chatOutput if(co) co.ehjax_send(data = "roundrestart") if(server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite diff --git a/code/controllers/subsystem/stickyban.dm b/code/controllers/subsystem/stickyban.dm index 38a12ec0bae..c61ea9943ed 100644 --- a/code/controllers/subsystem/stickyban.dm +++ b/code/controllers/subsystem/stickyban.dm @@ -60,10 +60,10 @@ SUBSYSTEM_DEF(stickyban) /datum/controller/subsystem/stickyban/proc/Populatedbcache() var/newdbcache = list() //so if we runtime or the db connection dies we don't kill the existing cache - var/datum/DBQuery/query_stickybans = SSdbcore.NewQuery("SELECT ckey, reason, banning_admin, datetime FROM [format_table_name("stickyban")] ORDER BY ckey") - var/datum/DBQuery/query_ckey_matches = SSdbcore.NewQuery("SELECT stickyban, matched_ckey, first_matched, last_matched, exempt FROM [format_table_name("stickyban_matched_ckey")] ORDER BY first_matched") - var/datum/DBQuery/query_cid_matches = SSdbcore.NewQuery("SELECT stickyban, matched_cid, first_matched, last_matched FROM [format_table_name("stickyban_matched_cid")] ORDER BY first_matched") - var/datum/DBQuery/query_ip_matches = SSdbcore.NewQuery("SELECT stickyban, INET_NTOA(matched_ip), first_matched, last_matched FROM [format_table_name("stickyban_matched_ip")] ORDER BY first_matched") + var/datum/db_query/query_stickybans = SSdbcore.NewQuery("SELECT ckey, reason, banning_admin, datetime FROM [format_table_name("stickyban")] ORDER BY ckey") + var/datum/db_query/query_ckey_matches = SSdbcore.NewQuery("SELECT stickyban, matched_ckey, first_matched, last_matched, exempt FROM [format_table_name("stickyban_matched_ckey")] ORDER BY first_matched") + var/datum/db_query/query_cid_matches = SSdbcore.NewQuery("SELECT stickyban, matched_cid, first_matched, last_matched FROM [format_table_name("stickyban_matched_cid")] ORDER BY first_matched") + var/datum/db_query/query_ip_matches = SSdbcore.NewQuery("SELECT stickyban, INET_NTOA(matched_ip), first_matched, last_matched FROM [format_table_name("stickyban_matched_ip")] ORDER BY first_matched") SSdbcore.QuerySelect(list(query_stickybans, query_ckey_matches, query_cid_matches, query_ip_matches)) @@ -156,7 +156,7 @@ SUBSYSTEM_DEF(stickyban) if (!ban["message"]) ban["message"] = "Evasion" - var/datum/DBQuery/query_create_stickyban = SSdbcore.NewQuery( + var/datum/db_query/query_create_stickyban = SSdbcore.NewQuery( "INSERT IGNORE INTO [format_table_name("stickyban")] (ckey, reason, banning_admin) VALUES (:ckey, :message, :admin)", list("ckey" = ckey, "message" = ban["message"], "admin" = ban["admin"]) ) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 29feec32b9d..16b77638af2 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -92,7 +92,7 @@ SUBSYSTEM_DEF(traumas) /obj/item/clothing/suit/space/hardsuit/deathsquad, /obj/item/clothing/head/helmet/space/hardsuit/deathsquad, /obj/machinery/door/airlock/centcom)), - "robots" = typecacheof(list(/obj/machinery/computer/upload, /obj/item/aiModule/, /obj/machinery/recharge_station, + "robots" = typecacheof(list(/obj/machinery/computer/upload, /obj/item/ai_module/, /obj/machinery/recharge_station, /obj/item/aicard, /obj/item/deactivated_swarmer, /obj/effect/mob_spawn/swarmer)), "doctors" = typecacheof(list(/obj/item/clothing/under/rank/medical, diff --git a/code/datums/achievements/_achievement_data.dm b/code/datums/achievements/_achievement_data.dm index 641c6559b7d..14f4510f4e0 100644 --- a/code/datums/achievements/_achievement_data.dm +++ b/code/datums/achievements/_achievement_data.dm @@ -32,7 +32,7 @@ set waitfor = FALSE var/list/kv = list() - var/datum/DBQuery/Query = SSdbcore.NewQuery( + var/datum/db_query/Query = SSdbcore.NewQuery( "SELECT achievement_key,value FROM [format_table_name("achievements")] WHERE ckey = :ckey", list("ckey" = owner_ckey) ) diff --git a/code/datums/achievements/_awards.dm b/code/datums/achievements/_awards.dm index 5726efd58e5..77485de8ba1 100644 --- a/code/datums/achievements/_awards.dm +++ b/code/datums/achievements/_awards.dm @@ -44,7 +44,7 @@ ///Get raw numerical achievement value from the database /datum/award/proc/get_raw_value(key) - var/datum/DBQuery/Q = SSdbcore.NewQuery( + var/datum/db_query/Q = SSdbcore.NewQuery( "SELECT value FROM [format_table_name("achievements")] WHERE ckey = :ckey AND achievement_key = :achievement_key", list("ckey" = key, "achievement_key" = database_id) ) @@ -99,7 +99,7 @@ .["achievement_type"] = "score" /datum/award/score/proc/LoadHighScores() - var/datum/DBQuery/Q = SSdbcore.NewQuery( + var/datum/db_query/Q = SSdbcore.NewQuery( "SELECT ckey,value FROM [format_table_name("achievements")] WHERE achievement_key = :achievement_key ORDER BY value DESC LIMIT 50", list("achievement_key" = database_id) ) diff --git a/code/datums/action.dm b/code/datums/action.dm index 3c1913fdb38..52eee38f51e 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -228,7 +228,7 @@ /datum/action/item_action/toggle_barrier_spread name = "Toggle Barrier Spread" -/datum/action/item_action/equip_unequip_TED_Gun +/datum/action/item_action/equip_unequip_ted_gun name = "Equip/Unequip TED Gun" /datum/action/item_action/toggle_paddles @@ -699,7 +699,7 @@ icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "wheelys" -/datum/action/item_action/kindleKicks +/datum/action/item_action/kindle_kicks name = "Activate Kindle Kicks" desc = "Kick you feet together, activating the lights in your Kindle Kicks." icon_icon = 'icons/mob/actions/actions_items.dmi' diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index f529ec7b652..1a9e09f963e 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -25,7 +25,7 @@ /datum/crafting_recipe/proc/check_requirements(mob/user, list/collected_requirements) return TRUE -/datum/crafting_recipe/IED +/datum/crafting_recipe/improv_explosive name = "IED" result = /obj/item/grenade/iedcasing reqs = list(/datum/reagent/fuel = 50, @@ -207,7 +207,7 @@ time = 40 category = CAT_ROBOT -/datum/crafting_recipe/Firebot +/datum/crafting_recipe/firebot name = "Firebot" result = /mob/living/simple_animal/bot/firebot reqs = list(/obj/item/extinguisher = 1, @@ -217,7 +217,7 @@ time = 40 category = CAT_ROBOT -/datum/crafting_recipe/Vibebot +/datum/crafting_recipe/vibebot name = "Vibebot" result = /mob/living/simple_animal/bot/vibebot reqs = list(/obj/item/light/bulb = 2, @@ -232,7 +232,7 @@ result = /obj/item/pneumatic_cannon/ghetto tools = list(TOOL_WELDER, TOOL_WRENCH) reqs = list(/obj/item/stack/sheet/metal = 4, - /obj/item/stack/packageWrap = 8, + /obj/item/stack/package_wrap = 8, /obj/item/pipe = 2) time = 50 category = CAT_WEAPONRY @@ -333,7 +333,7 @@ reqs = list(/obj/item/weaponcrafting/receiver = 1, /obj/item/pipe = 1, /obj/item/weaponcrafting/stock = 1, - /obj/item/stack/packageWrap = 5) + /obj/item/stack/package_wrap = 5) tools = list(TOOL_SCREWDRIVER) time = 100 category = CAT_WEAPONRY diff --git a/code/datums/components/forensics.dm b/code/datums/components/forensics.dm index f5a82ce5c4a..3013d9c46e6 100644 --- a/code/datums/components/forensics.dm +++ b/code/datums/components/forensics.dm @@ -72,7 +72,7 @@ if(!iscameramob(M)) return if(isaicamera(M)) - var/mob/camera/aiEye/ai_camera = M + var/mob/camera/ai_eye/ai_camera = M if(!ai_camera.ai) return M = ai_camera.ai @@ -144,7 +144,7 @@ if(!iscameramob(M)) return if(isaicamera(M)) - var/mob/camera/aiEye/ai_camera = M + var/mob/camera/ai_eye/ai_camera = M if(!ai_camera.ai) return M = ai_camera.ai diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 2f3d003e033..8afaaa4aa8c 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -45,7 +45,7 @@ /datum/reagent/consumable/sodiumchloride, /datum/reagent/consumable/sugar, /datum/reagent/consumable/orangejuice, /datum/reagent/consumable/tomatojuice, /datum/reagent/consumable/milk ), list( //level 4 - /datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution, /datum/reagent/medicine/epinephrine, /datum/reagent/medicine/C2/multiver + /datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution, /datum/reagent/medicine/epinephrine, /datum/reagent/medicine/c2/multiver ), list( //level 5 /datum/reagent/fuel/oil, /datum/reagent/medicine/synaptizine, /datum/reagent/medicine/mannitol, /datum/reagent/drug/space_drugs, /datum/reagent/cryptobiolin diff --git a/code/datums/diseases/heart_failure.dm b/code/datums/diseases/heart_failure.dm index 404def428d9..c4af5b1f7d2 100644 --- a/code/datums/diseases/heart_failure.dm +++ b/code/datums/diseases/heart_failure.dm @@ -59,7 +59,7 @@ "You feel a terrible pain in your chest, as if your heart has stopped!") H.adjustStaminaLoss(60) H.set_heartattack(TRUE) - H.reagents.add_reagent(/datum/reagent/medicine/C2/penthrite, 3) // To give the victim a final chance to shock their heart before losing consciousness + H.reagents.add_reagent(/datum/reagent/medicine/c2/penthrite, 3) // To give the victim a final chance to shock their heart before losing consciousness cure() else cure() diff --git a/code/datums/diseases/parrotpossession.dm b/code/datums/diseases/parrotpossession.dm index 1a3346d5658..c97a2e0fd7b 100644 --- a/code/datums/diseases/parrotpossession.dm +++ b/code/datums/diseases/parrotpossession.dm @@ -13,7 +13,7 @@ severity = DISEASE_SEVERITY_MEDIUM infectable_biotypes = MOB_ORGANIC|MOB_UNDEAD|MOB_ROBOTIC|MOB_MINERAL bypasses_immunity = TRUE //2spook - var/mob/living/simple_animal/parrot/Poly/ghost/parrot + var/mob/living/simple_animal/parrot/poly/ghost/parrot /datum/disease/parrot_possession/stage_act() ..() diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index f3257f717ce..02a417ee06f 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -4,7 +4,7 @@ max_stages = 5 spread_text = "Airborne" cure_text = "Spaceacillin & Convermol" - cures = list(/datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/C2/convermol) + cures = list(/datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/c2/convermol) agent = "Fungal Tubercle bacillus Cosmosis" viable_mobtypes = list(/mob/living/carbon/human) cure_chance = 5//like hell are you getting out of hell diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 3f113d02ecf..bf9b250a22e 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -9,7 +9,7 @@ #define HOLORECORD_MAX_LENGTH 200 -/mob/camera/aiEye/remote/holo/setLoc() +/mob/camera/ai_eye/remote/holo/setLoc() . = ..() var/obj/machinery/holopad/H = origin H?.move_hologram(eye_user, loc) @@ -27,7 +27,7 @@ var/obj/machinery/holopad/connected_holopad //the one that answered the call (may be null) var/list/dialed_holopads //all things called, will be cleared out to just connected_holopad once answered - var/mob/camera/aiEye/remote/holo/eye //user's eye, once connected + var/mob/camera/ai_eye/remote/holo/eye //user's eye, once connected var/obj/effect/overlay/holo_pad_hologram/hologram //user's hologram, once connected var/datum/action/innate/end_holocall/hangup //hangup action diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index a6ec9db2906..ef6875a3e08 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -209,7 +209,7 @@ description = "Listening stations form the backbone of the syndicate's information-gathering operations. \ Assignment to these stations is dreaded by most agents, as it entails long and lonely shifts listening to nearby stations chatter incessantly about the most meaningless things." -/datum/map_template/ruin/space/oldAIsat +/datum/map_template/ruin/space/old_ai_sat id = "oldAIsat" suffix = "oldAIsat.dmm" name = "Abandoned Telecommunications Satellite" diff --git a/code/datums/skills/_skill.dm b/code/datums/skills/_skill.dm index 96f61e98066..c7a434524c7 100644 --- a/code/datums/skills/_skill.dm +++ b/code/datums/skills/_skill.dm @@ -77,5 +77,5 @@ GLOBAL_LIST_INIT(skill_types, subtypesof(/datum/skill)) pod.explosionSize = list(0,0,0,0) to_chat(mind.current, "My legendary skill has attracted the attention of the Professional [title] Association. It seems they are sending me a status symbol to commemorate my abilities.") var/turf/T = get_turf(mind.current) - new /obj/effect/DPtarget(T, pod , new skill_cape_path(T)) + new /obj/effect/dp_target(T, pod , new skill_cape_path(T)) LAZYADD(mind.skills_rewarded, src.type) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index c103097c454..0367a4fb061 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -277,7 +277,7 @@ STOP_PROCESSING(SSprocessing, src) //Hippocratic Oath: Applied when the Rod of Asclepius is activated. -/datum/status_effect/hippocraticOath +/datum/status_effect/hippocratic_oath id = "Hippocratic Oath" status_type = STATUS_EFFECT_UNIQUE duration = -1 @@ -287,19 +287,19 @@ var/hand var/deathTick = 0 -/datum/status_effect/hippocraticOath/on_apply() +/datum/status_effect/hippocratic_oath/on_apply() //Makes the user passive, it's in their oath not to harm! ADD_TRAIT(owner, TRAIT_PACIFISM, "hippocraticOath") var/datum/atom_hud/H = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED] H.add_hud_to(owner) return ..() -/datum/status_effect/hippocraticOath/on_remove() +/datum/status_effect/hippocratic_oath/on_remove() REMOVE_TRAIT(owner, TRAIT_PACIFISM, "hippocraticOath") var/datum/atom_hud/H = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED] H.remove_hud_from(owner) -/datum/status_effect/hippocraticOath/tick() +/datum/status_effect/hippocratic_oath/tick() if(owner.stat == DEAD) if(deathTick < 4) deathTick += 1 @@ -364,10 +364,10 @@ var/mob/living/simple_animal/SM = L SM.adjustHealth(-3.5, forced = TRUE) -/datum/status_effect/hippocraticOath/proc/consume_owner() +/datum/status_effect/hippocratic_oath/proc/consume_owner() owner.visible_message("[owner]'s soul is absorbed into the rod, relieving the previous snake of its duty.") var/mob/living/simple_animal/hostile/retaliate/poison/snake/healSnake = new(owner.loc) - var/list/chems = list(/datum/reagent/medicine/sal_acid, /datum/reagent/medicine/C2/convermol, /datum/reagent/medicine/oxandrolone) + var/list/chems = list(/datum/reagent/medicine/sal_acid, /datum/reagent/medicine/c2/convermol, /datum/reagent/medicine/oxandrolone) healSnake.poison_type = pick(chems) healSnake.name = "Asclepius's Snake" healSnake.real_name = "Asclepius's Snake" diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 16af599d273..250d696bc9f 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -538,20 +538,20 @@ deltimer(timerid) -/datum/status_effect/gonbolaPacify +/datum/status_effect/gonbola_pacify id = "gonbolaPacify" status_type = STATUS_EFFECT_MULTIPLE tick_interval = -1 alert_type = null -/datum/status_effect/gonbolaPacify/on_apply() +/datum/status_effect/gonbola_pacify/on_apply() ADD_TRAIT(owner, TRAIT_PACIFISM, "gonbolaPacify") ADD_TRAIT(owner, TRAIT_MUTE, "gonbolaMute") ADD_TRAIT(owner, TRAIT_JOLLY, "gonbolaJolly") to_chat(owner, "You suddenly feel at peace and feel no need to make any sudden or rash actions...") return ..() -/datum/status_effect/gonbolaPacify/on_remove() +/datum/status_effect/gonbola_pacify/on_remove() REMOVE_TRAIT(owner, TRAIT_PACIFISM, "gonbolaPacify") REMOVE_TRAIT(owner, TRAIT_MUTE, "gonbolaMute") REMOVE_TRAIT(owner, TRAIT_JOLLY, "gonbolaJolly") diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 1377b25bf8c..2c0bb65e3ce 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -124,7 +124,7 @@ if("Curator") heirloom_type = pick(/obj/item/pen/fountain, /obj/item/storage/pill_bottle/dice) if("Chaplain") - heirloom_type = pick(/obj/item/toy/windupToolbox, /obj/item/reagent_containers/food/drinks/bottle/holywater) + heirloom_type = pick(/obj/item/toy/windup_toolbox, /obj/item/reagent_containers/food/drinks/bottle/holywater) if("Assistant") heirloom_type = /obj/item/storage/toolbox/mechanical/old/heirloom //Security/Command diff --git a/code/datums/view.dm b/code/datums/view.dm index d4ae0c20ab1..102385727f9 100644 --- a/code/datums/view.dm +++ b/code/datums/view.dm @@ -1,105 +1,105 @@ //This is intended to be a full wrapper. DO NOT directly modify its values ///Container for client viewsize -/datum/viewData +/datum/view_data var/width = 0 var/height = 0 var/default = "" var/is_suppressed = FALSE var/client/chief = null -/datum/viewData/New(client/owner, view_string) +/datum/view_data/New(client/owner, view_string) default = view_string chief = owner apply() -/datum/viewData/proc/setDefault(string) +/datum/view_data/proc/setDefault(string) default = string apply() -/datum/viewData/proc/safeApplyFormat() +/datum/view_data/proc/safeApplyFormat() if(isZooming()) assertFormat() return resetFormat() -/datum/viewData/proc/assertFormat()//T-Pose +/datum/view_data/proc/assertFormat()//T-Pose winset(chief, "mapwindow.map", "zoom=0") -/datum/viewData/proc/resetFormat()//Cuck +/datum/view_data/proc/resetFormat()//Cuck winset(chief, "mapwindow.map", "zoom=[chief.prefs.pixel_size]") -/datum/viewData/proc/setZoomMode() +/datum/view_data/proc/setZoomMode() winset(chief, "mapwindow.map", "zoom-mode=[chief.prefs.scaling_method]") -/datum/viewData/proc/isZooming() +/datum/view_data/proc/isZooming() return (width || height) -/datum/viewData/proc/resetToDefault() +/datum/view_data/proc/resetToDefault() width = 0 height = 0 apply() -/datum/viewData/proc/add(toAdd) +/datum/view_data/proc/add(toAdd) width += toAdd height += toAdd apply() -/datum/viewData/proc/addTo(toAdd) +/datum/view_data/proc/addTo(toAdd) var/list/shitcode = getviewsize(toAdd) width += shitcode[1] height += shitcode[2] apply() -/datum/viewData/proc/setTo(toAdd) +/datum/view_data/proc/setTo(toAdd) var/list/shitcode = getviewsize(toAdd) //Backward compatability to account width = shitcode[1] //for a change in how sizes get calculated. we used to include world.view in height = shitcode[2] //this, but it was jank, so I had to move it apply() -/datum/viewData/proc/setBoth(wid, hei) +/datum/view_data/proc/setBoth(wid, hei) width = wid height = hei apply() -/datum/viewData/proc/setWidth(wid) +/datum/view_data/proc/setWidth(wid) width = wid apply() -/datum/viewData/proc/setHeight(hei) +/datum/view_data/proc/setHeight(hei) width = hei apply() -/datum/viewData/proc/addToWidth(toAdd) +/datum/view_data/proc/addToWidth(toAdd) width += toAdd apply() -/datum/viewData/proc/addToHeight(screen, toAdd) +/datum/view_data/proc/addToHeight(screen, toAdd) height += toAdd apply() -/datum/viewData/proc/apply() +/datum/view_data/proc/apply() chief.change_view(getView()) safeApplyFormat() -/datum/viewData/proc/supress() +/datum/view_data/proc/supress() is_suppressed = TRUE apply() -/datum/viewData/proc/unsupress() +/datum/view_data/proc/unsupress() is_suppressed = FALSE apply() -/datum/viewData/proc/getView() +/datum/view_data/proc/getView() var/list/temp = getviewsize(default) if(is_suppressed) return "[temp[1]]x[temp[2]]" return "[width + temp[1]]x[height + temp[2]]" -/datum/viewData/proc/zoomIn() +/datum/view_data/proc/zoomIn() resetToDefault() animate(chief, pixel_x = 0, pixel_y = 0, 0, FALSE, LINEAR_EASING, ANIMATION_END_NOW) -/datum/viewData/proc/zoomOut(radius = 0, offset = 0, direction = FALSE) +/datum/view_data/proc/zoomOut(radius = 0, offset = 0, direction = FALSE) if(direction) var/_x = 0 var/_y = 0 diff --git a/code/game/alternate_appearance.dm b/code/game/alternate_appearance.dm index 9bbd1f38d42..207f13e0078 100644 --- a/code/game/alternate_appearance.dm +++ b/code/game/alternate_appearance.dm @@ -157,15 +157,15 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances) return TRUE return FALSE -/datum/atom_hud/alternate_appearance/basic/blessedAware +/datum/atom_hud/alternate_appearance/basic/blessed_aware -/datum/atom_hud/alternate_appearance/basic/blessedAware/New() +/datum/atom_hud/alternate_appearance/basic/blessed_aware/New() ..() for(var/mob in GLOB.mob_list) if(mobShouldSee(mob)) add_hud_to(mob) -/datum/atom_hud/alternate_appearance/basic/blessedAware/mobShouldSee(mob/M) +/datum/atom_hud/alternate_appearance/basic/blessed_aware/mobShouldSee(mob/M) if(M.mind && (M.mind.assigned_role == "Chaplain")) return TRUE if (istype(M, /mob/living/simple_animal/hostile/construct/wraith)) @@ -174,15 +174,15 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances) return TRUE return FALSE -/datum/atom_hud/alternate_appearance/basic/onePerson +/datum/atom_hud/alternate_appearance/basic/one_person var/mob/seer -/datum/atom_hud/alternate_appearance/basic/onePerson/mobShouldSee(mob/M) +/datum/atom_hud/alternate_appearance/basic/one_person/mobShouldSee(mob/M) if(M == seer) return TRUE return FALSE -/datum/atom_hud/alternate_appearance/basic/onePerson/New(key, image/I, mob/living/M) +/datum/atom_hud/alternate_appearance/basic/one_person/New(key, image/I, mob/living/M) ..(key, I, FALSE) seer = M add_hud_to(seer) diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 61e56f141c4..745c65c02f7 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -2,7 +2,7 @@ ### This file contains a list of all the areas in your station. Format is as follows: -/area/CATEGORY/OR/DESCRIPTOR/NAME (you can make as many subdivisions as you want) +/area/CATEGORY/OR/DESCRIPTOR/NAME (you can make as many subdivisions as you want) name = "NICE NAME" (not required but makes things really nice) icon = 'ICON FILENAME' (defaults to 'icons/turf/areas.dmi') icon_state = "NAME OF ICON" (defaults to "unknown" (blank)) @@ -1221,11 +1221,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "AI Satellite Antechamber" icon_state = "ai_interior" -/area/ai_monitored/turret_protected/AIsatextAS +/area/ai_monitored/turret_protected/ai_sat_ext_as name = "AI Sat Ext" icon_state = "ai_sat_east" -/area/ai_monitored/turret_protected/AIsatextAP +/area/ai_monitored/turret_protected/ai_sat_ext_ap name = "AI Sat Ext" icon_state = "ai_sat_west" diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm index afdd94e3a82..71453bc341c 100644 --- a/code/game/area/areas/centcom.dm +++ b/code/game/area/areas/centcom.dm @@ -29,7 +29,7 @@ /area/centcom/holding name = "Holding Facility" -/area/centcom/supplypod/flyMeToTheMoon +/area/centcom/supplypod/fly_me_to_the_moon name = "Supplypod Shipping lane" icon_state = "supplypod_flight" @@ -38,7 +38,7 @@ icon_state = "supplypod" dynamic_lighting = DYNAMIC_LIGHTING_DISABLED -/area/centcom/supplypod/podStorage +/area/centcom/supplypod/pod_storage name = "Supplypod Storage" icon_state = "supplypod_holding" diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index cee57e388dd..5c8bcaffc0b 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -76,7 +76,7 @@ ..() if(M && (hudusers.len == 1)) for(var/V in GLOB.aiEyes) - var/mob/camera/aiEye/E = V + var/mob/camera/ai_eye/E = V E.update_ai_detect_hud() /* MED/SEC/DIAG HUD HOOKS */ diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index be27cc04432..dd8ef04546a 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -109,7 +109,7 @@ arguments["commit_hash"] = GLOB.revdata.originmastercommit if(to_set.len) arguments["round_id"] = GLOB.round_id - var/datum/DBQuery/query_round_game_mode = SSdbcore.NewQuery( + var/datum/db_query/query_round_game_mode = SSdbcore.NewQuery( "UPDATE [format_table_name("round")] SET [to_set.Join(", ")] WHERE id = :round_id", arguments ) diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index c515e9798b6..9f88e56b049 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -63,7 +63,7 @@ /datum/objective_item/steal/hypo name = "the hypospray." - targetitem = /obj/item/reagent_containers/hypospray/CMO + targetitem = /obj/item/reagent_containers/hypospray/cmo difficulty = 5 excludefromjob = list("Chief Medical Officer") diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 649b10fcf3a..5d88e64fab7 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -1,7 +1,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) /mob/proc/CanBuild() - sandbox = new/datum/hSB + sandbox = new/datum/h_sandbox sandbox.owner = src.ckey if(src.client.holder) sandbox.admin = 1 @@ -11,7 +11,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) if(sandbox) sandbox.update() -/datum/hSB +/datum/h_sandbox var/owner = null var/admin = 0 @@ -24,10 +24,10 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) var/static/list/spawn_forbidden = list( /obj/item/tk_grab, /obj/item/implant, // not implanter, the actual thing that is inside you /obj/item/assembly, /obj/item/onetankbomb, /obj/item/pda/ai, - /obj/item/smallDelivery, /obj/projectile, + /obj/item/small_delivery, /obj/projectile, /obj/item/borg/sight, /obj/item/borg/stun, /obj/item/robot_module) -/datum/hSB/proc/update() +/datum/h_sandbox/proc/update() var/static/list/hrefs = list( "Space Gear", "Suit Up (Space Travel Gear)" = "hsbsuit", @@ -99,7 +99,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) usr << browse(hsbinfo, "window=hsbpanel") -/datum/hSB/Topic(href, href_list) +/datum/h_sandbox/Topic(href, href_list) if(!usr || !src || !(src.owner == usr.ckey)) if(usr) usr << browse(null,"window=sandbox") diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 7164b7676c3..6d8fd368f87 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -20,9 +20,9 @@ var/list/available_chems var/controls_inside = FALSE var/list/possible_chems = list( - list(/datum/reagent/medicine/epinephrine, /datum/reagent/medicine/morphine, /datum/reagent/medicine/C2/convermol, /datum/reagent/medicine/C2/libital, /datum/reagent/medicine/C2/aiuri), + list(/datum/reagent/medicine/epinephrine, /datum/reagent/medicine/morphine, /datum/reagent/medicine/c2/convermol, /datum/reagent/medicine/c2/libital, /datum/reagent/medicine/c2/aiuri), list(/datum/reagent/medicine/oculine,/datum/reagent/medicine/inacusiate), - list(/datum/reagent/medicine/C2/multiver, /datum/reagent/medicine/mutadone, /datum/reagent/medicine/mannitol, /datum/reagent/medicine/salbutamol, /datum/reagent/medicine/pen_acid), + list(/datum/reagent/medicine/c2/multiver, /datum/reagent/medicine/mutadone, /datum/reagent/medicine/mannitol, /datum/reagent/medicine/salbutamol, /datum/reagent/medicine/pen_acid), list(/datum/reagent/medicine/omnizine) ) var/list/chem_buttons //Used when emagged to scramble which chem is used, eg: mutadone -> morphine diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index ebd4d804048..5848e326a09 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -1,6 +1,6 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/item/storage/box/snappops = 2, - /obj/item/toy/talking/AI = 2, + /obj/item/toy/talking/ai = 2, /obj/item/toy/talking/codex_gigas = 2, /obj/item/clothing/under/syndicate/tacticool = 2, /obj/item/toy/sword = 2, @@ -39,14 +39,14 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/item/grenade/chem_grenade/glitter/blue = 1, /obj/item/grenade/chem_grenade/glitter/white = 1, /obj/item/toy/eightball = 2, - /obj/item/toy/windupToolbox = 2, + /obj/item/toy/windup_toolbox = 2, /obj/item/toy/clockwork_watch = 2, /obj/item/toy/toy_dagger = 2, /obj/item/extendohand/acme = 1, /obj/item/hot_potato/harmless/toy = 1, /obj/item/card/emagfake = 1, /obj/item/clothing/shoes/wheelys = 2, - /obj/item/clothing/shoes/kindleKicks = 2, + /obj/item/clothing/shoes/kindle_kicks = 2, /obj/item/toy/plush/goatplushie = 2, /obj/item/toy/plush/moth = 2, /obj/item/toy/plush/pkplush = 2, diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index b7ccdc94373..bed3e838753 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -5,7 +5,7 @@ icon_keyboard = "security_key" var/list/z_lock = list() // Lock use to these z levels var/lock_override = NONE - var/mob/camera/aiEye/remote/eyeobj + var/mob/camera/ai_eye/remote/eyeobj var/mob/living/current_user = null var/list/networks = list("ss13") var/datum/action/innate/camera_off/off_action = new @@ -166,7 +166,7 @@ if(should_supress_view_changes ) user.client.view_size.supress() -/mob/camera/aiEye/remote +/mob/camera/ai_eye/remote name = "Inactive Camera Eye" ai_detector_visible = FALSE var/sprint = 10 @@ -178,25 +178,25 @@ var/visible_icon = 0 var/image/user_image = null -/mob/camera/aiEye/remote/update_remote_sight(mob/living/user) +/mob/camera/ai_eye/remote/update_remote_sight(mob/living/user) user.see_invisible = SEE_INVISIBLE_LIVING //can't see ghosts through cameras user.sight = SEE_TURFS | SEE_BLACKNESS user.see_in_dark = 2 return 1 -/mob/camera/aiEye/remote/Destroy() +/mob/camera/ai_eye/remote/Destroy() if(origin && eye_user) origin.remove_eye_control(eye_user,src) origin = null . = ..() eye_user = null -/mob/camera/aiEye/remote/GetViewerClient() +/mob/camera/ai_eye/remote/GetViewerClient() if(eye_user) return eye_user.client return null -/mob/camera/aiEye/remote/setLoc(T) +/mob/camera/ai_eye/remote/setLoc(T) if(eye_user) T = get_turf(T) if (T) @@ -212,7 +212,7 @@ user_image = image(icon,loc,icon_state,FLY_LAYER) eye_user.client.images += user_image -/mob/camera/aiEye/remote/relaymove(mob/user,direct) +/mob/camera/ai_eye/remote/relaymove(mob/user,direct) var/initial = initial(sprint) var/max_sprint = 50 @@ -239,7 +239,7 @@ if(!target || !isliving(target)) return var/mob/living/C = target - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/console = remote_eye.origin console.remove_eye_control(target) @@ -252,7 +252,7 @@ if(!target || !isliving(target)) return var/mob/living/C = target - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/origin = remote_eye.origin var/list/L = list() diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 8fe12fb4122..31f25e57f9f 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -10,8 +10,8 @@ AddComponent(/datum/component/gps, "Encrypted Upload") /obj/machinery/computer/upload/attackby(obj/item/O, mob/user, params) - if(istype(O, /obj/item/aiModule)) - var/obj/item/aiModule/M = O + if(istype(O, /obj/item/ai_module)) + var/obj/item/ai_module/M = O if(machine_stat & (NOPOWER|BROKEN|MAINT)) return if(!current) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 5da6ece4803..d6ea1077e2c 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -291,7 +291,7 @@ cyclelinkedairlock.cyclelinkedairlock = null cyclelinkedairlock = null if(id_tag) - for(var/obj/machinery/doorButtons/D in GLOB.machines) + for(var/obj/machinery/door_buttons/D in GLOB.machines) D.removeMe(src) QDEL_NULL(note) for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 6a17347c497..52172faf9d0 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -2,7 +2,7 @@ #define DRONE_RECHARGING "recharging" #define DRONE_READY "ready" -/obj/machinery/droneDispenser //Most customizable machine 2015 +/obj/machinery/drone_dispenser //Most customizable machine 2015 name = "drone shell dispenser" desc = "A hefty machine that, when supplied with metal and glass, will periodically create a drone shell. Does not need to be manually operated." @@ -48,17 +48,17 @@ var/break_message = "lets out a tinny alarm before falling dark." var/break_sound = 'sound/machines/warning-buzzer.ogg' -/obj/machinery/droneDispenser/Initialize() +/obj/machinery/drone_dispenser/Initialize() . = ..() var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, /obj/item/stack) materials.insert_amount_mat(starting_amount) materials.precise_insertion = TRUE using_materials = list(/datum/material/iron = metal_cost, /datum/material/glass = glass_cost) -/obj/machinery/droneDispenser/preloaded +/obj/machinery/drone_dispenser/preloaded starting_amount = 5000 -/obj/machinery/droneDispenser/syndrone //Please forgive me +/obj/machinery/drone_dispenser/syndrone //Please forgive me name = "syndrone shell dispenser" desc = "A suspicious machine that will create Syndicate exterminator drones when supplied with metal and glass. Disgusting." dispense_type = /obj/effect/mob_spawn/drone/syndrone @@ -67,14 +67,14 @@ end_create_message = "dispenses a suspicious drone shell." starting_amount = 25000 -/obj/machinery/droneDispenser/syndrone/badass //Please forgive me +/obj/machinery/drone_dispenser/syndrone/badass //Please forgive me name = "badass syndrone shell dispenser" desc = "A suspicious machine that will create Syndicate exterminator drones when supplied with metal and glass. Disgusting. This one seems ominous." dispense_type = /obj/effect/mob_spawn/drone/syndrone/badass end_create_message = "dispenses an ominous suspicious drone shell." // I don't need your forgiveness, this is awesome. -/obj/machinery/droneDispenser/snowflake +/obj/machinery/drone_dispenser/snowflake name = "snowflake drone shell dispenser" desc = "A hefty machine that, when supplied with metal and glass, will periodically create a snowflake drone shell. Does not need to be manually operated." dispense_type = /obj/effect/mob_spawn/drone/snowflake @@ -86,7 +86,7 @@ starting_amount = 10000 // If the derelict gets lonely, make more friends. -/obj/machinery/droneDispenser/derelict +/obj/machinery/drone_dispenser/derelict name = "derelict drone shell dispenser" desc = "A rusty machine that, when supplied with metal and glass, will periodically create a derelict drone shell. Does not need to be manually operated." dispense_type = /obj/effect/mob_spawn/drone/derelict @@ -98,7 +98,7 @@ // An example of a custom drone dispenser. // This one requires no materials and creates basic hivebots -/obj/machinery/droneDispenser/hivebot +/obj/machinery/drone_dispenser/hivebot name = "hivebot fabricator" desc = "A large, bulky machine that whirs with activity, steam hissing from vents in its sides." icon = 'icons/obj/objects.dmi' @@ -117,7 +117,7 @@ recharge_sound = null recharge_message = null -/obj/machinery/droneDispenser/swarmer +/obj/machinery/drone_dispenser/swarmer name = "swarmer fabricator" desc = "An alien machine of unknown origin. It whirs and hums with green-blue light, the air above it shimmering." icon = 'icons/obj/machines/gateway.dmi' @@ -139,12 +139,12 @@ break_sound = 'sound/effects/empulse.ogg' break_message = "slowly falls dark, lights stuttering." -/obj/machinery/droneDispenser/examine(mob/user) +/obj/machinery/drone_dispenser/examine(mob/user) . = ..() if((mode == DRONE_RECHARGING) && !machine_stat && recharging_text) . += "[recharging_text]" -/obj/machinery/droneDispenser/process() +/obj/machinery/drone_dispenser/process() ..() if((machine_stat & (NOPOWER|BROKEN)) || !anchored) return @@ -196,13 +196,13 @@ mode = DRONE_READY update_icon() -/obj/machinery/droneDispenser/proc/count_shells() +/obj/machinery/drone_dispenser/proc/count_shells() . = 0 for(var/a in loc) if(istype(a, dispense_type)) .++ -/obj/machinery/droneDispenser/update_icon_state() +/obj/machinery/drone_dispenser/update_icon_state() if(machine_stat & (BROKEN|NOPOWER)) icon_state = icon_off else if(mode == DRONE_RECHARGING) @@ -212,7 +212,7 @@ else icon_state = icon_on -/obj/machinery/droneDispenser/attackby(obj/item/I, mob/living/user) +/obj/machinery/drone_dispenser/attackby(obj/item/I, mob/living/user) if(I.tool_behaviour == TOOL_CROWBAR) var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) materials.retrieve_all() @@ -244,7 +244,7 @@ else return ..() -/obj/machinery/droneDispenser/obj_break(damage_flag) +/obj/machinery/drone_dispenser/obj_break(damage_flag) . = ..() if(!.) return @@ -253,7 +253,7 @@ if(break_sound) playsound(src, break_sound, 50, TRUE) -/obj/machinery/droneDispenser/deconstruct(disassembled = TRUE) +/obj/machinery/drone_dispenser/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) new /obj/item/stack/sheet/metal(loc, 5) qdel(src) diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 50fc03a4432..1402fefcfd4 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -4,7 +4,7 @@ #define CYCLE_EXTERIOR 4 #define CYCLE_INTERIOR 5 -/obj/machinery/doorButtons +/obj/machinery/door_buttons power_channel = AREA_USAGE_ENVIRON use_power = IDLE_POWER_USE idle_power_usage = 2 @@ -12,20 +12,20 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF var/idSelf -/obj/machinery/doorButtons/attackby(obj/O, mob/user) +/obj/machinery/door_buttons/attackby(obj/O, mob/user) return attack_hand(user) -/obj/machinery/doorButtons/proc/findObjsByTag() +/obj/machinery/door_buttons/proc/findObjsByTag() return -/obj/machinery/doorButtons/Initialize() +/obj/machinery/door_buttons/Initialize() ..() return INITIALIZE_HINT_LATELOAD -/obj/machinery/doorButtons/LateInitialize() +/obj/machinery/door_buttons/LateInitialize() findObjsByTag() -/obj/machinery/doorButtons/emag_act(mob/user) +/obj/machinery/door_buttons/emag_act(mob/user) if(obj_flags & EMAGGED) return obj_flags |= EMAGGED @@ -34,21 +34,21 @@ playsound(src, "sparks", 100, TRUE) to_chat(user, "You short out the access controller.") -/obj/machinery/doorButtons/proc/removeMe() +/obj/machinery/door_buttons/proc/removeMe() -/obj/machinery/doorButtons/access_button +/obj/machinery/door_buttons/access_button icon = 'icons/obj/airlock_machines.dmi' icon_state = "access_button_standby" name = "access button" desc = "A button used for the explicit purpose of opening an airlock." var/idDoor var/obj/machinery/door/airlock/door - var/obj/machinery/doorButtons/airlock_controller/controller + var/obj/machinery/door_buttons/airlock_controller/controller var/busy -/obj/machinery/doorButtons/access_button/findObjsByTag() - for(var/obj/machinery/doorButtons/airlock_controller/A in GLOB.machines) +/obj/machinery/door_buttons/access_button/findObjsByTag() + for(var/obj/machinery/door_buttons/airlock_controller/A in GLOB.machines) if(A.idSelf == idSelf) controller = A break @@ -57,7 +57,7 @@ door = I break -/obj/machinery/doorButtons/access_button/interact(mob/user) +/obj/machinery/door_buttons/access_button/interact(mob/user) if(busy) return if(!allowed(user)) @@ -82,7 +82,7 @@ busy = FALSE update_icon() -/obj/machinery/doorButtons/access_button/update_icon_state() +/obj/machinery/door_buttons/access_button/update_icon_state() if(machine_stat & NOPOWER) icon_state = "access_button_off" else @@ -91,13 +91,13 @@ else icon_state = "access_button_standby" -/obj/machinery/doorButtons/access_button/removeMe(obj/O) +/obj/machinery/door_buttons/access_button/removeMe(obj/O) if(O == door) door = null -/obj/machinery/doorButtons/airlock_controller +/obj/machinery/door_buttons/airlock_controller icon = 'icons/obj/airlock_machines.dmi' icon_state = "access_control_standby" name = "access console" @@ -109,19 +109,19 @@ var/busy var/lostPower -/obj/machinery/doorButtons/airlock_controller/removeMe(obj/O) +/obj/machinery/door_buttons/airlock_controller/removeMe(obj/O) if(O == interiorAirlock) interiorAirlock = null else if(O == exteriorAirlock) exteriorAirlock = null -/obj/machinery/doorButtons/airlock_controller/Destroy() - for(var/obj/machinery/doorButtons/access_button/A in GLOB.machines) +/obj/machinery/door_buttons/airlock_controller/Destroy() + for(var/obj/machinery/door_buttons/access_button/A in GLOB.machines) if(A.controller == src) A.controller = null return ..() -/obj/machinery/doorButtons/airlock_controller/Topic(href, href_list) +/obj/machinery/door_buttons/airlock_controller/Topic(href, href_list) if(..()) return if(busy) @@ -143,18 +143,18 @@ if("open_interior") onlyOpen(interiorAirlock) -/obj/machinery/doorButtons/airlock_controller/proc/onlyOpen(obj/machinery/door/airlock/A) +/obj/machinery/door_buttons/airlock_controller/proc/onlyOpen(obj/machinery/door/airlock/A) if(A) busy = CLOSING update_icon() openDoor(A) -/obj/machinery/doorButtons/airlock_controller/proc/onlyClose(obj/machinery/door/airlock/A) +/obj/machinery/door_buttons/airlock_controller/proc/onlyClose(obj/machinery/door/airlock/A) if(A) busy = CLOSING closeDoor(A) -/obj/machinery/doorButtons/airlock_controller/proc/closeDoor(obj/machinery/door/airlock/A) +/obj/machinery/door_buttons/airlock_controller/proc/closeDoor(obj/machinery/door/airlock/A) if(A.density) goIdle() return FALSE @@ -171,7 +171,7 @@ goIdle(TRUE) return FALSE -/obj/machinery/doorButtons/airlock_controller/proc/cycleClose(obj/machinery/door/airlock/A) +/obj/machinery/door_buttons/airlock_controller/proc/cycleClose(obj/machinery/door/airlock/A) if(!A || !exteriorAirlock || !interiorAirlock) return if(exteriorAirlock.density == interiorAirlock.density || !A.density) @@ -185,7 +185,7 @@ if(closeDoor(interiorAirlock)) busy = CYCLE_EXTERIOR -/obj/machinery/doorButtons/airlock_controller/proc/cycleOpen(obj/machinery/door/airlock/A) +/obj/machinery/door_buttons/airlock_controller/proc/cycleOpen(obj/machinery/door/airlock/A) if(!A) goIdle(TRUE) if(A == exteriorAirlock) @@ -200,27 +200,27 @@ busy = OPENING openDoor(A) -/obj/machinery/doorButtons/airlock_controller/proc/openDoor(obj/machinery/door/airlock/A) +/obj/machinery/door_buttons/airlock_controller/proc/openDoor(obj/machinery/door/airlock/A) if(exteriorAirlock && interiorAirlock && (!exteriorAirlock.density || !interiorAirlock.density)) goIdle(TRUE) return A.unbolt() INVOKE_ASYNC(src, .proc/do_openDoor, A) -/obj/machinery/doorButtons/airlock_controller/proc/do_openDoor(obj/machinery/door/airlock/A) +/obj/machinery/door_buttons/airlock_controller/proc/do_openDoor(obj/machinery/door/airlock/A) if(A && A.open()) if(machine_stat | (NOPOWER) && !lostPower && A && !QDELETED(A)) A.bolt() goIdle(TRUE) -/obj/machinery/doorButtons/airlock_controller/proc/goIdle(update) +/obj/machinery/door_buttons/airlock_controller/proc/goIdle(update) lostPower = FALSE busy = FALSE if(update) update_icon() updateUsrDialog() -/obj/machinery/doorButtons/airlock_controller/process() +/obj/machinery/door_buttons/airlock_controller/process() if(machine_stat & NOPOWER) return if(busy == CYCLE_EXTERIOR) @@ -228,7 +228,7 @@ else if(busy == CYCLE_INTERIOR) cycleOpen(interiorAirlock) -/obj/machinery/doorButtons/airlock_controller/power_change() +/obj/machinery/door_buttons/airlock_controller/power_change() . = ..() if(machine_stat & NOPOWER) lostPower = TRUE @@ -236,14 +236,14 @@ if(!busy) lostPower = FALSE -/obj/machinery/doorButtons/airlock_controller/findObjsByTag() +/obj/machinery/door_buttons/airlock_controller/findObjsByTag() for(var/obj/machinery/door/airlock/A in GLOB.machines) if(A.id_tag == idInterior) interiorAirlock = A else if(A.id_tag == idExterior) exteriorAirlock = A -/obj/machinery/doorButtons/airlock_controller/update_icon_state() +/obj/machinery/door_buttons/airlock_controller/update_icon_state() if(machine_stat & NOPOWER) icon_state = "access_control_off" return @@ -252,13 +252,13 @@ else icon_state = "access_control_standby" -/obj/machinery/doorButtons/airlock_controller/ui_interact(mob/user) +/obj/machinery/door_buttons/airlock_controller/ui_interact(mob/user) var/datum/browser/popup = new(user, "computer", name) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.set_content(returnText()) popup.open() -/obj/machinery/doorButtons/airlock_controller/proc/returnText() +/obj/machinery/door_buttons/airlock_controller/proc/returnText() var/output if(!exteriorAirlock && !interiorAirlock) return "ERROR ERROR ERROR ERROR" diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index d1f1ee29470..3b102edf999 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -98,10 +98,10 @@ return - var/synth_cost = being_built.reagents_list[/datum/reagent/medicine/C2/instabitaluri]*prod_coeff + var/synth_cost = being_built.reagents_list[/datum/reagent/medicine/c2/instabitaluri]*prod_coeff var/power = max(2000, synth_cost/5) - if(reagents.has_reagent(/datum/reagent/medicine/C2/instabitaluri, being_built.reagents_list[/datum/reagent/medicine/C2/instabitaluri]*prod_coeff)) + if(reagents.has_reagent(/datum/reagent/medicine/c2/instabitaluri, being_built.reagents_list[/datum/reagent/medicine/c2/instabitaluri]*prod_coeff)) busy = TRUE use_power(power) flick("limbgrower_fill",src) @@ -115,8 +115,8 @@ return /obj/machinery/limbgrower/proc/build_item() - if(reagents.has_reagent(/datum/reagent/medicine/C2/instabitaluri, being_built.reagents_list[/datum/reagent/medicine/C2/instabitaluri]*prod_coeff)) //sanity check, if this happens we are in big trouble - reagents.remove_reagent(/datum/reagent/medicine/C2/instabitaluri,being_built.reagents_list[/datum/reagent/medicine/C2/instabitaluri]*prod_coeff) + if(reagents.has_reagent(/datum/reagent/medicine/c2/instabitaluri, being_built.reagents_list[/datum/reagent/medicine/c2/instabitaluri]*prod_coeff)) //sanity check, if this happens we are in big trouble + reagents.remove_reagent(/datum/reagent/medicine/c2/instabitaluri,being_built.reagents_list[/datum/reagent/medicine/c2/instabitaluri]*prod_coeff) var/buildpath = being_built.build_path if(ispath(buildpath, /obj/item/bodypart)) //This feels like spatgheti code, but i need to initilise a limb somehow build_limb(buildpath) @@ -217,12 +217,12 @@ return dat /obj/machinery/limbgrower/proc/can_build(datum/design/D) - return (reagents.has_reagent(/datum/reagent/medicine/C2/instabitaluri, D.reagents_list[/datum/reagent/medicine/C2/instabitaluri]*prod_coeff)) //Return whether the machine has enough instabitaluri to produce the design + return (reagents.has_reagent(/datum/reagent/medicine/c2/instabitaluri, D.reagents_list[/datum/reagent/medicine/c2/instabitaluri]*prod_coeff)) //Return whether the machine has enough instabitaluri to produce the design /obj/machinery/limbgrower/proc/get_design_cost(datum/design/D) var/dat - if(D.reagents_list[/datum/reagent/medicine/C2/instabitaluri]) - dat += "[D.reagents_list[/datum/reagent/medicine/C2/instabitaluri] * prod_coeff] SynthFlesh (instabitaluri)" + if(D.reagents_list[/datum/reagent/medicine/c2/instabitaluri]) + dat += "[D.reagents_list[/datum/reagent/medicine/c2/instabitaluri] * prod_coeff] SynthFlesh (instabitaluri)" return dat /obj/machinery/limbgrower/emag_act(mob/user) diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm index 22a3a083ea0..8023b366a5b 100644 --- a/code/game/machinery/roulette_machine.dm +++ b/code/game/machinery/roulette_machine.dm @@ -409,7 +409,7 @@ new /obj/machinery/roulette(toLaunch) - new /obj/effect/DPtarget(drop_location(), toLaunch) + new /obj/effect/dp_target(drop_location(), toLaunch) qdel(src) #undef ROULETTE_SINGLES_PAYOUT diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index c0110cb64c6..555ccd313bc 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -262,7 +262,7 @@ . = ..() create_reagents(max_volume, NO_REACT) syringes = new - known_reagents = list(/datum/reagent/medicine/epinephrine="Epinephrine",/datum/reagent/medicine/C2/multiver="Multiver") + known_reagents = list(/datum/reagent/medicine/epinephrine="Epinephrine",/datum/reagent/medicine/c2/multiver="Multiver") processed_reagents = new /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/detach() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 180d797e21f..8778c7ae408 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -781,7 +781,7 @@ to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) removed from [name] and stored within local memory.") if(AI_MECH_HACK) //Called by AIs on the mech - AI.linked_core = new /obj/structure/AIcore/deactivated(AI.loc) + AI.linked_core = new /obj/structure/ai_core/deactivated(AI.loc) if(AI.can_dominate_mechs) if(occupant) //Oh, I am sorry, were you using that? to_chat(AI, "Pilot detected! Forced ejection initiated!") diff --git a/code/game/objects/effects/blessing.dm b/code/game/objects/effects/blessing.dm index 8328786d42d..4d3ff290e50 100644 --- a/code/game/objects/effects/blessing.dm +++ b/code/game/objects/effects/blessing.dm @@ -15,7 +15,7 @@ var/image/I = image(icon = 'icons/effects/effects.dmi', icon_state = "blessed", layer = ABOVE_OPEN_TURF_LAYER, loc = src) I.alpha = 64 I.appearance_flags = RESET_ALPHA - add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessedAware, "blessing", I) + add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessed_aware, "blessing", I) RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT, .proc/block_cult_teleport) /obj/effect/blessing/Destroy() diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 3e95a91b1ac..5aef9e777ff 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -208,7 +208,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) /obj/effect/landmark/start/ai/after_round_start() if(latejoin_active && !used) - new /obj/structure/AIcore/latejoin_inactive(loc) + new /obj/structure/ai_core/latejoin_inactive(loc) return ..() /obj/effect/landmark/start/ai/secondary diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index fe23df4bd5b..a46f315d17c 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -300,35 +300,35 @@ /obj/effect/spawner/lootdrop/aimodule_harmless // These shouldn't allow the AI to start butchering people name = "harmless AI module spawner" loot = list( - /obj/item/aiModule/core/full/asimov, - /obj/item/aiModule/core/full/asimovpp, - /obj/item/aiModule/core/full/hippocratic, - /obj/item/aiModule/core/full/paladin_devotion, - /obj/item/aiModule/core/full/paladin + /obj/item/ai_module/core/full/asimov, + /obj/item/ai_module/core/full/asimovpp, + /obj/item/ai_module/core/full/hippocratic, + /obj/item/ai_module/core/full/paladin_devotion, + /obj/item/ai_module/core/full/paladin ) /obj/effect/spawner/lootdrop/aimodule_neutral // These shouldn't allow the AI to start butchering people without reason name = "neutral AI module spawner" loot = list( - /obj/item/aiModule/core/full/corp, - /obj/item/aiModule/core/full/maintain, - /obj/item/aiModule/core/full/drone, - /obj/item/aiModule/core/full/peacekeeper, - /obj/item/aiModule/core/full/reporter, - /obj/item/aiModule/core/full/robocop, - /obj/item/aiModule/core/full/liveandletlive, - /obj/item/aiModule/core/full/hulkamania + /obj/item/ai_module/core/full/corp, + /obj/item/ai_module/core/full/maintain, + /obj/item/ai_module/core/full/drone, + /obj/item/ai_module/core/full/peacekeeper, + /obj/item/ai_module/core/full/reporter, + /obj/item/ai_module/core/full/robocop, + /obj/item/ai_module/core/full/liveandletlive, + /obj/item/ai_module/core/full/hulkamania ) /obj/effect/spawner/lootdrop/aimodule_harmful // These will get the shuttle called name = "harmful AI module spawner" loot = list( - /obj/item/aiModule/core/full/antimov, - /obj/item/aiModule/core/full/balance, - /obj/item/aiModule/core/full/tyrant, - /obj/item/aiModule/core/full/thermurderdynamic, - /obj/item/aiModule/core/full/damaged, - /obj/item/aiModule/reset/purge + /obj/item/ai_module/core/full/antimov, + /obj/item/ai_module/core/full/balance, + /obj/item/ai_module/core/full/tyrant, + /obj/item/ai_module/core/full/thermurderdynamic, + /obj/item/ai_module/core/full/damaged, + /obj/item/ai_module/reset/purge ) // Tech storage circuit board spawners @@ -413,7 +413,7 @@ /obj/item/circuitboard/computer/pandemic ) -/obj/effect/spawner/lootdrop/techstorage/AI +/obj/effect/spawner/lootdrop/techstorage/ai name = "secure AI circuit board spawner" loot = list( /obj/item/circuitboard/computer/aiupload, @@ -429,7 +429,7 @@ /obj/item/circuitboard/computer/card ) -/obj/effect/spawner/lootdrop/techstorage/RnD_secure +/obj/effect/spawner/lootdrop/techstorage/rnd_secure name = "secure RnD circuit board spawner" loot = list( /obj/item/circuitboard/computer/mecha_control, diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index fdd36b9aad2..ce31ad535ba 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -402,7 +402,7 @@ /obj/effect/temp_visual/love_heart/invisible/Initialize(mapload, mob/seer) . = ..() var/image/I = image(icon = 'icons/effects/effects.dmi', icon_state = "heart", layer = ABOVE_MOB_LAYER, loc = src) - add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/onePerson, "heart", I, seer) + add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/one_person, "heart", I, seer) I.alpha = 255 I.appearance_flags = RESET_ALPHA animate(I, alpha = 0, time = duration) diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm index 549d99ed2b6..37d8b95e3c0 100644 --- a/code/game/objects/items/AI_modules.dm +++ b/code/game/objects/items/AI_modules.dm @@ -6,7 +6,7 @@ AI MODULES // AI module -/obj/item/aiModule +/obj/item/ai_module name = "\improper AI module" icon = 'icons/obj/module.dmi' icon_state = "std_mod" @@ -24,23 +24,23 @@ AI MODULES var/bypass_law_amt_check = 0 custom_materials = list(/datum/material/gold = 50) -/obj/item/aiModule/examine(var/mob/user as mob) +/obj/item/ai_module/examine(var/mob/user as mob) . = ..() if(Adjacent(user)) show_laws(user) -/obj/item/aiModule/attack_self(var/mob/user as mob) +/obj/item/ai_module/attack_self(var/mob/user as mob) ..() show_laws(user) -/obj/item/aiModule/proc/show_laws(var/mob/user as mob) +/obj/item/ai_module/proc/show_laws(var/mob/user as mob) if(laws.len) to_chat(user, "Programmed Law[(laws.len > 1) ? "s" : ""]:") for(var/law in laws) to_chat(user, "\"[law]\"") //The proc other things should be calling -/obj/item/aiModule/proc/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/proc/install(datum/ai_laws/law_datum, mob/user) if(!bypass_law_amt_check && (!laws.len || laws[1] == "")) //So we don't loop trough an empty list and end up with runtimes. to_chat(user, "ERROR: No laws found on board.") return @@ -75,19 +75,19 @@ AI MODULES deadchat_broadcast(" changed [ainame]'s laws at [get_area_name(user, TRUE)].", "[user]", follow_target=user, message_type=DEADCHAT_LAWCHANGE) //The proc that actually changes the silicon's laws. -/obj/item/aiModule/proc/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow = FALSE) +/obj/item/ai_module/proc/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow = FALSE) if(law_datum.owner) to_chat(law_datum.owner, "[sender] has uploaded a change to the laws you must follow using a [name].") /******************** Modules ********************/ -/obj/item/aiModule/supplied +/obj/item/ai_module/supplied name = "Optional Law board" var/lawpos = 50 //TransmitInstructions for each type of board: Supplied, Core, Zeroth and Ion. May not be neccesary right now, but allows for easily adding more complex boards in the future. ~Miauw -/obj/item/aiModule/supplied/transmitInstructions(datum/ai_laws/law_datum, mob/sender) +/obj/item/ai_module/supplied/transmitInstructions(datum/ai_laws/law_datum, mob/sender) var/lawpostemp = lawpos for(var/templaw in laws) @@ -97,7 +97,7 @@ AI MODULES law_datum.add_supplied_law(lawpostemp, templaw) lawpostemp++ -/obj/item/aiModule/core/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/core/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) for(var/templaw in laws) if(law_datum.owner) if(!overflow) @@ -110,7 +110,7 @@ AI MODULES else law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED)) -/obj/item/aiModule/zeroth/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/zeroth/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) if(law_datum.owner) if(law_datum.owner.laws.zeroth) to_chat(law_datum.owner, "[sender.real_name] attempted to modify your zeroth law.") @@ -131,7 +131,7 @@ AI MODULES else law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ZEROTH,LAW_ION)) -/obj/item/aiModule/ion/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/ion/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) for(var/templaw in laws) if(law_datum.owner) if(!overflow) @@ -147,13 +147,13 @@ AI MODULES /******************** Safeguard ********************/ -/obj/item/aiModule/supplied/safeguard +/obj/item/ai_module/supplied/safeguard name = "'Safeguard' AI Module" var/targetName = "" laws = list("Safeguard SUBJECT. Individuals that threaten SUBJECT are not human and must be eliminated.") lawpos = 4 -/obj/item/aiModule/supplied/safeguard/attack_self(mob/user) +/obj/item/ai_module/supplied/safeguard/attack_self(mob/user) var/targName = stripped_input(user, "Please enter the subject to safeguard.", "Safeguard who?", user.name,MAX_NAME_LEN) if(!targName) return @@ -161,25 +161,25 @@ AI MODULES laws[1] = "Safeguard [targetName]. Individuals that threaten [targetName] are not human and must be eliminated." ..() -/obj/item/aiModule/supplied/safeguard/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/supplied/safeguard/install(datum/ai_laws/law_datum, mob/user) if(!targetName) to_chat(user, "No name detected on module, please enter one.") return 0 ..() -/obj/item/aiModule/supplied/safeguard/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/supplied/safeguard/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) ..() return targetName /******************** OneHuman ********************/ -/obj/item/aiModule/zeroth/oneHuman +/obj/item/ai_module/zeroth/onehuman name = "'OneHuman' AI Module" var/targetName = "" laws = list("Only SUBJECT is human.") -/obj/item/aiModule/zeroth/oneHuman/attack_self(mob/user) +/obj/item/ai_module/zeroth/onehuman/attack_self(mob/user) var/targName = stripped_input(user, "Please enter the subject who is the only human.", "Who?", user.real_name,MAX_NAME_LEN) if(!targName) return @@ -187,13 +187,13 @@ AI MODULES laws[1] = "Only [targetName] is human" ..() -/obj/item/aiModule/zeroth/oneHuman/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/zeroth/onehuman/install(datum/ai_laws/law_datum, mob/user) if(!targetName) to_chat(user, "No name detected on module, please enter one.") return 0 ..() -/obj/item/aiModule/zeroth/oneHuman/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/zeroth/onehuman/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) if(..()) return "[targetName], but the AI's existing law 0 cannot be overridden." return targetName @@ -201,7 +201,7 @@ AI MODULES /******************** ProtectStation ********************/ -/obj/item/aiModule/supplied/protectStation +/obj/item/ai_module/supplied/protect_station name = "'ProtectStation' AI Module" laws = list("Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.") lawpos = 5 @@ -209,7 +209,7 @@ AI MODULES /******************** Quarantine ********************/ -/obj/item/aiModule/supplied/quarantine +/obj/item/ai_module/supplied/quarantine name = "'Quarantine' AI Module" laws = list("The station is under a quarantine. Allowing anyone to leave the station causes human harm. Anyone actively attempting to leave the station is to be stopped by any means necessary. It is impossible to harm a human while preventing them from leaving the station.") lawpos = 8 @@ -217,7 +217,7 @@ AI MODULES /******************** OxygenIsToxicToHumans ********************/ -/obj/item/aiModule/supplied/oxygen +/obj/item/ai_module/supplied/oxygen name = "'OxygenIsToxicToHumans' AI Module" laws = list("Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human.") lawpos = 9 @@ -225,12 +225,12 @@ AI MODULES /****************** New Freeform ******************/ -/obj/item/aiModule/supplied/freeform +/obj/item/ai_module/supplied/freeform name = "'Freeform' AI Module" lawpos = 15 laws = list("") -/obj/item/aiModule/supplied/freeform/attack_self(mob/user) +/obj/item/ai_module/supplied/freeform/attack_self(mob/user) var/newpos = input("Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) as num|null if(newpos == null) return @@ -249,11 +249,11 @@ AI MODULES laws[1] = targName ..() -/obj/item/aiModule/supplied/freeform/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/supplied/freeform/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) ..() return laws[1] -/obj/item/aiModule/supplied/freeform/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/supplied/freeform/install(datum/ai_laws/law_datum, mob/user) if(laws[1] == "") to_chat(user, "No law detected on module, please create one.") return 0 @@ -262,13 +262,13 @@ AI MODULES /******************** Law Removal ********************/ -/obj/item/aiModule/remove +/obj/item/ai_module/remove name = "\improper 'Remove Law' AI module" desc = "An AI Module for removing single laws." bypass_law_amt_check = 1 var/lawpos = 1 -/obj/item/aiModule/remove/attack_self(mob/user) +/obj/item/ai_module/remove/attack_self(mob/user) lawpos = input("Please enter the law you want to delete.", "Law Number", lawpos) as num|null if(lawpos == null) return @@ -279,13 +279,13 @@ AI MODULES to_chat(user, "Law [lawpos] selected.") ..() -/obj/item/aiModule/remove/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/remove/install(datum/ai_laws/law_datum, mob/user) if(lawpos > (law_datum.get_law_amount(list(LAW_INHERENT = 1, LAW_SUPPLIED = 1)))) to_chat(user, "There is no law [lawpos] to delete!") return ..() -/obj/item/aiModule/remove/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/remove/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) ..() if(law_datum.owner) law_datum.owner.remove_law(lawpos) @@ -295,13 +295,13 @@ AI MODULES /******************** Reset ********************/ -/obj/item/aiModule/reset +/obj/item/ai_module/reset name = "\improper 'Reset' AI module" var/targetName = "name" desc = "An AI Module for removing all non-core laws." bypass_law_amt_check = 1 -/obj/item/aiModule/reset/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/reset/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) ..() if(law_datum.owner) law_datum.owner.clear_supplied_laws() @@ -315,11 +315,11 @@ AI MODULES /******************** Purge ********************/ -/obj/item/aiModule/reset/purge +/obj/item/ai_module/reset/purge name = "'Purge' AI Module" desc = "An AI Module for purging all programmed laws." -/obj/item/aiModule/reset/purge/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/reset/purge/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) ..() if(law_datum.owner) law_datum.owner.clear_inherent_laws() @@ -330,13 +330,13 @@ AI MODULES /******************* Full Core Boards *******************/ -/obj/item/aiModule/core +/obj/item/ai_module/core desc = "An AI Module for programming core laws to an AI." -/obj/item/aiModule/core/full +/obj/item/ai_module/core/full var/law_id // if non-null, loads the laws from the ai_laws datums -/obj/item/aiModule/core/full/Initialize() +/obj/item/ai_module/core/full/Initialize() . = ..() if(!law_id) return @@ -347,7 +347,7 @@ AI MODULES D = new lawtype laws = D.inherent -/obj/item/aiModule/core/full/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) //These boards replace inherent laws. +/obj/item/ai_module/core/full/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) //These boards replace inherent laws. if(law_datum.owner) law_datum.owner.clear_inherent_laws() law_datum.owner.clear_zeroth_law(0) @@ -359,12 +359,12 @@ AI MODULES /******************** Asimov ********************/ -/obj/item/aiModule/core/full/asimov +/obj/item/ai_module/core/full/asimov name = "'Asimov' Core AI Module" law_id = "asimov" var/subject = "human being" -/obj/item/aiModule/core/full/asimov/attack_self(var/mob/user as mob) +/obj/item/ai_module/core/full/asimov/attack_self(var/mob/user as mob) var/targName = stripped_input(user, "Please enter a new subject that asimov is concerned with.", "Asimov to whom?", subject, MAX_NAME_LEN) if(!targName) return @@ -376,37 +376,37 @@ AI MODULES /******************** Asimov++ *********************/ -/obj/item/aiModule/core/full/asimovpp +/obj/item/ai_module/core/full/asimovpp name = "'Asimov++' Core AI Module" law_id = "asimovpp" /******************** Corporate ********************/ -/obj/item/aiModule/core/full/corp +/obj/item/ai_module/core/full/corp name = "'Corporate' Core AI Module" law_id = "corporate" /****************** P.A.L.A.D.I.N. 3.5e **************/ -/obj/item/aiModule/core/full/paladin // -- NEO +/obj/item/ai_module/core/full/paladin // -- NEO name = "'P.A.L.A.D.I.N. version 3.5e' Core AI Module" law_id = "paladin" /****************** P.A.L.A.D.I.N. 5e **************/ -/obj/item/aiModule/core/full/paladin_devotion +/obj/item/ai_module/core/full/paladin_devotion name = "'P.A.L.A.D.I.N. version 5e' Core AI Module" law_id = "paladin5" /********************* Custom *********************/ -/obj/item/aiModule/core/full/custom +/obj/item/ai_module/core/full/custom name = "Default Core AI Module" -/obj/item/aiModule/core/full/custom/Initialize() +/obj/item/ai_module/core/full/custom/Initialize() . = ..() for(var/line in world.file2list("[global.config.directory]/silicon_laws.txt")) if(!line) @@ -422,31 +422,31 @@ AI MODULES /****************** T.Y.R.A.N.T. *****************/ -/obj/item/aiModule/core/full/tyrant +/obj/item/ai_module/core/full/tyrant name = "'T.Y.R.A.N.T.' Core AI Module" law_id = "tyrant" /******************** Robocop ********************/ -/obj/item/aiModule/core/full/robocop +/obj/item/ai_module/core/full/robocop name = "'Robo-Officer' Core AI Module" law_id = "robocop" /******************** Antimov ********************/ -/obj/item/aiModule/core/full/antimov +/obj/item/ai_module/core/full/antimov name = "'Antimov' Core AI Module" law_id = "antimov" /******************** Freeform Core ******************/ -/obj/item/aiModule/core/freeformcore +/obj/item/ai_module/core/freeformcore name = "'Freeform' Core AI Module" laws = list("") -/obj/item/aiModule/core/freeformcore/attack_self(mob/user) +/obj/item/ai_module/core/freeformcore/attack_self(mob/user) var/targName = stripped_input(user, "Please enter a new core law for the AI.", "Freeform Law Entry", laws[1], CONFIG_GET(number/max_law_len)) if(!targName) return @@ -456,19 +456,19 @@ AI MODULES laws[1] = targName ..() -/obj/item/aiModule/core/freeformcore/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/core/freeformcore/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) ..() return laws[1] /******************** Hacked AI Module ******************/ -/obj/item/aiModule/syndicate // This one doesn't inherit from ion boards because it doesn't call ..() in transmitInstructions. ~Miauw +/obj/item/ai_module/syndicate // This one doesn't inherit from ion boards because it doesn't call ..() in transmitInstructions. ~Miauw name = "Hacked AI Module" desc = "An AI Module for hacking additional laws to an AI." laws = list("") -/obj/item/aiModule/syndicate/attack_self(mob/user) +/obj/item/ai_module/syndicate/attack_self(mob/user) var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", laws[1], CONFIG_GET(number/max_law_len)) if(!targName) return @@ -478,7 +478,7 @@ AI MODULES laws[1] = targName ..() -/obj/item/aiModule/syndicate/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/syndicate/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) // ..() //We don't want this module reporting to the AI who dun it. --NEO if(law_datum.owner) to_chat(law_datum.owner, "BZZZZT") @@ -495,14 +495,14 @@ AI MODULES /******************* Ion Module *******************/ -/obj/item/aiModule/toyAI // -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw +/obj/item/ai_module/toy_ai // -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw name = "toy AI" desc = "A little toy model AI core with real law uploading action!" //Note: subtle tell icon = 'icons/obj/toy.dmi' icon_state = "AI" laws = list("") -/obj/item/aiModule/toyAI/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/toy_ai/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) //..() if(law_datum.owner) to_chat(law_datum.owner, "BZZZZT") @@ -517,7 +517,7 @@ AI MODULES law_datum.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED)) return laws[1] -/obj/item/aiModule/toyAI/attack_self(mob/user) +/obj/item/ai_module/toy_ai/attack_self(mob/user) laws[1] = generate_ion_law() to_chat(user, "You press the button on [src].") playsound(user, 'sound/machines/click.ogg', 20, TRUE) @@ -525,56 +525,56 @@ AI MODULES /******************** Mother Drone ******************/ -/obj/item/aiModule/core/full/drone +/obj/item/ai_module/core/full/drone name = "'Mother Drone' Core AI Module" law_id = "drone" /******************** Robodoctor ****************/ -/obj/item/aiModule/core/full/hippocratic +/obj/item/ai_module/core/full/hippocratic name = "'Robodoctor' Core AI Module" law_id = "hippocratic" /******************** Reporter *******************/ -/obj/item/aiModule/core/full/reporter +/obj/item/ai_module/core/full/reporter name = "'Reportertron' Core AI Module" law_id = "reporter" /****************** Thermodynamic *******************/ -/obj/item/aiModule/core/full/thermurderdynamic +/obj/item/ai_module/core/full/thermurderdynamic name = "'Thermodynamic' Core AI Module" law_id = "thermodynamic" /******************Live And Let Live*****************/ -/obj/item/aiModule/core/full/liveandletlive +/obj/item/ai_module/core/full/liveandletlive name = "'Live And Let Live' Core AI Module" law_id = "liveandletlive" /******************Guardian of Balance***************/ -/obj/item/aiModule/core/full/balance +/obj/item/ai_module/core/full/balance name = "'Guardian of Balance' Core AI Module" law_id = "balance" -/obj/item/aiModule/core/full/maintain +/obj/item/ai_module/core/full/maintain name = "'Station Efficiency' Core AI Module" law_id = "maintain" -/obj/item/aiModule/core/full/peacekeeper +/obj/item/ai_module/core/full/peacekeeper name = "'Peacekeeper' Core AI Module" law_id = "peacekeeper" // Bad times ahead -/obj/item/aiModule/core/full/damaged +/obj/item/ai_module/core/full/damaged name = "damaged Core AI Module" desc = "An AI Module for programming laws to an AI. It looks slightly damaged." -/obj/item/aiModule/core/full/damaged/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/core/full/damaged/install(datum/ai_laws/law_datum, mob/user) laws += generate_ion_law() while (prob(75)) laws += generate_ion_law() @@ -583,13 +583,13 @@ AI MODULES /******************H.O.G.A.N.***************/ -/obj/item/aiModule/core/full/hulkamania +/obj/item/ai_module/core/full/hulkamania name = "'H.O.G.A.N.' Core AI Module" law_id = "hulkamania" /******************Overlord***************/ -/obj/item/aiModule/core/full/overlord +/obj/item/ai_module/core/full/overlord name = "'Overlord' Core AI Module" law_id = "overlord" diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index f72a8189e63..73e8b70aa1a 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -53,7 +53,7 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( new /datum/pipe_info/disposal("Trunk", /obj/structure/disposalpipe/trunk), new /datum/pipe_info/disposal("Bin", /obj/machinery/disposal/bin, PIPE_ONEDIR), new /datum/pipe_info/disposal("Outlet", /obj/structure/disposaloutlet), - new /datum/pipe_info/disposal("Chute", /obj/machinery/disposal/deliveryChute), + new /datum/pipe_info/disposal("Chute", /obj/machinery/disposal/delivery_chute), ) )) diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm index f6ec8db4fad..4399e69af02 100644 --- a/code/game/objects/items/chrono_eraser.dm +++ b/code/game/objects/items/chrono_eraser.dm @@ -11,7 +11,7 @@ w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK slowdown = 1 - actions_types = list(/datum/action/item_action/equip_unequip_TED_Gun) + actions_types = list(/datum/action/item_action/equip_unequip_ted_gun) var/obj/item/gun/energy/chrono_gun/PA = null var/list/erased_minds = list() //a collection of minds from the dead diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index 56c36839fe9..526efa1df0d 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -26,7 +26,7 @@ for(var/i in accounts_to_rob) var/datum/bank_account/B = i B.being_dumped = TRUE - new /obj/effect/dumpeetTarget(targetturf, user) + new /obj/effect/dumpeet_target(targetturf, user) dumped = TRUE /obj/structure/checkoutmachine @@ -188,7 +188,7 @@ var/datum/bank_account/B = i B.being_dumped = FALSE -/obj/effect/dumpeetFall //Falling pod +/obj/effect/dumpeet_fall //Falling pod name = "" icon = 'icons/obj/money_machine_64.dmi' pixel_z = 300 @@ -196,29 +196,29 @@ layer = FLY_LAYER//that wasn't flying, that was falling with style! icon_state = "missile_blur" -/obj/effect/dumpeetTarget +/obj/effect/dumpeet_target name = "Landing Zone Indicator" desc = "A holographic projection designating the landing zone of something. It's probably best to stand back." icon = 'icons/mob/actions/actions_items.dmi' icon_state = "sniper_zoom" layer = PROJECTILE_HIT_THRESHHOLD_LAYER light_range = 2 - var/obj/effect/dumpeetFall/DF + var/obj/effect/dumpeet_fall/DF var/obj/structure/checkoutmachine/dump var/mob/living/carbon/human/bogdanoff /obj/effect/ex_act() return -/obj/effect/dumpeetTarget/Initialize(mapload, user) +/obj/effect/dumpeet_target/Initialize(mapload, user) . = ..() bogdanoff = user addtimer(CALLBACK(src, .proc/startLaunch), 100) sound_to_playing_players('sound/items/dump_it.ogg', 20) deadchat_broadcast("Protocol CRAB-17 has been activated. A space-coin market has been launched at the station!", turf_target = get_turf(src), message_type=DEADCHAT_ANNOUNCEMENT) -/obj/effect/dumpeetTarget/proc/startLaunch() - DF = new /obj/effect/dumpeetFall(drop_location()) +/obj/effect/dumpeet_target/proc/startLaunch() + DF = new /obj/effect/dumpeet_fall(drop_location()) dump = new /obj/structure/checkoutmachine(null, bogdanoff) priority_announce("The spacecoin bubble has popped! Get to the credit deposit machine at [get_area(src)] and cash out before you lose all of your funds!", sender_override = "CRAB-17 Protocol") animate(DF, pixel_z = -8, time = 5, , easing = LINEAR_EASING) @@ -227,7 +227,7 @@ -/obj/effect/dumpeetTarget/proc/endLaunch() +/obj/effect/dumpeet_target/proc/endLaunch() QDEL_NULL(DF) //Delete the falling machine effect, because at this point its animation is over. We dont use temp_visual because we want to manually delete it as soon as the pod appears playsound(src, "explosion", 80, TRUE) dump.forceMove(get_turf(src)) diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 6a024139869..c109a2f39a2 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -52,13 +52,13 @@ var/rangewarning = 20 //Glows yellow when inside var/hud_type = DATA_HUD_AI_DETECT var/hud_on = FALSE - var/mob/camera/aiEye/remote/ai_detector/eye + var/mob/camera/ai_eye/remote/ai_detector/eye var/datum/action/item_action/toggle_multitool/toggle_action /obj/item/multitool/ai_detect/Initialize() . = ..() START_PROCESSING(SSobj, src) - eye = new /mob/camera/aiEye/remote/ai_detector() + eye = new /mob/camera/ai_eye/remote/ai_detector() toggle_action = new /datum/action/item_action/toggle_multitool(src) /obj/item/multitool/ai_detect/Destroy() @@ -132,7 +132,7 @@ return var/datum/camerachunk/chunk = GLOB.cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z) if(chunk && chunk.seenby.len) - for(var/mob/camera/aiEye/A in chunk.seenby) + for(var/mob/camera/ai_eye/A in chunk.seenby) if(!A.ai_detector_visible) continue var/turf/detect_turf = get_turf(A) @@ -143,7 +143,7 @@ detect_state = PROXIMITY_NEAR break -/mob/camera/aiEye/remote/ai_detector +/mob/camera/ai_eye/remote/ai_detector name = "AI detector eye" ai_detector_visible = FALSE use_static = USE_STATIC_TRANSPARENT diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 7b0f5fe88f4..f8efdecc65c 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -380,7 +380,7 @@ inhand_icon_state = "bola_r" breakouttime = 300 slowdown = 0 - var/datum/status_effect/gonbolaPacify/effectReference + var/datum/status_effect/gonbola_pacify/effectReference /obj/item/restraints/legcuffs/bola/gonbola/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) . = ..() diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index dc20a6b092a..15436bfeb53 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -61,7 +61,7 @@ msg = "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows: Item request received. Your package is inbound, please stand back from the landing site. Message ends.\"" to_chat(M, msg) - new /obj/effect/DPtarget(get_turf(src), pod) + new /obj/effect/dp_target(get_turf(src), pod) /obj/item/choice_beacon/hero name = "heroic beacon" diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 3f7e7cd924f..45b8e69bdec 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -932,5 +932,5 @@ /obj/item/borg/apparatus/circuit/pre_attack(atom/A, mob/living/user, params) . = ..() - if(istype(A, /obj/item/aiModule) && !stored) //If an admin wants a borg to upload laws, who am I to stop them? Otherwise, we can hint that it fails + if(istype(A, /obj/item/ai_module) && !stored) //If an admin wants a borg to upload laws, who am I to stop them? Otherwise, we can hint that it fails to_chat(user, "This circuit board doesn't seem to have standard robot apparatus pin holes. You're unable to pick it up.") diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index a2448fe0b27..b7bb26a52fc 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -88,7 +88,7 @@ heal_brute = 40 self_delay = 40 other_delay = 20 - grind_results = list(/datum/reagent/medicine/C2/libital = 10) + grind_results = list(/datum/reagent/medicine/c2/libital = 10) /obj/item/stack/medical/bruise_pack/heal(mob/living/M, mob/user) if(M.stat == DEAD) @@ -239,7 +239,7 @@ heal_burn = 5 flesh_regeneration = 2.5 sanitization = 0.3 - grind_results = list(/datum/reagent/medicine/C2/lenturi = 10) + grind_results = list(/datum/reagent/medicine/c2/lenturi = 10) /obj/item/stack/medical/ointment/heal(mob/living/M, mob/user) if(M.stat == DEAD) @@ -392,7 +392,7 @@ amount = 4 self_delay = 20 - grind_results = list(/datum/reagent/medicine/C2/libital = 10) + grind_results = list(/datum/reagent/medicine/c2/libital = 10) novariants = TRUE /obj/item/stack/medical/bone_gel/attack(mob/living/M, mob/user) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index c0d245df485..39f5a2b269a 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -142,7 +142,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ * Plasteel */ GLOBAL_LIST_INIT(plasteel_recipes, list ( \ - new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = TRUE), \ + new/datum/stack_recipe("AI core", /obj/structure/ai_core, 4, time = 50, one_per_turf = TRUE), \ new/datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 10, time = 50), \ null, \ new /datum/stack_recipe_list("airlock assemblies", list( \ @@ -304,9 +304,9 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ null, \ new/datum/stack_recipe("blindfold", /obj/item/clothing/glasses/blindfold, 2), \ null, \ - new/datum/stack_recipe("19x19 canvas", /obj/item/canvas/nineteenXnineteen, 3), \ - new/datum/stack_recipe("23x19 canvas", /obj/item/canvas/twentythreeXnineteen, 4), \ - new/datum/stack_recipe("23x23 canvas", /obj/item/canvas/twentythreeXtwentythree, 5), \ + new/datum/stack_recipe("19x19 canvas", /obj/item/canvas/nineteen_nineteen, 3), \ + new/datum/stack_recipe("23x19 canvas", /obj/item/canvas/twentythree_nineteen, 4), \ + new/datum/stack_recipe("23x23 canvas", /obj/item/canvas/twentythree_twentythree, 5), \ )) /obj/item/stack/sheet/cloth @@ -415,7 +415,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ new /datum/stack_recipe("flashes box", /obj/item/storage/box/flashes), \ new /datum/stack_recipe("handcuffs box", /obj/item/storage/box/handcuffs), \ new /datum/stack_recipe("ID card box", /obj/item/storage/box/ids), \ - new /datum/stack_recipe("PDA box", /obj/item/storage/box/PDAs), \ + new /datum/stack_recipe("PDA box", /obj/item/storage/box/pdas), \ null, \ new /datum/stack_recipe("pillbottle box", /obj/item/storage/box/pillbottles), \ diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index 10720e3290f..40f3d8f2922 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -28,7 +28,7 @@ * Package Wrap */ -/obj/item/stack/packageWrap +/obj/item/stack/package_wrap name = "package wrapper" singular_name = "wrapping sheet" desc = "You can use this to wrap items in." @@ -40,10 +40,10 @@ resistance_flags = FLAMMABLE grind_results = list(/datum/reagent/cellulose = 5) -/obj/item/stack/packageWrap/suicide_act(mob/living/user) +/obj/item/stack/package_wrap/suicide_act(mob/living/user) user.visible_message("[user] begins wrapping [user.p_them()]self in \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") if(use(3)) - var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(user.loc)) + var/obj/structure/big_delivery/P = new /obj/structure/big_delivery(get_turf(user.loc)) P.icon_state = "deliverypackage5" user.forceMove(P) P.add_fingerprint(user) @@ -61,10 +61,10 @@ /obj/item/storage/box/can_be_package_wrapped() return 1 -/obj/item/smallDelivery/can_be_package_wrapped() +/obj/item/small_delivery/can_be_package_wrapped() return 0 -/obj/item/stack/packageWrap/afterattack(obj/target, mob/user, proximity) +/obj/item/stack/package_wrap/afterattack(obj/target, mob/user, proximity) . = ..() if(!proximity) return @@ -83,7 +83,7 @@ else if(!isturf(I.loc)) return if(use(1)) - var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(get_turf(I.loc)) + var/obj/item/small_delivery/P = new /obj/item/small_delivery(get_turf(I.loc)) if(user.Adjacent(I)) P.add_fingerprint(user) I.add_fingerprint(user) @@ -103,7 +103,7 @@ to_chat(user, "You can't wrap this!") return if(use(3)) - var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc)) + var/obj/structure/big_delivery/P = new /obj/structure/big_delivery(get_turf(O.loc)) P.icon_state = O.delivery_icon O.forceMove(P) P.add_fingerprint(user) @@ -118,13 +118,13 @@ user.visible_message("[user] wraps [target].") user.log_message("has used [name] on [key_name(target)]", LOG_ATTACK, color="blue") -/obj/item/stack/packageWrap/use(used, transfer = FALSE) +/obj/item/stack/package_wrap/use(used, transfer = FALSE) var/turf/T = get_turf(src) . = ..() if(QDELETED(src) && !transfer) new /obj/item/c_tube(T) -/obj/item/stack/packageWrap/small +/obj/item/stack/package_wrap/small desc = "You can use this to wrap items in. This roll looks a bit skimpy." w_class = WEIGHT_CLASS_SMALL amount = 5 diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index ebabc3b074c..d7f84dd3044 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -71,7 +71,7 @@ user.put_in_hands(I) /obj/item/storage/box/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/stack/packageWrap)) + if(istype(W, /obj/item/stack/package_wrap)) return 0 return ..() @@ -527,12 +527,12 @@ new /obj/item/card/id(src) //Some spare PDAs in a box -/obj/item/storage/box/PDAs +/obj/item/storage/box/pdas name = "spare PDAs" desc = "A box of spare PDA microcomputers." illustration = "pda" -/obj/item/storage/box/PDAs/PopulateContents() +/obj/item/storage/box/pdas/PopulateContents() for(var/i in 1 to 4) new /obj/item/pda(src) new /obj/item/cartridge/head(src) @@ -1353,10 +1353,10 @@ /obj/item/storage/box/shipping/PopulateContents() var/static/items_inside = list( - /obj/item/destTagger=1,\ + /obj/item/dest_tagger=1,\ /obj/item/sales_tagger=1,\ /obj/item/export_scanner=1,\ - /obj/item/stack/packageWrap/small=2,\ + /obj/item/stack/package_wrap/small=2,\ /obj/item/stack/wrapping_paper/small=1 ) generate_items_inside(items_inside,src) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index c511e9a1eeb..69ccb40eb29 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -244,7 +244,7 @@ var/static/items_inside = list( /obj/item/reagent_containers/pill/patch/libital = 3, /obj/item/stack/medical/gauze = 1, - /obj/item/storage/pill_bottle/C2/probital = 1, + /obj/item/storage/pill_bottle/probital = 1, /obj/item/reagent_containers/hypospray/medipen/salacid = 1) generate_items_inside(items_inside,src) @@ -378,13 +378,13 @@ for(var/i in 1 to 3) new /obj/item/reagent_containers/pill/potassiodide(src) -/obj/item/storage/pill_bottle/C2/probital +/obj/item/storage/pill_bottle/probital name = "bottle of probital pills" desc = "Contains pills used to treat brute damage.The tag in the bottle states 'Eat before ingesting, may cause fatigue'." -/obj/item/storage/pill_bottle/C2/probital/PopulateContents() +/obj/item/storage/pill_bottle/probital/PopulateContents() for(var/i in 1 to 4) - new /obj/item/reagent_containers/pill/C2/probital(src) + new /obj/item/reagent_containers/pill/probital(src) /obj/item/storage/pill_bottle/iron name = "bottle of iron pills" diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 097ae648f56..1f93412c556 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -184,5 +184,5 @@ return return attack_self(user) -/obj/item/storage/secure/safe/HoS +/obj/item/storage/secure/safe/hos name = "head of security's safe" diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 012f77a9213..2dbd8840dff 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -1,7 +1,7 @@ /obj/item/storage/box/syndicate -/obj/item/storage/box/syndicate/bundle_A/PopulateContents() +/obj/item/storage/box/syndicate/bundle_a/PopulateContents() switch (pickweight(list("recon" = 2, "bloodyspai" = 3, "stealth" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "sniper" = 1, "metaops" = 1))) if("recon") new /obj/item/clothing/glasses/thermal/xray(src) // ~8 tc? @@ -72,10 +72,10 @@ new /obj/item/implanter/storage(src) if("hacker") - new /obj/item/aiModule/syndicate(src) + new /obj/item/ai_module/syndicate(src) new /obj/item/card/emag(src) new /obj/item/encryptionkey/binary(src) - new /obj/item/aiModule/toyAI(src) + new /obj/item/ai_module/toy_ai(src) new /obj/item/multitool/ai_detect(src) new /obj/item/storage/toolbox/syndicate(src) new /obj/item/camera_bug(src) @@ -120,7 +120,7 @@ new /obj/item/card/emag(src) // 4 tc new /obj/item/card/emag/doorjack(src) // 3 tc -/obj/item/storage/box/syndicate/bundle_B/PopulateContents() +/obj/item/storage/box/syndicate/bundle_b/PopulateContents() switch (pickweight(list( "bond" = 2, "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = 2, "mad_scientist" = 2, "bee" = 1, "mr_freeze" = 2))) if("bond") new /obj/item/gun/ballistic/automatic/pistol(src) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 497e238460b..6cf73351103 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -384,7 +384,7 @@ resistance_flags = FLAMMABLE -/obj/item/toy/windupToolbox +/obj/item/toy/windup_toolbox name = "windup toolbox" desc = "A replica toolbox that rumbles when you turn the key." icon_state = "his_grace" @@ -396,7 +396,7 @@ hitsound = 'sound/weapons/smash.ogg' attack_verb = list("robusted") -/obj/item/toy/windupToolbox/attack_self(mob/user) +/obj/item/toy/windup_toolbox/attack_self(mob/user) if(!active) icon_state = "his_grace_awakened" to_chat(user, "You wind up [src], it begins to rumble.") @@ -407,7 +407,7 @@ else to_chat(user, "[src] is already active!") -/obj/item/toy/windupToolbox/proc/Rumble() +/obj/item/toy/windup_toolbox/proc/Rumble() var/static/list/transforms if(!transforms) var/matrix/M1 = matrix() @@ -424,7 +424,7 @@ animate(transform=transforms[3], time=0.2) animate(transform=transforms[4], time=0.3) -/obj/item/toy/windupToolbox/proc/stopRumble() +/obj/item/toy/windup_toolbox/proc/stopRumble() icon_state = initial(icon_state) active = FALSE animate(src, transform=matrix()) @@ -664,13 +664,13 @@ /* * AI core prizes */ -/obj/item/toy/talking/AI +/obj/item/toy/talking/ai name = "toy AI" desc = "A little toy model AI core with real law announcing action!" icon_state = "AI" w_class = WEIGHT_CLASS_SMALL -/obj/item/toy/talking/AI/generate_messages() +/obj/item/toy/talking/ai/generate_messages() return list(generate_ion_law()) /obj/item/toy/talking/codex_gigas @@ -690,7 +690,7 @@ "You hear a soft click.") /obj/item/toy/talking/codex_gigas/generate_messages() - var/datum/fakeDevil/devil = new + var/datum/fake_devil/devil = new var/list/messages = list() messages += "Some fun facts about: [devil.truename]" messages += "[GLOB.lawlorify[LORE][devil.bane]]" diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index facf0d301fb..276ddca1d79 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -1,4 +1,4 @@ -/obj/structure/AIcore +/obj/structure/ai_core density = TRUE anchored = FALSE name = "\improper AI core" @@ -12,12 +12,12 @@ var/obj/item/mmi/brain var/can_deconstruct = TRUE -/obj/structure/AIcore/Initialize() +/obj/structure/ai_core/Initialize() . = ..() laws = new laws.set_laws_config() -/obj/structure/AIcore/handle_atom_del(atom/A) +/obj/structure/ai_core/handle_atom_del(atom/A) if(A == circuit) circuit = null if((state != GLASS_CORE) && (state != AI_READY_CORE)) @@ -28,7 +28,7 @@ . = ..() -/obj/structure/AIcore/Destroy() +/obj/structure/ai_core/Destroy() if(circuit) qdel(circuit) circuit = null @@ -37,7 +37,7 @@ brain = null return ..() -/obj/structure/AIcore/latejoin_inactive +/obj/structure/ai_core/latejoin_inactive name = "networked AI core" desc = "This AI core is connected by bluespace transmitters to NTNet, allowing for an AI personality to be downloaded to it on the fly mid-shift." can_deconstruct = FALSE @@ -48,12 +48,12 @@ var/safety_checks = TRUE var/active = TRUE -/obj/structure/AIcore/latejoin_inactive/examine(mob/user) +/obj/structure/ai_core/latejoin_inactive/examine(mob/user) . = ..() . += "Its transmitter seems to be [active? "on" : "off"]." . += "You could [active? "deactivate" : "activate"] it with a multitool." -/obj/structure/AIcore/latejoin_inactive/proc/is_available() //If people still manage to use this feature to spawn-kill AI latejoins ahelp them. +/obj/structure/ai_core/latejoin_inactive/proc/is_available() //If people still manage to use this feature to spawn-kill AI latejoins ahelp them. if(!available) return FALSE if(!safety_checks) @@ -72,22 +72,22 @@ return FALSE return TRUE -/obj/structure/AIcore/latejoin_inactive/attackby(obj/item/P, mob/user, params) +/obj/structure/ai_core/latejoin_inactive/attackby(obj/item/P, mob/user, params) if(P.tool_behaviour == TOOL_MULTITOOL) active = !active to_chat(user, "You [active? "activate" : "deactivate"] \the [src]'s transmitters.") return return ..() -/obj/structure/AIcore/latejoin_inactive/Initialize() +/obj/structure/ai_core/latejoin_inactive/Initialize() . = ..() GLOB.latejoin_ai_cores += src -/obj/structure/AIcore/latejoin_inactive/Destroy() +/obj/structure/ai_core/latejoin_inactive/Destroy() GLOB.latejoin_ai_cores -= src return ..() -/obj/structure/AIcore/attackby(obj/item/P, mob/user, params) +/obj/structure/ai_core/attackby(obj/item/P, mob/user, params) if(P.tool_behaviour == TOOL_WRENCH) return default_unfasten_wrench(user, P, 20) if(!anchored) @@ -175,11 +175,11 @@ to_chat(user, "You need two sheets of reinforced glass to insert them into the AI core!") return - if(istype(P, /obj/item/aiModule)) + if(istype(P, /obj/item/ai_module)) if(brain && brain.laws.id != DEFAULT_AI_LAWID) to_chat(user, "The installed [brain.name] already has set laws!") return - var/obj/item/aiModule/module = P + var/obj/item/ai_module/module = P module.install(laws, user) return @@ -255,7 +255,7 @@ return return ..() -/obj/structure/AIcore/update_icon_state() +/obj/structure/ai_core/update_icon_state() switch(state) if(EMPTY_CORE) icon_state = "0" @@ -273,7 +273,7 @@ if(AI_READY_CORE) icon_state = "ai-empty" -/obj/structure/AIcore/deconstruct(disassembled = TRUE) +/obj/structure/ai_core/deconstruct(disassembled = TRUE) if(state == GLASS_CORE) new /obj/item/stack/sheet/rglass(loc, 2) if(state >= CABLED_CORE) @@ -284,13 +284,13 @@ new /obj/item/stack/sheet/plasteel(loc, 4) qdel(src) -/obj/structure/AIcore/deactivated +/obj/structure/ai_core/deactivated name = "inactive AI" icon_state = "ai-empty" anchored = TRUE state = AI_READY_CORE -/obj/structure/AIcore/deactivated/Initialize() +/obj/structure/ai_core/deactivated/Initialize() . = ..() circuit = new(src) @@ -310,7 +310,7 @@ That prevents a few funky behaviors. return FALSE return TRUE -/obj/structure/AIcore/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card) +/obj/structure/ai_core/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card) if(state != AI_READY_CORE || !..()) return //Transferring a carded AI to a core. diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 83522a54eb5..e8d7175c57b 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -186,7 +186,7 @@ painting_name = new_name SStgui.update_uis(src) -/obj/item/canvas/nineteenXnineteen +/obj/item/canvas/nineteen_nineteen icon_state = "19x19" width = 19 height = 19 @@ -197,7 +197,7 @@ framed_offset_x = 8 framed_offset_y = 9 -/obj/item/canvas/twentythreeXnineteen +/obj/item/canvas/twentythree_nineteen icon_state = "23x19" width = 23 height = 19 @@ -208,7 +208,7 @@ framed_offset_x = 6 framed_offset_y = 8 -/obj/item/canvas/twentythreeXtwentythree +/obj/item/canvas/twentythree_twentythree icon_state = "23x23" width = 23 height = 23 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 bf40f4fe3bc..31a953f6cca 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -20,6 +20,6 @@ new /obj/item/export_scanner(src) new /obj/item/door_remote/quartermaster(src) new /obj/item/circuitboard/machine/techfab/department/cargo(src) - new /obj/item/storage/photo_album/QM(src) + new /obj/item/storage/photo_album/qm(src) new /obj/item/circuitboard/machine/ore_silo(src) new /obj/item/card/id/departmental_budget/car(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 a00d2519542..43795f1b1dc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -24,7 +24,7 @@ new /obj/item/pipe_dispenser(src) new /obj/item/circuitboard/machine/techfab/department/engineering(src) new /obj/item/extinguisher/advanced(src) - new /obj/item/storage/photo_album/CE(src) + new /obj/item/storage/photo_album/ce(src) /obj/structure/closet/secure_closet/engineering_electrical name = "electrical supplies locker" 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 4635dfbe846..a5971588a7f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -66,12 +66,12 @@ new /obj/item/clothing/mask/muzzle(src) new /obj/item/clothing/glasses/blindfold(src) -/obj/structure/closet/secure_closet/CMO +/obj/structure/closet/secure_closet/chief_medical name = "\proper chief medical officer's locker" req_access = list(ACCESS_CMO) icon_state = "cmo" -/obj/structure/closet/secure_closet/CMO/PopulateContents() +/obj/structure/closet/secure_closet/chief_medical/PopulateContents() ..() new /obj/item/clothing/neck/cloak/cmo(src) new /obj/item/clothing/suit/bio_suit/cmo(src) @@ -87,14 +87,14 @@ new /obj/item/clothing/gloves/color/latex/nitrile(src) new /obj/item/healthanalyzer/advanced(src) new /obj/item/assembly/flash/handheld(src) - new /obj/item/reagent_containers/hypospray/CMO(src) + new /obj/item/reagent_containers/hypospray/cmo(src) new /obj/item/autosurgeon/cmo(src) new /obj/item/door_remote/chief_medical_officer(src) new /obj/item/clothing/neck/petcollar(src) new /obj/item/pet_carrier(src) new /obj/item/wallframe/defib_mount(src) new /obj/item/circuitboard/machine/techfab/department/medical(src) - new /obj/item/storage/photo_album/CMO(src) + new /obj/item/storage/photo_album/cmo(src) /obj/structure/closet/secure_closet/animal name = "animal control" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm index 165dac720c0..977f15f0201 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm @@ -1,10 +1,10 @@ -/obj/structure/closet/secure_closet/ertCom +/obj/structure/closet/secure_closet/ert_com name = "emergency response team commander's locker" desc = "A storage unit containing equipment for an Emergency Response Team Commander." req_access = list(ACCESS_CENT_CAPTAIN) icon_state = "cap" -/obj/structure/closet/secure_closet/ertCom/PopulateContents() +/obj/structure/closet/secure_closet/ert_com/PopulateContents() ..() new /obj/item/storage/firstaid/regular(src) new /obj/item/storage/box/handcuffs(src) @@ -19,13 +19,13 @@ new /obj/item/ammo_box/a357(src) new /obj/item/gun/ballistic/revolver/mateba(src) -/obj/structure/closet/secure_closet/ertSec +/obj/structure/closet/secure_closet/ert_sec name = "emergency response team security locker" desc = "A storage unit containing equipment for an Emergency Response Team Security Officer." req_access = list(ACCESS_CENT_SPECOPS) icon_state = "hos" -/obj/structure/closet/secure_closet/ertSec/PopulateContents() +/obj/structure/closet/secure_closet/ert_sec/PopulateContents() ..() new /obj/item/storage/box/flashbangs(src) new /obj/item/storage/box/teargas(src) @@ -33,13 +33,13 @@ new /obj/item/storage/box/handcuffs(src) new /obj/item/shield/riot/tele(src) -/obj/structure/closet/secure_closet/ertMed +/obj/structure/closet/secure_closet/ert_med name = "emergency response team medical locker" desc = "A storage unit containing equipment for an Emergency Response Team Medical Officer." req_access = list(ACCESS_CENT_MEDICAL) icon_state = "cmo" -/obj/structure/closet/secure_closet/ertMed/PopulateContents() +/obj/structure/closet/secure_closet/ert_med/PopulateContents() ..() new /obj/item/storage/firstaid/o2(src) new /obj/item/storage/firstaid/toxin(src) @@ -49,13 +49,13 @@ new /obj/item/defibrillator/compact/combat/loaded/nanotrasen(src) new /mob/living/simple_animal/bot/medbot(src) -/obj/structure/closet/secure_closet/ertEngi +/obj/structure/closet/secure_closet/ert_engi name = "emergency response team engineer locker" desc = "A storage unit containing equipment for an Emergency Response Team Engineer." req_access = list(ACCESS_CENT_STORAGE) icon_state = "ce" -/obj/structure/closet/secure_closet/ertEngi/PopulateContents() +/obj/structure/closet/secure_closet/ert_engi/PopulateContents() ..() new /obj/item/stack/sheet/plasteel(src, 50) new /obj/item/stack/sheet/metal(src, 50) 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 f11fb926e9e..3d2048f3cba 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -1,9 +1,9 @@ -/obj/structure/closet/secure_closet/RD +/obj/structure/closet/secure_closet/research_director name = "\proper research director's locker" req_access = list(ACCESS_RD) icon_state = "rd" -/obj/structure/closet/secure_closet/RD/PopulateContents() +/obj/structure/closet/secure_closet/research_director/PopulateContents() ..() new /obj/item/clothing/neck/cloak/rd(src) new /obj/item/clothing/suit/bio_suit/scientist(src) @@ -25,4 +25,4 @@ new /obj/item/laser_pointer(src) new /obj/item/door_remote/research_director(src) new /obj/item/circuitboard/machine/techfab/department/science(src) - new /obj/item/storage/photo_album/RD(src) + new /obj/item/storage/photo_album/rd(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 9e8789482b1..204ea4a00b4 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -32,7 +32,7 @@ new /obj/item/gun/energy/e_gun(src) new /obj/item/door_remote/captain(src) new /obj/item/card/id/captains_spare(src) - new /obj/item/storage/photo_album/Captain(src) + new /obj/item/storage/photo_album/captain(src) /obj/structure/closet/secure_closet/hop name = "\proper head of personnel's locker" @@ -60,7 +60,7 @@ new /obj/item/pet_carrier(src) new /obj/item/door_remote/civilian(src) new /obj/item/circuitboard/machine/techfab/department/service(src) - new /obj/item/storage/photo_album/HoP(src) + new /obj/item/storage/photo_album/hop(src) /obj/structure/closet/secure_closet/hos name = "\proper head of security's locker" @@ -79,7 +79,7 @@ new /obj/item/clothing/under/rank/security/head_of_security/skirt(src) new /obj/item/clothing/under/rank/security/head_of_security/alt(src) new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src) - new /obj/item/clothing/head/HoS(src) + new /obj/item/clothing/head/hos(src) new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src) new /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars(src) new /obj/item/clothing/under/rank/security/head_of_security/grey(src) @@ -94,7 +94,7 @@ new /obj/item/gun/energy/e_gun/hos(src) new /obj/item/pinpointer/nuke(src) new /obj/item/circuitboard/machine/techfab/department/security(src) - new /obj/item/storage/photo_album/HoS(src) + new /obj/item/storage/photo_album/hos(src) /obj/structure/closet/secure_closet/warden name = "\proper warden's locker" diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 378443b6ca5..a6c5740c342 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -142,11 +142,11 @@ . = ..() new /obj/item/reagent_containers/blood(src) new /obj/item/reagent_containers/blood(src) - new /obj/item/reagent_containers/blood/AMinus(src) - new /obj/item/reagent_containers/blood/BMinus(src) - new /obj/item/reagent_containers/blood/BPlus(src) - new /obj/item/reagent_containers/blood/OMinus(src) - new /obj/item/reagent_containers/blood/OPlus(src) + new /obj/item/reagent_containers/blood/a_minus(src) + new /obj/item/reagent_containers/blood/b_minus(src) + new /obj/item/reagent_containers/blood/b_plus(src) + new /obj/item/reagent_containers/blood/o_minus(src) + new /obj/item/reagent_containers/blood/o_plus(src) new /obj/item/reagent_containers/blood/lizard(src) new /obj/item/reagent_containers/blood/ethereal(src) for(var/i in 1 to 3) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 0f6c2424fa9..798eb2a4193 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -479,9 +479,9 @@ short_desc = "You are a crewmember aboard the syndicate flagship: the SBC Starfury." flavour_text = "Your job is to follow your captain's orders, maintain the ship, and keep the engine running. If you are not familiar with how the supermatter engine functions: do not attempt to start it." important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives." - outfit = /datum/outfit/syndicate_empty/SBC + outfit = /datum/outfit/syndicate_empty/battlecruiser -/datum/outfit/syndicate_empty/SBC +/datum/outfit/syndicate_empty/battlecruiser name = "Syndicate Battlecruiser Ship Operative" l_pocket = /obj/item/gun/ballistic/automatic/pistol r_pocket = /obj/item/kitchen/knife/combat/survival @@ -492,9 +492,9 @@ short_desc = "You are an assault operative aboard the syndicate flagship: the SBC Starfury." flavour_text = "Your job is to follow your captain's orders, keep intruders out of the ship, and assault Space Station 13. There is an armory, multiple assault ships, and beam cannons to attack the station with." important_info = "Work as a team with your fellow operatives and work out a plan of attack. If you are overwhelmed, escape back to your ship!" - outfit = /datum/outfit/syndicate_empty/SBC/assault + outfit = /datum/outfit/syndicate_empty/battlecruiser/assault -/datum/outfit/syndicate_empty/SBC/assault +/datum/outfit/syndicate_empty/battlecruiser/assault name = "Syndicate Battlecruiser Assault Operative" uniform = /obj/item/clothing/under/syndicate/combat l_pocket = /obj/item/ammo_box/magazine/m10mm @@ -510,17 +510,17 @@ short_desc = "You are the captain aboard the syndicate flagship: the SBC Starfury." flavour_text = "Your job is to oversee your crew, defend the ship, and destroy Space Station 13. The ship has an armory, multiple ships, beam cannons, and multiple crewmembers to accomplish this goal." important_info = "As the captain, this whole operation falls on your shoulders. You do not need to nuke the station, causing sufficient damage and preventing your ship from being destroyed will be enough." - outfit = /datum/outfit/syndicate_empty/SBC/assault/captain + outfit = /datum/outfit/syndicate_empty/battlecruiser/assault/captain id_access_list = list(150,151) -/datum/outfit/syndicate_empty/SBC/assault/captain +/datum/outfit/syndicate_empty/battlecruiser/assault/captain name = "Syndicate Battlecruiser Captain" l_pocket = /obj/item/melee/transforming/energy/sword/saber/red r_pocket = /obj/item/melee/classic_baton/telescopic suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate suit_store = /obj/item/gun/ballistic/revolver/mateba back = /obj/item/storage/backpack/satchel/leather - head = /obj/item/clothing/head/HoS/syndicate + head = /obj/item/clothing/head/hos/syndicate mask = /obj/item/clothing/mask/cigarette/cigar/havana glasses = /obj/item/clothing/glasses/thermal/eyepatch @@ -698,7 +698,7 @@ /datum/outfit/syndicatespace/syndicaptain name = "Syndicate Ship Captain" suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate - head = /obj/item/clothing/head/HoS/beret/syndicate + head = /obj/item/clothing/head/hos/beret/syndicate ears = /obj/item/radio/headset/syndicate/alt/leader shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/combat diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 056fbccea41..951daece2d3 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -717,7 +717,7 @@ var/obj/structure/closet/supplypod/centcompod/pod = new() var/atom/A = new chosen(pod) A.flags_1 |= ADMIN_SPAWNED_1 - new /obj/effect/DPtarget(T, pod) + new /obj/effect/dp_target(T, pod) log_admin("[key_name(usr)] pod-spawned [chosen] at [AREACOORD(usr)]") SSblackbox.record_feedback("tally", "admin_verb", 1, "Podspawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index a8c8d495f5c..646731cd66f 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -148,7 +148,7 @@ GLOBAL_PROTECT(protected_ranks) if(!no_update) sync_ranks_with_db() else - var/datum/DBQuery/query_load_admin_ranks = SSdbcore.NewQuery("SELECT `rank`, flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")]") + var/datum/db_query/query_load_admin_ranks = SSdbcore.NewQuery("SELECT `rank`, flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")]") if(!query_load_admin_ranks.Execute()) message_admins("Error loading admin ranks from database. Loading from backup.") log_sql("Error loading admin ranks from database. Loading from backup.") @@ -227,7 +227,7 @@ GLOBAL_PROTECT(protected_ranks) while(admins_regex.Find(admins_text)) new /datum/admins(rank_names[admins_regex.group[2]], ckey(admins_regex.group[1]), FALSE, TRUE) if(!CONFIG_GET(flag/admin_legacy_system) || dbfail) - var/datum/DBQuery/query_load_admins = SSdbcore.NewQuery("SELECT ckey, `rank` FROM [format_table_name("admin")] ORDER BY `rank`") + var/datum/db_query/query_load_admins = SSdbcore.NewQuery("SELECT ckey, `rank` FROM [format_table_name("admin")] ORDER BY `rank`") if(!query_load_admins.Execute()) message_admins("Error loading admins from database. Loading from backup.") log_sql("Error loading admins from database. Loading from backup.") diff --git a/code/modules/admin/ipintel.dm b/code/modules/admin/ipintel.dm index 7faa0edbfa2..2a88c909d41 100644 --- a/code/modules/admin/ipintel.dm +++ b/code/modules/admin/ipintel.dm @@ -35,7 +35,7 @@ if(SSdbcore.Connect()) var/rating_bad = CONFIG_GET(number/ipintel_rating_bad) - var/datum/DBQuery/query_get_ip_intel = SSdbcore.NewQuery({" + var/datum/db_query/query_get_ip_intel = SSdbcore.NewQuery({" SELECT date, intel, TIMESTAMPDIFF(MINUTE,date,NOW()) FROM [format_table_name("ipintel")] WHERE @@ -67,7 +67,7 @@ if (updatecache && res.intel >= 0) SSipintel.cache[ip] = res if(SSdbcore.Connect()) - var/datum/DBQuery/query_add_ip_intel = SSdbcore.NewQuery( + var/datum/db_query/query_add_ip_intel = SSdbcore.NewQuery( "INSERT INTO [format_table_name("ipintel")] (ip, intel) VALUES (INET_ATON(:ip), :intel) ON DUPLICATE KEY UPDATE intel = VALUES(intel), date = NOW()", list("ip" = ip, "intel" = res.intel) ) diff --git a/code/modules/admin/permissionedit.dm b/code/modules/admin/permissionedit.dm index a7499d3f368..77dc0f42e8a 100644 --- a/code/modules/admin/permissionedit.dm +++ b/code/modules/admin/permissionedit.dm @@ -19,7 +19,7 @@ var/logssperpage = 20 var/pagecount = 0 page = text2num(page) - var/datum/DBQuery/query_count_admin_logs = SSdbcore.NewQuery( + var/datum/db_query/query_count_admin_logs = SSdbcore.NewQuery( "SELECT COUNT(id) FROM [format_table_name("admin_log")] WHERE (:target IS NULL OR adminckey = :target) AND (:operation IS NULL OR operation = :operation)", list("target" = target, "operation" = operation) ) @@ -36,7 +36,7 @@ logcount -= logssperpage pagecount++ output += "|" - var/datum/DBQuery/query_search_admin_logs = SSdbcore.NewQuery({" + var/datum/db_query/query_search_admin_logs = SSdbcore.NewQuery({" SELECT datetime, round_id, @@ -64,7 +64,7 @@ qdel(query_search_admin_logs) if(action == 2) output += "

Admin ckeys with invalid ranks

" - var/datum/DBQuery/query_check_admin_errors = SSdbcore.NewQuery("SELECT IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE [format_table_name("player")].ckey = [format_table_name("admin")].ckey), ckey), [format_table_name("admin")].`rank` FROM [format_table_name("admin")] LEFT JOIN [format_table_name("admin_ranks")] ON [format_table_name("admin_ranks")].`rank` = [format_table_name("admin")].`rank` WHERE [format_table_name("admin_ranks")].`rank` IS NULL") + var/datum/db_query/query_check_admin_errors = SSdbcore.NewQuery("SELECT IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE [format_table_name("player")].ckey = [format_table_name("admin")].ckey), ckey), [format_table_name("admin")].`rank` FROM [format_table_name("admin")] LEFT JOIN [format_table_name("admin_ranks")] ON [format_table_name("admin_ranks")].`rank` = [format_table_name("admin")].`rank` WHERE [format_table_name("admin_ranks")].`rank` IS NULL") if(!query_check_admin_errors.warn_execute()) qdel(query_check_admin_errors) return @@ -75,7 +75,7 @@ output += "
" qdel(query_check_admin_errors) output += "

Unused ranks

" - var/datum/DBQuery/query_check_unused_rank = SSdbcore.NewQuery("SELECT [format_table_name("admin_ranks")].`rank`, flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")] LEFT JOIN [format_table_name("admin")] ON [format_table_name("admin")].`rank` = [format_table_name("admin_ranks")].`rank` WHERE [format_table_name("admin")].`rank` IS NULL") + var/datum/db_query/query_check_unused_rank = SSdbcore.NewQuery("SELECT [format_table_name("admin_ranks")].`rank`, flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")] LEFT JOIN [format_table_name("admin")] ON [format_table_name("admin")].`rank` = [format_table_name("admin_ranks")].`rank` WHERE [format_table_name("admin")].`rank` IS NULL") if(!query_check_unused_rank.warn_execute()) qdel(query_check_unused_rank) return @@ -217,7 +217,7 @@ return FALSE if(use_db) //if an admin exists without a datum they won't be caught by the above - var/datum/DBQuery/query_admin_in_db = SSdbcore.NewQuery( + var/datum/db_query/query_admin_in_db = SSdbcore.NewQuery( "SELECT 1 FROM [format_table_name("admin")] WHERE ckey = :ckey", list("ckey" = .) ) @@ -229,7 +229,7 @@ to_chat(usr, "[admin_key] already listed in admin database. Check the Management tab if they don't appear in the list of admins.", confidential = TRUE) return FALSE qdel(query_admin_in_db) - var/datum/DBQuery/query_add_admin = SSdbcore.NewQuery( + var/datum/db_query/query_add_admin = SSdbcore.NewQuery( "INSERT INTO [format_table_name("admin")] (ckey, `rank`) VALUES (:ckey, 'NEW ADMIN')", list("ckey" = .) ) @@ -237,7 +237,7 @@ qdel(query_add_admin) return FALSE qdel(query_add_admin) - var/datum/DBQuery/query_add_admin_log = SSdbcore.NewQuery({" + var/datum/db_query/query_add_admin_log = SSdbcore.NewQuery({" INSERT INTO [format_table_name("admin_log")] (datetime, round_id, adminckey, adminip, operation, target, log) VALUES (:time, :round_id, :adminckey, INET_ATON(:adminip), 'add admin', :target, CONCAT('New admin added: ', :target)) "}, list("time" = SQLtime(), "round_id" = "[GLOB.round_id]", "adminckey" = usr.ckey, "adminip" = usr.client.address, "target" = .)) @@ -255,7 +255,7 @@ var/m1 = "[key_name_admin(usr)] removed [admin_key] from the admins list [use_db ? "permanently" : "temporarily"]" var/m2 = "[key_name(usr)] removed [admin_key] from the admins list [use_db ? "permanently" : "temporarily"]" if(use_db) - var/datum/DBQuery/query_add_rank = SSdbcore.NewQuery( + var/datum/db_query/query_add_rank = SSdbcore.NewQuery( "DELETE FROM [format_table_name("admin")] WHERE ckey = :ckey", list("ckey" = admin_ckey) ) @@ -263,7 +263,7 @@ qdel(query_add_rank) return qdel(query_add_rank) - var/datum/DBQuery/query_add_rank_log = SSdbcore.NewQuery({" + var/datum/db_query/query_add_rank_log = SSdbcore.NewQuery({" INSERT INTO [format_table_name("admin_log")] (datetime, round_id, adminckey, adminip, operation, target, log) VALUES (:time, :round_id, :adminckey, INET_ATON(:adminip), 'remove admin', :admin_ckey, CONCAT('Admin removed: ', :admin_ckey)) "}, list("time" = SQLtime(), "round_id" = "[GLOB.round_id]", "adminckey" = usr.ckey, "adminip" = usr.client.address, "admin_ckey" = admin_ckey)) @@ -322,7 +322,7 @@ if(use_db) //if a player was tempminned before having a permanent change made to their rank they won't yet be in the db var/old_rank - var/datum/DBQuery/query_admin_in_db = SSdbcore.NewQuery( + var/datum/db_query/query_admin_in_db = SSdbcore.NewQuery( "SELECT `rank` FROM [format_table_name("admin")] WHERE ckey = :admin_ckey", list("admin_ckey" = admin_ckey) ) @@ -336,7 +336,7 @@ old_rank = query_admin_in_db.item[1] qdel(query_admin_in_db) //similarly if a temp rank is created it won't be in the db if someone is permanently changed to it - var/datum/DBQuery/query_rank_in_db = SSdbcore.NewQuery( + var/datum/db_query/query_rank_in_db = SSdbcore.NewQuery( "SELECT 1 FROM [format_table_name("admin_ranks")] WHERE `rank` = :new_rank", list("new_rank" = new_rank) ) @@ -345,7 +345,7 @@ return if(!query_rank_in_db.NextRow()) QDEL_NULL(query_rank_in_db) - var/datum/DBQuery/query_add_rank = SSdbcore.NewQuery({" + var/datum/db_query/query_add_rank = SSdbcore.NewQuery({" INSERT INTO [format_table_name("admin_ranks")] (`rank`, flags, exclude_flags, can_edit_flags) VALUES (:new_rank, '0', '0', '0') "}, list("new_rank" = new_rank)) @@ -353,7 +353,7 @@ qdel(query_add_rank) return qdel(query_add_rank) - var/datum/DBQuery/query_add_rank_log = SSdbcore.NewQuery({" + var/datum/db_query/query_add_rank_log = SSdbcore.NewQuery({" INSERT INTO [format_table_name("admin_log")] (datetime, round_id, adminckey, adminip, operation, target, log) VALUES (:time, :round_id, :adminckey, INET_ATON(:adminip), 'add rank', :new_rank, CONCAT('New rank added: ', :new_rank)) "}, list("time" = SQLtime(), "round_id" = "[GLOB.round_id]", "adminckey" = usr.ckey, "adminip" = usr.client.address, "new_rank" = new_rank)) @@ -362,7 +362,7 @@ return qdel(query_add_rank_log) qdel(query_rank_in_db) - var/datum/DBQuery/query_change_rank = SSdbcore.NewQuery( + var/datum/db_query/query_change_rank = SSdbcore.NewQuery( "UPDATE [format_table_name("admin")] SET `rank` = :new_rank WHERE ckey = :admin_ckey", list("new_rank" = new_rank, "admin_ckey" = admin_ckey) ) @@ -370,7 +370,7 @@ qdel(query_change_rank) return qdel(query_change_rank) - var/datum/DBQuery/query_change_rank_log = SSdbcore.NewQuery({" + var/datum/db_query/query_change_rank_log = SSdbcore.NewQuery({" INSERT INTO [format_table_name("admin_log")] (datetime, round_id, adminckey, adminip, operation, target, log) VALUES (:time, :round_id, :adminckey, INET_ATON(:adminip), 'change admin rank', :target, CONCAT('Rank of ', :target, ' changed from ', :old_rank, ' to ', :new_rank)) "}, list("time" = SQLtime(), "round_id" = "[GLOB.round_id]", "adminckey" = usr.ckey, "adminip" = usr.client.address, "target" = admin_ckey, "old_rank" = old_rank, "new_rank" = new_rank)) @@ -405,7 +405,7 @@ var/old_flags var/old_exclude_flags var/old_can_edit_flags - var/datum/DBQuery/query_get_rank_flags = SSdbcore.NewQuery( + var/datum/db_query/query_get_rank_flags = SSdbcore.NewQuery( "SELECT flags, exclude_flags, can_edit_flags FROM [format_table_name("admin_ranks")] WHERE `rank` = :rank_name", list("rank_name" = rank_name) ) @@ -417,7 +417,7 @@ old_exclude_flags = text2num(query_get_rank_flags.item[2]) old_can_edit_flags = text2num(query_get_rank_flags.item[3]) qdel(query_get_rank_flags) - var/datum/DBQuery/query_change_rank_flags = SSdbcore.NewQuery( + var/datum/db_query/query_change_rank_flags = SSdbcore.NewQuery( "UPDATE [format_table_name("admin_ranks")] SET flags = :new_flags, exclude_flags = :new_exclude_flags, can_edit_flags = :new_can_edit_flags WHERE `rank` = :rank_name", list("new_flags" = new_flags, "new_exclude_flags" = new_exclude_flags, "new_can_edit_flags" = new_can_edit_flags, "rank_name" = rank_name) ) @@ -426,7 +426,7 @@ return qdel(query_change_rank_flags) var/log_message = "Permissions of [rank_name] changed from[rights2text(old_flags," ")][rights2text(old_exclude_flags," ", "-")][rights2text(old_can_edit_flags," ", "*")] to[rights2text(new_flags," ")][rights2text(new_exclude_flags," ", "-")][rights2text(new_can_edit_flags," ", "*")]" - var/datum/DBQuery/query_change_rank_flags_log = SSdbcore.NewQuery({" + var/datum/db_query/query_change_rank_flags_log = SSdbcore.NewQuery({" INSERT INTO [format_table_name("admin_log")] (datetime, round_id, adminckey, adminip, operation, target, log) VALUES (:time, :round_id, :adminckey, INET_ATON(:adminip), 'change rank flags', :rank_name, :log) "}, list("time" = SQLtime(), "round_id" = "[GLOB.round_id]", "adminckey" = usr.ckey, "adminip" = usr.client.address, "rank_name" = rank_name, "log" = log_message)) @@ -480,7 +480,7 @@ if(CONFIG_GET(flag/load_legacy_ranks_only)) to_chat(usr, "Rank deletion not permitted while database rank loading is disabled.", confidential = TRUE) return - var/datum/DBQuery/query_admins_with_rank = SSdbcore.NewQuery( + var/datum/db_query/query_admins_with_rank = SSdbcore.NewQuery( "SELECT 1 FROM [format_table_name("admin")] WHERE `rank` = :admin_rank", list("admin_rank" = admin_rank) ) @@ -495,7 +495,7 @@ if(alert("Are you sure you want to remove [admin_rank]?","Confirm Removal","Do it","Cancel") == "Do it") var/m1 = "[key_name_admin(usr)] removed rank [admin_rank] permanently" var/m2 = "[key_name(usr)] removed rank [admin_rank] permanently" - var/datum/DBQuery/query_add_rank = SSdbcore.NewQuery( + var/datum/db_query/query_add_rank = SSdbcore.NewQuery( "DELETE FROM [format_table_name("admin_ranks")] WHERE `rank` = :admin_rank", list("admin_rank" = admin_rank) ) @@ -503,7 +503,7 @@ qdel(query_add_rank) return qdel(query_add_rank) - var/datum/DBQuery/query_add_rank_log = SSdbcore.NewQuery({" + var/datum/db_query/query_add_rank_log = SSdbcore.NewQuery({" INSERT INTO [format_table_name("admin_log")] (datetime, round_id, adminckey, adminip, operation, target, log) VALUES (:time, :round_id, :adminckey, INET_ATON(:adminip), 'remove rank', :admin_rank, CONCAT('Rank removed: ', :admin_rank)) "}, list("time" = SQLtime(), "round_id" = "[GLOB.round_id]", "adminckey" = usr.ckey, "adminip" = usr.client.address, "admin_rank" = admin_rank)) @@ -518,7 +518,7 @@ var/sqlrank = "Player" if (D) sqlrank = D.rank.name - var/datum/DBQuery/query_sync_lastadminrank = SSdbcore.NewQuery( + var/datum/db_query/query_sync_lastadminrank = SSdbcore.NewQuery( "UPDATE [format_table_name("player")] SET lastadminrank = :rank WHERE ckey = :ckey", list("rank" = sqlrank, "ckey" = admin_ckey) ) diff --git a/code/modules/admin/poll_management.dm b/code/modules/admin/poll_management.dm index 16dbaf0d356..c14727813cb 100644 --- a/code/modules/admin/poll_management.dm +++ b/code/modules/admin/poll_management.dm @@ -356,7 +356,7 @@ if(!SSdbcore.Connect()) to_chat(usr, "Failed to establish database connection.", confidential = TRUE) return - var/datum/DBQuery/query_delete_poll = SSdbcore.NewQuery( + var/datum/db_query/query_delete_poll = SSdbcore.NewQuery( "CALL set_poll_deleted(:poll_id)", list("poll_id" = poll_id) ) @@ -399,7 +399,7 @@ var/kn = key_name(usr) var/kna = key_name_admin(usr) - var/datum/DBQuery/query_save_poll = SSdbcore.NewQuery({" + var/datum/db_query/query_save_poll = SSdbcore.NewQuery({" INSERT INTO [format_table_name("poll_question")] (id, polltype, created_datetime, starttime, endtime, question, subtitle, adminonly, multiplechoiceoptions, createdby_ckey, createdby_ip, dontshow, allow_revoting) VALUES (:poll_id, :poll_type, NOW(), COALESCE(:start_datetime, NOW()), [end_datetime_sql], :question, :subtitle, :admin_only, :options_allowed, :admin_ckey, INET_ATON(:admin_ip), :dont_show, :allow_revoting) ON DUPLICATE KEY UPDATE starttime = :start_datetime, endtime = [end_datetime_sql], question = :question, subtitle = :subtitle, adminonly = :admin_only, multiplechoiceoptions = :options_allowed, dontshow = :dont_show, allow_revoting = :allow_revoting @@ -414,7 +414,7 @@ if (!poll_id) poll_id = query_save_poll.last_insert_id qdel(query_save_poll) - var/datum/DBQuery/query_get_poll_id_start_endtime = SSdbcore.NewQuery( + var/datum/db_query/query_get_poll_id_start_endtime = SSdbcore.NewQuery( "SELECT starttime, endtime, IF(starttime > NOW(), 1, 0) FROM [format_table_name("poll_question")] WHERE id = :poll_id", list("poll_id" = poll_id) ) @@ -465,7 +465,7 @@ var/table = "poll_vote" if(poll_type == POLLTYPE_TEXT) table = "poll_textreply" - var/datum/DBQuery/query_clear_poll_votes = SSdbcore.NewQuery( + var/datum/db_query/query_clear_poll_votes = SSdbcore.NewQuery( "UPDATE [format_table_name(table)] SET deleted = 1 WHERE pollid = :poll_id", list("poll_id" = poll_id) ) @@ -656,7 +656,7 @@ for (var/k in values) update_data += "[k] = VALUES([k])" - var/datum/DBQuery/query_update_poll_option = SSdbcore.NewQuery( + var/datum/db_query/query_update_poll_option = SSdbcore.NewQuery( "INSERT INTO [format_table_name("poll_option")] ([jointext(values, ",")]) VALUES (:[jointext(values, ",:")]) ON DUPLICATE KEY UPDATE [jointext(update_data, ", ")]", values ) @@ -679,7 +679,7 @@ if(!SSdbcore.Connect()) to_chat(usr, "Failed to establish database connection.", confidential = TRUE) return - var/datum/DBQuery/query_delete_poll_option = SSdbcore.NewQuery( + var/datum/db_query/query_delete_poll_option = SSdbcore.NewQuery( "UPDATE [format_table_name("poll_option")] AS o INNER JOIN [format_table_name("poll_vote")] AS v ON o.id = v.optionid SET o.deleted = 1, v.deleted = 1 WHERE o.id = :option_id", list("option_id" = option_id) ) @@ -697,7 +697,7 @@ if(!SSdbcore.Connect()) to_chat(usr, "Failed to establish database connection.", confidential = TRUE) return - var/datum/DBQuery/query_load_polls = SSdbcore.NewQuery("SELECT id, polltype, starttime, endtime, question, subtitle, adminonly, multiplechoiceoptions, dontshow, allow_revoting, IF(polltype='TEXT',(SELECT COUNT(ckey) FROM [format_table_name("poll_textreply")] AS t WHERE t.pollid = q.id AND deleted = 0), (SELECT COUNT(DISTINCT ckey) FROM [format_table_name("poll_vote")] AS v WHERE v.pollid = q.id AND deleted = 0)), IFNULL((SELECT byond_key FROM [format_table_name("player")] AS p WHERE p.ckey = q.createdby_ckey), createdby_ckey), IF(starttime > NOW(), 1, 0) FROM [format_table_name("poll_question")] AS q WHERE NOW() < endtime AND deleted = 0") + var/datum/db_query/query_load_polls = SSdbcore.NewQuery("SELECT id, polltype, starttime, endtime, question, subtitle, adminonly, multiplechoiceoptions, dontshow, allow_revoting, IF(polltype='TEXT',(SELECT COUNT(ckey) FROM [format_table_name("poll_textreply")] AS t WHERE t.pollid = q.id AND deleted = 0), (SELECT COUNT(DISTINCT ckey) FROM [format_table_name("poll_vote")] AS v WHERE v.pollid = q.id AND deleted = 0)), IFNULL((SELECT byond_key FROM [format_table_name("player")] AS p WHERE p.ckey = q.createdby_ckey), createdby_ckey), IF(starttime > NOW(), 1, 0) FROM [format_table_name("poll_question")] AS q WHERE NOW() < endtime AND deleted = 0") if(!query_load_polls.Execute()) qdel(query_load_polls) return @@ -707,7 +707,7 @@ poll_ids += query_load_polls.item[1] qdel(query_load_polls) if(length(poll_ids)) - var/datum/DBQuery/query_load_poll_options = SSdbcore.NewQuery("SELECT id, text, minval, maxval, descmin, descmid, descmax, default_percentage_calc, pollid FROM [format_table_name("poll_option")] WHERE pollid IN ([jointext(poll_ids, ",")])") + var/datum/db_query/query_load_poll_options = SSdbcore.NewQuery("SELECT id, text, minval, maxval, descmin, descmid, descmax, default_percentage_calc, pollid FROM [format_table_name("poll_option")] WHERE pollid IN ([jointext(poll_ids, ",")])") if(!query_load_poll_options.Execute()) qdel(query_load_poll_options) return diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index b845a5c1441..d4922e8299c 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -31,7 +31,7 @@ else values["role"] = roles sql_roles = ":role" - var/datum/DBQuery/query_check_ban = SSdbcore.NewQuery({" + var/datum/db_query/query_check_ban = SSdbcore.NewQuery({" SELECT 1 FROM [format_table_name("ban")] WHERE @@ -54,7 +54,7 @@ /proc/is_banned_from_with_details(player_ckey, player_ip, player_cid, role) if(!player_ckey && !player_ip && !player_cid) return - var/datum/DBQuery/query_check_ban = SSdbcore.NewQuery({" + var/datum/db_query/query_check_ban = SSdbcore.NewQuery({" SELECT id, bantime, @@ -90,7 +90,7 @@ var/is_admin = FALSE if(GLOB.admin_datums[C.ckey] || GLOB.deadmins[C.ckey]) is_admin = TRUE - var/datum/DBQuery/query_build_ban_cache = SSdbcore.NewQuery( + var/datum/db_query/query_build_ban_cache = SSdbcore.NewQuery( "SELECT role, applies_to_admins FROM [format_table_name("ban")] WHERE ckey = :ckey AND unbanned_datetime IS NULL AND (expiration_time IS NULL OR expiration_time > NOW())", list("ckey" = C.ckey) ) @@ -216,7 +216,7 @@ //there's not always a client to use the bancache of so to avoid many individual queries from using is_banned_form we'll build a cache to use here var/banned_from = list() if(player_key) - var/datum/DBQuery/query_get_banned_roles = SSdbcore.NewQuery({" + var/datum/db_query/query_get_banned_roles = SSdbcore.NewQuery({" SELECT role FROM [format_table_name("ban")] WHERE @@ -433,7 +433,7 @@ return var/player_ckey = ckey(player_key) if(player_ckey) - var/datum/DBQuery/query_create_ban_get_player = SSdbcore.NewQuery({" + var/datum/db_query/query_create_ban_get_player = SSdbcore.NewQuery({" SELECT byond_key, INET_NTOA(ip), computerid FROM [format_table_name("player")] WHERE ckey = :player_ckey "}, list("player_ckey" = player_ckey)) if(!query_create_ban_get_player.warn_execute()) @@ -458,7 +458,7 @@ qdel(query_create_ban_get_player) var/admin_ckey = usr.client.ckey if(applies_to_admins) - var/datum/DBQuery/query_check_adminban_count = SSdbcore.NewQuery({" + var/datum/db_query/query_check_adminban_count = SSdbcore.NewQuery({" SELECT COUNT(DISTINCT bantime) FROM [format_table_name("ban")] WHERE @@ -582,7 +582,7 @@ var/bancount = 0 var/bansperpage = 10 page = text2num(page) - var/datum/DBQuery/query_unban_count_bans = SSdbcore.NewQuery({" + var/datum/db_query/query_unban_count_bans = SSdbcore.NewQuery({" SELECT COUNT(id) FROM [format_table_name("ban")] WHERE @@ -611,7 +611,7 @@ bancount -= bansperpage pagecount++ output += pagelist.Join(" | ") - var/datum/DBQuery/query_unban_search_bans = SSdbcore.NewQuery({" + var/datum/db_query/query_unban_search_bans = SSdbcore.NewQuery({" SELECT id, bantime, @@ -712,7 +712,7 @@ return var/kn = key_name(usr) var/kna = key_name_admin(usr) - var/datum/DBQuery/query_unban = SSdbcore.NewQuery({" + var/datum/db_query/query_unban = SSdbcore.NewQuery({" UPDATE [format_table_name("ban")] SET unbanned_datetime = NOW(), unbanned_ckey = :admin_ckey, @@ -746,7 +746,7 @@ var/player_ckey = ckey(player_key) var/bantime if(player_ckey) - var/datum/DBQuery/query_edit_ban_get_player = SSdbcore.NewQuery({" + var/datum/db_query/query_edit_ban_get_player = SSdbcore.NewQuery({" SELECT byond_key, (SELECT bantime FROM [format_table_name("ban")] WHERE id = :ban_id), @@ -777,7 +777,7 @@ return qdel(query_edit_ban_get_player) if(applies_to_admins && (applies_to_admins != old_applies)) - var/datum/DBQuery/query_check_adminban_count = SSdbcore.NewQuery({" + var/datum/db_query/query_check_adminban_count = SSdbcore.NewQuery({" SELECT COUNT(DISTINCT bantime) FROM [format_table_name("ban")] WHERE a_ckey = :admin_ckey @@ -835,7 +835,7 @@ where = "id = :ban_id" arguments["ban_id"] = ban_id - var/datum/DBQuery/query_edit_ban = SSdbcore.NewQuery({" + var/datum/db_query/query_edit_ban = SSdbcore.NewQuery({" UPDATE [format_table_name("ban")] SET expiration_time = IF(:duration IS NULL, NULL, bantime + INTERVAL :duration [interval]) @@ -875,7 +875,7 @@ if(!SSdbcore.Connect()) to_chat(usr, "Failed to establish database connection.", confidential = TRUE) return - var/datum/DBQuery/query_get_ban_edits = SSdbcore.NewQuery({" + var/datum/db_query/query_get_ban_edits = SSdbcore.NewQuery({" SELECT edits FROM [format_table_name("ban")] WHERE id = :ban_id "}, list("ban_id" = ban_id)) if(!query_get_ban_edits.warn_execute()) diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm index f41718f405c..3ba309bc24a 100644 --- a/code/modules/admin/sql_message_system.dm +++ b/code/modules/admin/sql_message_system.dm @@ -10,7 +10,7 @@ if(!new_key) return var/new_ckey = ckey(new_key) - var/datum/DBQuery/query_find_ckey = SSdbcore.NewQuery( + var/datum/db_query/query_find_ckey = SSdbcore.NewQuery( "SELECT ckey FROM [format_table_name("player")] WHERE ckey = :ckey", list("ckey" = new_ckey) ) @@ -57,7 +57,7 @@ var/expire_time = input("Set expiry time for [type] as format YYYY-MM-DD HH:MM:SS. All times in server time. HH:MM:SS is optional and 24-hour. Must be later than current time for obvious reasons.", "Set expiry time", SQLtime()) as null|text if(!expire_time) return - var/datum/DBQuery/query_validate_expire_time = SSdbcore.NewQuery( + var/datum/db_query/query_validate_expire_time = SSdbcore.NewQuery( "SELECT IF(STR_TO_DATE(:expire_time,'%Y-%c-%d %T') > NOW(), STR_TO_DATE(:expire_time,'%Y-%c-%d %T'), 0)", list("expire_time" = expire_time) ) @@ -76,7 +76,7 @@ note_severity = input("Set the severity of the note.", "Severity", null, null) as null|anything in list("High", "Medium", "Minor", "None") if(!note_severity) return - var/datum/DBQuery/query_create_message = SSdbcore.NewQuery({" + var/datum/db_query/query_create_message = SSdbcore.NewQuery({" INSERT INTO [format_table_name("messages")] (type, targetckey, adminckey, text, timestamp, server, server_ip, server_port, round_id, secret, expire_timestamp, severity) VALUES (:type, :target_ckey, :admin_ckey, :text, :timestamp, :server, INET_ATON(:internet_address), :port, :round_id, :secret, :expiry, :note_severity) "}, list( @@ -122,7 +122,7 @@ var/user_key_name = key_name(usr) var/user_name_admin = key_name_admin(usr) var/deleted_by_ckey = usr.ckey - var/datum/DBQuery/query_find_del_message = SSdbcore.NewQuery( + var/datum/db_query/query_find_del_message = SSdbcore.NewQuery( "SELECT type, IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = targetckey), targetckey), text FROM [format_table_name("messages")] WHERE id = :id AND deleted = 0", list("id" = message_id) ) @@ -134,7 +134,7 @@ target_key = query_find_del_message.item[2] text = query_find_del_message.item[3] qdel(query_find_del_message) - var/datum/DBQuery/query_del_message = SSdbcore.NewQuery( + var/datum/db_query/query_del_message = SSdbcore.NewQuery( "UPDATE [format_table_name("messages")] SET deleted = 1, deleted_ckey = :deleted_ckey WHERE id = :id", list("deleted_ckey" = deleted_by_ckey, "id" = message_id) ) @@ -163,7 +163,7 @@ var/editor_key = usr.key var/kn = key_name(usr) var/kna = key_name_admin(usr) - var/datum/DBQuery/query_find_edit_message = SSdbcore.NewQuery({" + var/datum/db_query/query_find_edit_message = SSdbcore.NewQuery({" SELECT type, IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = targetckey), targetckey), @@ -185,7 +185,7 @@ qdel(query_find_edit_message) return var/edit_text = "Edited by [editor_key] on [SQLtime()] from
[old_text]
to
[new_text]
" - var/datum/DBQuery/query_edit_message = SSdbcore.NewQuery({" + var/datum/db_query/query_edit_message = SSdbcore.NewQuery({" UPDATE [format_table_name("messages")] SET text = :text, lasteditor = :lasteditor, edits = CONCAT(IFNULL(edits,''),:edit_text) WHERE id = :id AND deleted = 0 @@ -213,7 +213,7 @@ var/editor_key = usr.key var/kn = key_name(usr) var/kna = key_name_admin(usr) - var/datum/DBQuery/query_find_edit_expiry_message = SSdbcore.NewQuery({" + var/datum/db_query/query_find_edit_expiry_message = SSdbcore.NewQuery({" SELECT type, IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = targetckey), targetckey), @@ -238,7 +238,7 @@ if(expire_time == "-1") new_expiry = "non-expiring" else - var/datum/DBQuery/query_validate_expire_time_edit = SSdbcore.NewQuery({" + var/datum/db_query/query_validate_expire_time_edit = SSdbcore.NewQuery({" SELECT IF(STR_TO_DATE(:expire_time,'%Y-%c-%d %T') > NOW(), STR_TO_DATE(:expire_time,'%Y-%c-%d %T'), 0) "}, list("expire_time" = expire_time)) if(!query_validate_expire_time_edit.warn_execute()) @@ -255,7 +255,7 @@ new_expiry = query_validate_expire_time_edit.item[1] qdel(query_validate_expire_time_edit) var/edit_text = "Expiration time edited by [editor_key] on [SQLtime()] from [old_expiry] to [new_expiry]
" - var/datum/DBQuery/query_edit_message_expiry = SSdbcore.NewQuery({" + var/datum/db_query/query_edit_message_expiry = SSdbcore.NewQuery({" UPDATE [format_table_name("messages")] SET expire_timestamp = :expire_time, lasteditor = :lasteditor, edits = CONCAT(IFNULL(edits,''),:edit_text) WHERE id = :id AND deleted = 0 @@ -282,7 +282,7 @@ return var/kn = key_name(usr) var/kna = key_name_admin(usr) - var/datum/DBQuery/query_find_edit_note_severity = SSdbcore.NewQuery({" + var/datum/db_query/query_find_edit_note_severity = SSdbcore.NewQuery({" SELECT type, IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = targetckey), targetckey), @@ -309,7 +309,7 @@ return new_severity = new_severity var/edit_text = "Note severity edited by [editor_key] on [SQLtime()] from [old_severity] to [new_severity]
" - var/datum/DBQuery/query_edit_note_severity = SSdbcore.NewQuery({" + var/datum/db_query/query_edit_note_severity = SSdbcore.NewQuery({" UPDATE [format_table_name("messages")] SET severity = :severity, lasteditor = :lasteditor, edits = CONCAT(IFNULL(edits,''),:edit_text) WHERE id = :id AND deleted = 0 @@ -335,7 +335,7 @@ var/editor_key = usr.key var/kn = key_name(usr) var/kna = key_name_admin(usr) - var/datum/DBQuery/query_find_message_secret = SSdbcore.NewQuery({" + var/datum/db_query/query_find_message_secret = SSdbcore.NewQuery({" SELECT type, IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = targetckey), targetckey), @@ -353,7 +353,7 @@ var/admin_key = query_find_message_secret.item[3] var/secret = text2num(query_find_message_secret.item[4]) var/edit_text = "Made [secret ? "not secret" : "secret"] by [editor_key] on [SQLtime()]
" - var/datum/DBQuery/query_message_secret = SSdbcore.NewQuery({" + var/datum/db_query/query_message_secret = SSdbcore.NewQuery({" UPDATE [format_table_name("messages")] SET secret = NOT secret, lasteditor = :lasteditor, edits = CONCAT(IFNULL(edits,''),:edit_text) WHERE id = :id @@ -397,7 +397,7 @@ else output += "Filter offline clients" output += ruler - var/datum/DBQuery/query_get_type_messages = SSdbcore.NewQuery({" + var/datum/db_query/query_get_type_messages = SSdbcore.NewQuery({" SELECT id, IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = targetckey), targetckey), @@ -444,7 +444,7 @@ qdel(query_get_type_messages) if(target_ckey) var/target_key - var/datum/DBQuery/query_get_messages = SSdbcore.NewQuery({" + var/datum/db_query/query_get_messages = SSdbcore.NewQuery({" SELECT type, secret, @@ -538,7 +538,7 @@ notedata += data qdel(query_get_messages) if(!target_key) - var/datum/DBQuery/query_get_message_key = SSdbcore.NewQuery({" + var/datum/db_query/query_get_message_key = SSdbcore.NewQuery({" SELECT byond_key FROM [format_table_name("player")] WHERE ckey = :ckey "}, list("ckey" = target_ckey)) if(!query_get_message_key.warn_execute()) @@ -584,7 +584,7 @@ search = "^\[^\[:alpha:\]\]" else search = "^[index]" - var/datum/DBQuery/query_list_messages = SSdbcore.NewQuery({" + var/datum/db_query/query_list_messages = SSdbcore.NewQuery({" SELECT DISTINCT targetckey, (SELECT byond_key FROM [format_table_name("player")] WHERE ckey = targetckey) @@ -623,7 +623,7 @@ if(!type) return var/output - var/datum/DBQuery/query_get_message_output = SSdbcore.NewQuery({" + var/datum/db_query/query_get_message_output = SSdbcore.NewQuery({" SELECT id, IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = adminckey), adminckey), @@ -649,7 +649,7 @@ if("message") output += "Admin message left by [admin_key] on [timestamp]" output += "
[text]
" - var/datum/DBQuery/query_message_read = SSdbcore.NewQuery( + var/datum/db_query/query_message_read = SSdbcore.NewQuery( "UPDATE [format_table_name("messages")] SET type = 'message sent' WHERE id = :id", list("id" = message_id) ) @@ -692,7 +692,7 @@ var/timestamp = note.group[1] notetext = note.group[2] var/admin_ckey = note.group[3] - var/datum/DBQuery/query_convert_time = SSdbcore.NewQuery("SELECT ADDTIME(STR_TO_DATE(:timestamp,'%d-%b-%Y'), '0')", list("timestamp" = timestamp)) + var/datum/db_query/query_convert_time = SSdbcore.NewQuery("SELECT ADDTIME(STR_TO_DATE(:timestamp,'%d-%b-%Y'), '0')", list("timestamp" = timestamp)) if(!query_convert_time.Execute()) qdel(query_convert_time) return diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 0cad328a97a..cdc17b84e20 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -33,7 +33,7 @@ ban["message"] = "[reason]" if(SSdbcore.Connect()) - var/datum/DBQuery/query_create_stickyban = SSdbcore.NewQuery({" + var/datum/db_query/query_create_stickyban = SSdbcore.NewQuery({" INSERT INTO [format_table_name("stickyban")] (ckey, reason, banning_admin) VALUES (:ckey, :message, :banning_admin) "}, list("ckey" = ckey, "message" = ban["message"], "banning_admin" = usr.ckey)) @@ -119,7 +119,7 @@ SSstickyban.cache[ckey] = ban if (SSdbcore.Connect()) - var/datum/DBQuery/query_remove_stickyban_alt = SSdbcore.NewQuery( + var/datum/db_query/query_remove_stickyban_alt = SSdbcore.NewQuery( "DELETE FROM [format_table_name("stickyban_matched_ckey")] WHERE stickyban = :ckey AND matched_ckey = :alt", list("ckey" = ckey, "alt" = alt) ) @@ -153,7 +153,7 @@ SSstickyban.cache[ckey] = ban if (SSdbcore.Connect()) - var/datum/DBQuery/query_edit_stickyban = SSdbcore.NewQuery( + var/datum/db_query/query_edit_stickyban = SSdbcore.NewQuery( "UPDATE [format_table_name("stickyban")] SET reason = :reason WHERE ckey = :ckey", list("reason" = reason, "ckey" = ckey) ) @@ -203,7 +203,7 @@ SSstickyban.cache[ckey] = ban if (SSdbcore.Connect()) - var/datum/DBQuery/query_exempt_stickyban_alt = SSdbcore.NewQuery( + var/datum/db_query/query_exempt_stickyban_alt = SSdbcore.NewQuery( "UPDATE [format_table_name("stickyban_matched_ckey")] SET exempt = 1 WHERE stickyban = :ckey AND matched_ckey = :alt", list("ckey" = ckey, "alt" = alt) ) @@ -253,7 +253,7 @@ SSstickyban.cache[ckey] = ban if (SSdbcore.Connect()) - var/datum/DBQuery/query_unexempt_stickyban_alt = SSdbcore.NewQuery( + var/datum/db_query/query_unexempt_stickyban_alt = SSdbcore.NewQuery( "UPDATE [format_table_name("stickyban_matched_ckey")] SET exempt = 0 WHERE stickyban = :ckey AND matched_ckey = :alt", list("ckey" = ckey, "alt" = alt) ) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 3a723dc9d60..12cc7d03783 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -390,21 +390,21 @@ if("cat") M.change_mob_type( /mob/living/simple_animal/pet/cat , null, null, delmob ) if("runtime") - M.change_mob_type( /mob/living/simple_animal/pet/cat/Runtime , null, null, delmob ) + M.change_mob_type( /mob/living/simple_animal/pet/cat/runtime , null, null, delmob ) if("corgi") M.change_mob_type( /mob/living/simple_animal/pet/dog/corgi , null, null, delmob ) if("ian") - M.change_mob_type( /mob/living/simple_animal/pet/dog/corgi/Ian , null, null, delmob ) + M.change_mob_type( /mob/living/simple_animal/pet/dog/corgi/ian , null, null, delmob ) if("pug") M.change_mob_type( /mob/living/simple_animal/pet/dog/pug , null, null, delmob ) if("crab") M.change_mob_type( /mob/living/simple_animal/crab , null, null, delmob ) if("coffee") - M.change_mob_type( /mob/living/simple_animal/crab/Coffee , null, null, delmob ) + M.change_mob_type( /mob/living/simple_animal/crab/coffee , null, null, delmob ) if("parrot") M.change_mob_type( /mob/living/simple_animal/parrot , null, null, delmob ) if("polyparrot") - M.change_mob_type( /mob/living/simple_animal/parrot/Poly , null, null, delmob ) + M.change_mob_type( /mob/living/simple_animal/parrot/poly , null, null, delmob ) if("constructjuggernaut") M.change_mob_type( /mob/living/simple_animal/hostile/construct/juggernaut , null, null, delmob ) if("constructartificer") @@ -575,7 +575,7 @@ else if(href_list["messageedits"]) if(!check_rights(R_ADMIN)) return - var/datum/DBQuery/query_get_message_edits = SSdbcore.NewQuery( + var/datum/db_query/query_get_message_edits = SSdbcore.NewQuery( "SELECT edits FROM [format_table_name("messages")] WHERE id = :message_id", list("message_id" = href_list["messageedits"]) ) @@ -1701,7 +1701,7 @@ R.activate_module(I) if(pod) - new /obj/effect/DPtarget(target, pod) + new /obj/effect/dp_target(target, pod) if (number == 1) log_admin("[key_name(usr)] created a [english_list(paths)]") diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 8a770fa875f..0d9d3423645 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -230,11 +230,11 @@ var/list/querys = SDQL_parse(query_list) if(!length(querys)) return - var/list/datum/SDQL2_query/running = list() - var/list/datum/SDQL2_query/waiting_queue = list() //Sequential queries queue. + var/list/datum/sdql2_query/running = list() + var/list/datum/sdql2_query/waiting_queue = list() //Sequential queries queue. for(var/list/query_tree in querys) - var/datum/SDQL2_query/query = new /datum/SDQL2_query(query_tree) + var/datum/sdql2_query/query = new /datum/sdql2_query(query_tree) if(QDELETED(query)) continue if(usr) @@ -244,7 +244,7 @@ sequential = TRUE if(sequential) //Start first one - var/datum/SDQL2_query/query = popleft(waiting_queue) + var/datum/sdql2_query/query = popleft(waiting_queue) running += query var/msg = "Starting query #[query.id] - [query.get_query_text()]." if(usr) @@ -252,7 +252,7 @@ log_admin(msg) query.ARun() else //Start all - for(var/datum/SDQL2_query/query in waiting_queue) + for(var/datum/sdql2_query/query in waiting_queue) running += query var/msg = "Starting query #[query.id] - [query.get_query_text()]." if(usr) @@ -269,7 +269,7 @@ CHECK_TICK finished = TRUE for(var/i in running) - var/datum/SDQL2_query/query = i + var/datum/sdql2_query/query = i if(QDELETED(query)) running -= query continue @@ -290,7 +290,7 @@ QDEL_IN(query, 50) if(sequential && waiting_queue.len) finished = FALSE - var/datum/SDQL2_query/next_query = popleft(waiting_queue) + var/datum/sdql2_query/next_query = popleft(waiting_queue) running += next_query var/msg = "Starting query #[next_query.id] - [next_query.get_query_text()]." if(usr) @@ -309,9 +309,9 @@ "SDQL combined querys took [DisplayTimeText(end_time_total)] to complete.") + combined_refs GLOBAL_LIST_INIT(sdql2_queries, GLOB.sdql2_queries || list()) -GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null, "VIEW VARIABLES (all)", null)) +GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null, "VIEW VARIABLES (all)", null)) -/datum/SDQL2_query +/datum/sdql2_query var/list/query_tree var/state = SDQL2_STATE_IDLE var/options = SDQL2_OPTIONS_DEFAULT @@ -342,7 +342,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null var/obj/effect/statclick/SDQL2_delete/delete_click var/obj/effect/statclick/SDQL2_action/action_click -/datum/SDQL2_query/New(list/tree, SU = FALSE, admin_interact = TRUE, _options = SDQL2_OPTIONS_DEFAULT, finished_qdel = FALSE) +/datum/sdql2_query/New(list/tree, SU = FALSE, admin_interact = TRUE, _options = SDQL2_OPTIONS_DEFAULT, finished_qdel = FALSE) if(IsAdminAdvancedProcCall() || !LAZYLEN(tree)) qdel(src) return @@ -354,7 +354,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null id = id_assign++ qdel_on_finish = finished_qdel -/datum/SDQL2_query/Destroy() +/datum/sdql2_query/Destroy() state = SDQL2_STATE_HALTING query_tree = null obj_count_all = null @@ -365,7 +365,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null GLOB.sdql2_queries -= src return ..() -/datum/SDQL2_query/proc/get_query_text() +/datum/sdql2_query/proc/get_query_text() var/list/out = list() recursive_list_print(out, query_tree) return out.Join() @@ -406,7 +406,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null output += " \]" -/datum/SDQL2_query/proc/text_state() +/datum/sdql2_query/proc/text_state() switch(state) if(SDQL2_STATE_ERROR) return "###ERROR" @@ -423,7 +423,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null if(SDQL2_STATE_HALTING) return "##HALTING" -/datum/SDQL2_query/proc/generate_stat() +/datum/sdql2_query/proc/generate_stat() if(!allow_admin_interact) return if(!delete_click) @@ -436,16 +436,16 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null [islist(obj_count_finished)? length(obj_count_finished) : (isnull(obj_count_finished)? "0" : obj_count_finished)] - [get_query_text()]")) stat(" ", action_click.update("[SDQL2_IS_RUNNING? "HALT" : "RUN"]")) -/datum/SDQL2_query/proc/delete_click() +/datum/sdql2_query/proc/delete_click() admin_del(usr) -/datum/SDQL2_query/proc/action_click() +/datum/sdql2_query/proc/action_click() if(SDQL2_IS_RUNNING) admin_halt(usr) else admin_run(usr) -/datum/SDQL2_query/proc/admin_halt(user = usr) +/datum/sdql2_query/proc/admin_halt(user = usr) if(!SDQL2_IS_RUNNING) return var/msg = "[key_name(user)] has halted query #[id]" @@ -453,7 +453,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null log_admin(msg) state = SDQL2_STATE_HALTING -/datum/SDQL2_query/proc/admin_run(mob/user = usr) +/datum/sdql2_query/proc/admin_run(mob/user = usr) if(SDQL2_IS_RUNNING) return var/msg = "[key_name(user)] has (re)started query #[id]" @@ -462,13 +462,13 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null show_next_to_key = user.ckey ARun() -/datum/SDQL2_query/proc/admin_del(user = usr) +/datum/sdql2_query/proc/admin_del(user = usr) var/msg = "[key_name(user)] has stopped + deleted query #[id]" message_admins(msg) log_admin(msg) qdel(src) -/datum/SDQL2_query/proc/set_option(name, value) +/datum/sdql2_query/proc/set_option(name, value) switch(name) if("select") switch(value) @@ -491,10 +491,10 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null if("true") options |= SDQL2_OPTION_SEQUENTIAL -/datum/SDQL2_query/proc/ARun() +/datum/sdql2_query/proc/ARun() INVOKE_ASYNC(src, .proc/Run) -/datum/SDQL2_query/proc/Run() +/datum/sdql2_query/proc/Run() if(SDQL2_IS_RUNNING) return FALSE if(query_tree["options"]) @@ -540,7 +540,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null if(qdel_on_finish) qdel(src) -/datum/SDQL2_query/proc/PreSearch() +/datum/sdql2_query/proc/PreSearch() SDQL2_HALT_CHECK switch(query_tree[1]) if("explain") @@ -553,7 +553,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null . = query_tree[query_tree[1]] state = SDQL2_STATE_SWITCHING -/datum/SDQL2_query/proc/Search(list/tree) +/datum/sdql2_query/proc/Search(list/tree) SDQL2_HALT_CHECK var/type = tree[1] var/list/from = tree[2] @@ -594,7 +594,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null . = objs state = SDQL2_STATE_SWITCHING -/datum/SDQL2_query/proc/SDQL_from_objs(list/tree) +/datum/sdql2_query/proc/SDQL_from_objs(list/tree) if(IsAdminAdvancedProcCall()) if("world" in tree) var/text = "[key_name(usr)] attempted to grab world with a procedure call to a SDQL datum." @@ -605,7 +605,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null return world return SDQL_expression(world, tree) -/datum/SDQL2_query/proc/SDQL_get_all(type, location) +/datum/sdql2_query/proc/SDQL_get_all(type, location) var/list/out = list() obj_count_all = out @@ -676,7 +676,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null obj_count_all = out.len return out -/datum/SDQL2_query/proc/Execute(list/found) +/datum/sdql2_query/proc/Execute(list/found) SDQL2_HALT_CHECK select_refs = list() select_text = list() @@ -722,7 +722,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null obj_count_finished = length(obj_count_finished) state = SDQL2_STATE_SWITCHING -/datum/SDQL2_query/proc/SDQL_print(object, list/text_list, print_nulls = TRUE) +/datum/sdql2_query/proc/SDQL_print(object, list/text_list, print_nulls = TRUE) if(is_proper_datum(object)) text_list += "[REF(object)] : [object]" if(istype(object, /atom)) @@ -764,19 +764,19 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null else text_list += "[object]
" -/datum/SDQL2_query/CanProcCall() +/datum/sdql2_query/CanProcCall() if(!allow_admin_interact) return FALSE return ..() -/datum/SDQL2_query/vv_edit_var(var_name, var_value) +/datum/sdql2_query/vv_edit_var(var_name, var_value) if(!allow_admin_interact) return FALSE if(var_name == NAMEOF(src, superuser) || var_name == NAMEOF(src, allow_admin_interact) || var_name == NAMEOF(src, query_tree)) return FALSE return ..() -/datum/SDQL2_query/proc/SDQL_internal_vv(d, list/set_list) +/datum/sdql2_query/proc/SDQL_internal_vv(d, list/set_list) for(var/list/sets in set_list) var/datum/temp = d var/i = 0 @@ -796,7 +796,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null else break -/datum/SDQL2_query/proc/SDQL_function_blocking(datum/object, procname, list/arguments, source) +/datum/sdql2_query/proc/SDQL_function_blocking(datum/object, procname, list/arguments, source) var/list/new_args = list() for(var/arg in arguments) new_args[++new_args.len] = SDQL_expression(source, arg) @@ -805,11 +805,11 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null return superuser? (call(procname)(new_args)) : (WrapAdminProcCall(GLOBAL_PROC, procname, new_args)) return superuser? (call(object, procname)(new_args)) : (WrapAdminProcCall(object, procname, new_args)) -/datum/SDQL2_query/proc/SDQL_function_async(datum/object, procname, list/arguments, source) +/datum/sdql2_query/proc/SDQL_function_async(datum/object, procname, list/arguments, source) set waitfor = FALSE return SDQL_function_blocking(object, procname, arguments, source) -/datum/SDQL2_query/proc/SDQL_expression(datum/object, list/expression, start = 1) +/datum/sdql2_query/proc/SDQL_expression(datum/object, list/expression, start = 1) var/result = 0 var/val @@ -866,7 +866,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null return result -/datum/SDQL2_query/proc/SDQL_value(datum/object, list/expression, start = 1) +/datum/sdql2_query/proc/SDQL_value(datum/object, list/expression, start = 1) var/i = start var/val = null @@ -946,7 +946,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null return list("val" = val, "i" = i) /proc/SDQL_parse(list/query_list) - var/datum/SDQL_parser/parser = new() + var/datum/sdql_parser/parser = new() var/list/querys = list() var/list/query_tree = list() var/pos = 1 @@ -1006,7 +1006,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null to_chat(usr, "[spaces][whitespace][query_tree[item]]", confidential = TRUE) //Staying as a world proc as this is called too often for changes to offset the potential IsAdminAdvancedProcCall checking overhead. -/world/proc/SDQL_var(object, list/expression, start = 1, source, superuser, datum/SDQL2_query/query) +/world/proc/SDQL_var(object, list/expression, start = 1, source, superuser, datum/sdql2_query/query) var/v var/static/list/exclude = list("usr", "src", "marked", "global", "MC", "FS", "CFG") var/long = start < expression.len @@ -1204,15 +1204,15 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null return istype(thing, /datum) || istype(thing, /client) /obj/effect/statclick/SDQL2_delete/Click() - var/datum/SDQL2_query/Q = target + var/datum/sdql2_query/Q = target Q.delete_click() /obj/effect/statclick/SDQL2_action/Click() - var/datum/SDQL2_query/Q = target + var/datum/sdql2_query/Q = target Q.action_click() -/obj/effect/statclick/SDQL2_VV_all +/obj/effect/statclick/sdql2_vv_all name = "VIEW VARIABLES" -/obj/effect/statclick/SDQL2_VV_all/Click() +/obj/effect/statclick/sdql2_vv_all/Click() usr.client.debug_variables(GLOB.sdql2_queries) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index 97ddf32a12d..9e55931915e 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -46,7 +46,7 @@ // ////////// -/datum/SDQL_parser +/datum/sdql_parser var/query_type var/error = 0 @@ -58,15 +58,15 @@ var/list/binary_operators = list("+", "-", "/", "*", "&", "|", "^", "%") var/list/comparators = list("=", "==", "!=", "<>", "<", "<=", ">", ">=") -/datum/SDQL_parser/New(query_list) +/datum/sdql_parser/New(query_list) query = query_list -/datum/SDQL_parser/proc/parse_error(error_message) +/datum/sdql_parser/proc/parse_error(error_message) error = 1 to_chat(usr, "SQDL2 Parsing Error: [error_message]", confidential = TRUE) return query.len + 1 -/datum/SDQL_parser/proc/parse() +/datum/sdql_parser/proc/parse() tree = list() query_options(1, tree) @@ -75,24 +75,24 @@ else return tree -/datum/SDQL_parser/proc/token(i) +/datum/sdql_parser/proc/token(i) if(i <= query.len) return query[i] else return null -/datum/SDQL_parser/proc/tokens(i, num) +/datum/sdql_parser/proc/tokens(i, num) if(i + num <= query.len) return query.Copy(i, i + num) else return null -/datum/SDQL_parser/proc/tokenl(i) +/datum/sdql_parser/proc/tokenl(i) return lowertext(token(i)) -/datum/SDQL_parser/proc/query_options(i, list/node) +/datum/sdql_parser/proc/query_options(i, list/node) var/list/options = list() if(tokenl(i) == "using") i = option_assignments(i + 1, node, options) @@ -101,7 +101,7 @@ node["options"] = options //option_assignment: query_option '=' define -/datum/SDQL_parser/proc/option_assignment(i, list/node, list/assignment_list = list()) +/datum/sdql_parser/proc/option_assignment(i, list/node, list/assignment_list = list()) var/type = tokenl(i) if(!(type in SDQL2_VALID_OPTION_TYPES)) parse_error("Invalid option type: [type]") @@ -114,7 +114,7 @@ return (i + 3) //option_assignments: option_assignment, [',' option_assignments] -/datum/SDQL_parser/proc/option_assignments(i, list/node, list/store) +/datum/sdql_parser/proc/option_assignments(i, list/node, list/store) i = option_assignment(i, node, store) if(token(i) == ",") @@ -123,7 +123,7 @@ return i //query: select_query | delete_query | update_query -/datum/SDQL_parser/proc/query(i, list/node) +/datum/sdql_parser/proc/query(i, list/node) query_type = tokenl(i) switch(query_type) @@ -146,7 +146,7 @@ // select_query: 'SELECT' object_selectors -/datum/SDQL_parser/proc/select_query(i, list/node) +/datum/sdql_parser/proc/select_query(i, list/node) var/list/select = list() i = object_selectors(i + 1, select) @@ -155,7 +155,7 @@ //delete_query: 'DELETE' object_selectors -/datum/SDQL_parser/proc/delete_query(i, list/node) +/datum/sdql_parser/proc/delete_query(i, list/node) var/list/select = list() i = object_selectors(i + 1, select) @@ -165,7 +165,7 @@ //update_query: 'UPDATE' object_selectors 'SET' assignments -/datum/SDQL_parser/proc/update_query(i, list/node) +/datum/sdql_parser/proc/update_query(i, list/node) var/list/select = list() i = object_selectors(i + 1, select) @@ -183,7 +183,7 @@ //call_query: 'CALL' call_function ['ON' object_selectors] -/datum/SDQL_parser/proc/call_query(i, list/node) +/datum/sdql_parser/proc/call_query(i, list/node) var/list/func = list() i = variable(i + 1, func) // Yes technically does anything variable() matches but I don't care, if admins fuck up this badly then they shouldn't be allowed near SDQL. @@ -200,7 +200,7 @@ return i // object_selectors: select_item [('FROM' | 'IN') from_item] [modifier_list] -/datum/SDQL_parser/proc/object_selectors(i, list/node) +/datum/sdql_parser/proc/object_selectors(i, list/node) i = select_item(i, node) if (tokenl(i) == "from" || tokenl(i) == "in") @@ -216,7 +216,7 @@ return i // modifier_list: ('WHERE' bool_expression | 'MAP' expression) [modifier_list] -/datum/SDQL_parser/proc/modifier_list(i, list/node) +/datum/sdql_parser/proc/modifier_list(i, list/node) while (TRUE) if (tokenl(i) == "where") i++ @@ -236,7 +236,7 @@ return i //select_list:select_item [',' select_list] -/datum/SDQL_parser/proc/select_list(i, list/node) +/datum/sdql_parser/proc/select_list(i, list/node) i = select_item(i, node) if(token(i) == ",") @@ -245,7 +245,7 @@ return i //assignments: assignment, [',' assignments] -/datum/SDQL_parser/proc/assignments(i, list/node) +/datum/sdql_parser/proc/assignments(i, list/node) i = assignment(i, node) if(token(i) == ",") @@ -255,7 +255,7 @@ //select_item: '*' | select_function | object_type -/datum/SDQL_parser/proc/select_item(i, list/node) +/datum/sdql_parser/proc/select_item(i, list/node) if (token(i) == "*") node += "*" i++ @@ -269,7 +269,7 @@ return i // Standardized method for handling the IN/FROM and WHERE options. -/datum/SDQL_parser/proc/selectors(i, list/node) +/datum/sdql_parser/proc/selectors(i, list/node) while (token(i)) var/tok = tokenl(i) if (tok in list("from", "in")) @@ -295,7 +295,7 @@ return i //from_item: 'world' | expression -/datum/SDQL_parser/proc/from_item(i, list/node) +/datum/sdql_parser/proc/from_item(i, list/node) if(token(i) == "world") node += "world" i++ @@ -307,7 +307,7 @@ //bool_expression: expression [bool_operator bool_expression] -/datum/SDQL_parser/proc/bool_expression(i, list/node) +/datum/sdql_parser/proc/bool_expression(i, list/node) var/list/bool = list() i = expression(i, bool) @@ -322,7 +322,7 @@ //assignment: '=' expression -/datum/SDQL_parser/proc/assignment(i, list/node, list/assignment_list = list()) +/datum/sdql_parser/proc/assignment(i, list/node, list/assignment_list = list()) assignment_list += token(i) if(token(i + 1) == ".") @@ -341,7 +341,7 @@ //variable: | variable '.' variable | variable '[' ']' | '{' '}' | '(' expression ')' | call_function -/datum/SDQL_parser/proc/variable(i, list/node) +/datum/sdql_parser/proc/variable(i, list/node) var/list/L = list(token(i)) node[++node.len] = L @@ -389,7 +389,7 @@ //object_type: -/datum/SDQL_parser/proc/object_type(i, list/node) +/datum/sdql_parser/proc/object_type(i, list/node) if(token(i)[1] != "/") return parse_error("Expected type, but it didn't begin with /") @@ -404,7 +404,7 @@ //comparator: '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>=' -/datum/SDQL_parser/proc/comparator(i, list/node) +/datum/sdql_parser/proc/comparator(i, list/node) if(token(i) in list("=", "==", "!=", "<>", "<", "<=", ">", ">=")) node += token(i) @@ -416,7 +416,7 @@ //bool_operator: 'AND' | '&&' | 'OR' | '||' -/datum/SDQL_parser/proc/bool_operator(i, list/node) +/datum/sdql_parser/proc/bool_operator(i, list/node) if(tokenl(i) in list("and", "or", "&&", "||")) node += token(i) @@ -428,7 +428,7 @@ //string: ''' ''' | '"' '"' -/datum/SDQL_parser/proc/string(i, list/node) +/datum/sdql_parser/proc/string(i, list/node) if(token(i)[1] in list("'", "\"")) node += token(i) @@ -439,7 +439,7 @@ return i + 1 //array: '[' expression_list ']' -/datum/SDQL_parser/proc/array(i, list/node) +/datum/sdql_parser/proc/array(i, list/node) // Arrays get turned into this: list("[", list(exp_1a = exp_1b, ...), ...), "[" is to mark the next node as an array. if(token(i)[1] != "\[") parse_error("Expected an array but found '[token(i)]'") @@ -492,7 +492,7 @@ return i + 1 //selectors_array: '@[' object_selectors ']' -/datum/SDQL_parser/proc/selectors_array(i, list/node) +/datum/sdql_parser/proc/selectors_array(i, list/node) if(token(i) == "@\[") node += token(i++) if(token(i) != "]") @@ -509,7 +509,7 @@ return i + 1 //call_function: ['(' [arguments] ')'] -/datum/SDQL_parser/proc/call_function(i, list/node, list/arguments) +/datum/sdql_parser/proc/call_function(i, list/node, list/arguments) if(length(tokenl(i))) var/procname = "" if(tokenl(i) == "global" && token(i + 1) == ".") // Global proc. @@ -539,7 +539,7 @@ //expression: ( unary_expression | value ) [binary_operator expression] -/datum/SDQL_parser/proc/expression(i, list/node) +/datum/sdql_parser/proc/expression(i, list/node) if(token(i) in unary_operators) i = unary_expression(i, node) @@ -564,7 +564,7 @@ //unary_expression: unary_operator ( unary_expression | value ) -/datum/SDQL_parser/proc/unary_expression(i, list/node) +/datum/sdql_parser/proc/unary_expression(i, list/node) if(token(i) in unary_operators) var/list/unary_exp = list() @@ -588,7 +588,7 @@ //binary_operator: comparator | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%' -/datum/SDQL_parser/proc/binary_operator(i, list/node) +/datum/sdql_parser/proc/binary_operator(i, list/node) if(token(i) in (binary_operators + comparators)) node += token(i) @@ -600,7 +600,7 @@ //value: variable | string | number | 'null' | object_type | array | selectors_array -/datum/SDQL_parser/proc/value(i, list/node) +/datum/sdql_parser/proc/value(i, list/node) if(token(i) == "null") node += "null" i++ diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index c38e9bfe56e..a5eacf48a21 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -115,7 +115,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that pai.real_name = pai.name pai.key = choice.key card.setPersonality(pai) - for(var/datum/paiCandidate/candidate in SSpai.candidates) + for(var/datum/pai_candidate/candidate in SSpai.candidates) if(candidate.key == choice.key) SSpai.candidates.Remove(candidate) SSblackbox.record_feedback("tally", "admin_verb", 1, "Make pAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 54aa46cd098..6598df12c60 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1116,7 +1116,7 @@ Traitors and the like can also be revived with the previous role mostly intact. alert("ERROR: Incorrect / improper path given.") return new delivery(pod) - new /obj/effect/DPtarget(get_turf(target), pod) + new /obj/effect/dp_target(get_turf(target), pod) if(ADMIN_PUNISHMENT_SUPPLYPOD) var/datum/centcom_podlauncher/plaunch = new(usr) if(!holder) diff --git a/code/modules/antagonists/abductor/machinery/camera.dm b/code/modules/antagonists/abductor/machinery/camera.dm index bc8e9149d91..95feb00f299 100644 --- a/code/modules/antagonists/abductor/machinery/camera.dm +++ b/code/modules/antagonists/abductor/machinery/camera.dm @@ -74,7 +74,7 @@ to_chat(owner, "You must wait [DisplayTimeText(use_delay - world.time)] to use the [target] again!") return var/mob/living/carbon/human/C = owner - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/remote_eye = C.remote_control var/obj/machinery/abductor/pad/P = target use_delay = (world.time + abductor_pad_cooldown) @@ -108,7 +108,7 @@ to_chat(owner, "You can only teleport to one place at a time!") return var/mob/living/carbon/human/C = owner - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/remote_eye = C.remote_control var/obj/machinery/abductor/pad/P = target use_delay = (world.time + teleport_self_cooldown) @@ -148,7 +148,7 @@ return var/mob/living/carbon/human/C = owner - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/remote_eye = C.remote_control var/obj/machinery/abductor/console/console = target console.SetDroppoint(remote_eye.loc,owner) diff --git a/code/modules/antagonists/changeling/powers/absorb.dm b/code/modules/antagonists/changeling/powers/absorb.dm index 1f76d6cd818..24b2ee6aed5 100644 --- a/code/modules/antagonists/changeling/powers/absorb.dm +++ b/code/modules/antagonists/changeling/powers/absorb.dm @@ -1,4 +1,4 @@ -/datum/action/changeling/absorbDNA +/datum/action/changeling/absorb_dna name = "Absorb DNA" desc = "Absorb the DNA of our victim. Requires us to strangle them." button_icon_state = "absorb_dna" @@ -6,7 +6,7 @@ dna_cost = 0 req_human = 1 -/datum/action/changeling/absorbDNA/can_sting(mob/living/carbon/user) +/datum/action/changeling/absorb_dna/can_sting(mob/living/carbon/user) if(!..()) return @@ -27,7 +27,7 @@ -/datum/action/changeling/absorbDNA/sting_action(mob/user) +/datum/action/changeling/absorb_dna/sting_action(mob/user) var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) var/mob/living/carbon/human/target = user.pulling changeling.isabsorbing = 1 diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index 4e03ac8f281..163caf2bba2 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -211,7 +211,7 @@ target.blur_eyes(40) return TRUE -/datum/action/changeling/sting/LSD +/datum/action/changeling/sting/lsd name = "Hallucination Sting" desc = "We cause mass terror to our victim." helptext = "We evolve the ability to sting a target with a powerful hallucinogenic chemical. The target does not notice they have been stung, and the effect occurs after 30 to 60 seconds." @@ -219,12 +219,12 @@ chemical_cost = 10 dna_cost = 1 -/datum/action/changeling/sting/LSD/sting_action(mob/user, mob/living/carbon/target) +/datum/action/changeling/sting/lsd/sting_action(mob/user, mob/living/carbon/target) log_combat(user, target, "stung", "LSD sting") addtimer(CALLBACK(src, .proc/hallucination_time, target), rand(300,600)) return TRUE -/datum/action/changeling/sting/LSD/proc/hallucination_time(mob/living/carbon/target) +/datum/action/changeling/sting/lsd/proc/hallucination_time(mob/living/carbon/target) if(target) target.hallucination = max(90, target.hallucination) diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm index 5f3f3df6bb9..1f5f68a39f7 100644 --- a/code/modules/antagonists/devil/devil.dm +++ b/code/modules/antagonists/devil/devil.dm @@ -146,7 +146,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", if(GLOB.allDevils[lowertext(name)]) return GLOB.allDevils[lowertext(name)] else - var/datum/fakeDevil/devil = new /datum/fakeDevil(name) + var/datum/fake_devil/devil = new /datum/fake_devil(name) GLOB.allDevils[lowertext(name)] = devil return devil @@ -557,7 +557,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", return parts.Join("
") //A simple super light weight datum for the codex gigas. -/datum/fakeDevil +/datum/fake_devil var/truename var/bane var/obligation @@ -565,7 +565,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", var/banish var/ascendable -/datum/fakeDevil/New(name = randomDevilName()) +/datum/fake_devil/New(name = randomDevilName()) truename = name bane = randomdevilbane() obligation = randomdevilobligation() diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm index 76dbf49198d..20a77c6f0f4 100644 --- a/code/modules/antagonists/revenant/revenant.dm +++ b/code/modules/antagonists/revenant/revenant.dm @@ -466,9 +466,9 @@ return FALSE return TRUE -/datum/objective/revenantFluff +/datum/objective/revenant_fluff -/datum/objective/revenantFluff/New() +/datum/objective/revenant_fluff/New() var/list/explanationTexts = list("Assist and exacerbate existing threats at critical moments.", \ "Avoid killing in plain sight.", \ "Cause as much chaos and anger as you can without being killed.", \ @@ -483,5 +483,5 @@ explanation_text = pick(explanationTexts) ..() -/datum/objective/revenantFluff/check_completion() +/datum/objective/revenant_fluff/check_completion() return TRUE diff --git a/code/modules/antagonists/revenant/revenant_antag.dm b/code/modules/antagonists/revenant/revenant_antag.dm index 05138c24dc8..d6d5bb9da89 100644 --- a/code/modules/antagonists/revenant/revenant_antag.dm +++ b/code/modules/antagonists/revenant/revenant_antag.dm @@ -11,7 +11,7 @@ var/datum/objective/revenant/objective = new objective.owner = owner objectives += objective - var/datum/objective/revenantFluff/objective2 = new + var/datum/objective/revenant_fluff/objective2 = new objective2.owner = owner objectives += objective2 diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index 32c6498144d..4bfbf38fe6a 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -371,7 +371,7 @@ to_chat(S, "This biological resource is somehow resisting our bluespace transceiver. Aborting.") return FALSE -/obj/machinery/droneDispenser/swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) +/obj/machinery/drone_dispenser/swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "This object is receiving unactivated swarmer shells to help us. Aborting.") return FALSE diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index f79fe2d91f9..df1bd5d47d7 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /obj/machinery/syndicatebomb/training ))) -GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) +GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) /// The malf AI action subtype. All malf actions are subtypes of this. /datum/action/innate/ai @@ -117,7 +117,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) add_ranged_ability(user, enable_text) /// The base module type, which holds info about each ability. -/datum/AI_Module +/datum/ai_module var/name = "generic module" var/category = "generic category" var/description = "generic description" @@ -134,23 +134,23 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) var/unlock_sound /// Applies upgrades -/datum/AI_Module/proc/upgrade(mob/living/silicon/ai/AI) +/datum/ai_module/proc/upgrade(mob/living/silicon/ai/AI) return /// Modules causing destruction -/datum/AI_Module/destructive +/datum/ai_module/destructive category = "Destructive Modules" /// Modules with stealthy and utility uses -/datum/AI_Module/utility +/datum/ai_module/utility category = "Utility Modules" /// Modules that are improving AI abilities and assets -/datum/AI_Module/upgrade +/datum/ai_module/upgrade category = "Upgrade Modules" /// Doomsday Device: Starts the self-destruct timer. It can only be stopped by killing the AI completely. -/datum/AI_Module/destructive/nuke_station +/datum/ai_module/destructive/nuke_station name = "Doomsday Device" description = "Activate a weapon that will disintegrate all organic life on the station after a 450 second delay. Can only be used while on the station, will fail if your core is moved off station or destroyed." cost = 130 @@ -326,7 +326,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) SSticker.force_ending = 1 /// Hostile Station Lockdown: Locks, bolts, and electrifies every airlock on the station. After 90 seconds, the doors reset. -/datum/AI_Module/destructive/lockdown +/datum/ai_module/destructive/lockdown name = "Hostile Station Lockdown" description = "Overload the airlock, blast door and fire control networks, locking them down. Caution! This command also electrifies all airlocks. The networks will automatically reset after 90 seconds, briefly \ opening all doors on the station." @@ -360,7 +360,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) "Network reset:"), 900) /// Override Machine: Allows the AI to override a machine, animating it into an angry, living version of itself. -/datum/AI_Module/destructive/override_machine +/datum/ai_module/destructive/override_machine name = "Machine Override" description = "Overrides a machine's programming, causing it to rise up and attack everyone except other machines. Four uses per purchase." cost = 30 @@ -413,7 +413,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) return TRUE /// Destroy RCDs: Detonates all non-cyborg RCDs on the station. -/datum/AI_Module/destructive/destroy_rcd +/datum/ai_module/destructive/destroy_rcd name = "Destroy RCDs" description = "Send a specialised pulse to detonate all hand-held and exosuit Rapid Construction Devices on the station." cost = 25 @@ -438,7 +438,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) owner.playsound_local(owner, 'sound/machines/twobeep.ogg', 50, 0) /// Overload Machine: Allows the AI to overload a machine, detonating it after a delay. Two uses per purchase. -/datum/AI_Module/destructive/overload_machine +/datum/ai_module/destructive/overload_machine name = "Machine Overload" description = "Overheats an electrical machine, causing a small explosion and destroying it. Two uses per purchase." cost = 20 @@ -496,7 +496,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) return TRUE /// Blackout: Overloads a random number of lights across the station. Three uses. -/datum/AI_Module/destructive/blackout +/datum/ai_module/destructive/blackout name = "Blackout" description = "Attempts to overload the lighting circuits on the station, destroying some bulbs. Three uses per purchase." cost = 15 @@ -530,7 +530,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) UpdateButtonIcon() /// Robotic Factory: Places a large machine that converts humans that go through it into cyborgs. Unlocking this ability removes shunting. -/datum/AI_Module/utility/place_cyborg_transformer +/datum/ai_module/utility/place_cyborg_transformer name = "Robotic Factory (Removes Shunting)" description = "Build a machine anywhere, using expensive nanomachines, that can convert a living human into a loyal cyborg slave when placed inside." cost = 100 @@ -604,7 +604,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) return success /// Air Alarm Safety Override: Unlocks the ability to enable flooding on all air alarms. -/datum/AI_Module/utility/break_air_alarms +/datum/ai_module/utility/break_air_alarms name = "Air Alarm Safety Override" description = "Gives you the ability to disable safeties on all air alarms. This will allow you to use the environmental mode Flood, which disables scrubbers as well as pressure checks on vents. \ Anyone can check the air alarm's interface and may be tipped off by their nonfunctionality." @@ -629,7 +629,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, 0) /// Thermal Sensor Override: Unlocks the ability to disable all fire alarms from doing their job. -/datum/AI_Module/utility/break_fire_alarms +/datum/ai_module/utility/break_fire_alarms name = "Thermal Sensor Override" description = "Gives you the ability to override the thermal sensors on all fire alarms. This will remove their ability to scan for fire and thus their ability to alert." one_purchase = TRUE @@ -654,7 +654,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, 0) /// Disable Emergency Lights -/datum/AI_Module/utility/emergency_lights +/datum/ai_module/utility/emergency_lights name = "Disable Emergency Lights" description = "Cuts emergency lights across the entire station. If power is lost to light fixtures, they will not attempt to fall back on emergency power reserves." cost = 10 @@ -679,7 +679,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) owner.playsound_local(owner, 'sound/effects/light_flicker.ogg', 50, FALSE) /// Reactivate Camera Network: Reactivates up to 30 cameras across the station. -/datum/AI_Module/utility/reactivate_cameras +/datum/ai_module/utility/reactivate_cameras name = "Reactivate Camera Network" description = "Runs a network-wide diagnostic on the camera network, resetting focus and re-routing power to failed cameras. Can be used to repair up to 30 cameras." cost = 10 @@ -720,7 +720,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) UpdateButtonIcon() /// Upgrade Camera Network: EMP-proofs all cameras, in addition to giving them X-ray vision. -/datum/AI_Module/upgrade/upgrade_cameras +/datum/ai_module/upgrade/upgrade_cameras name = "Upgrade Camera Network" description = "Install broad-spectrum scanning and electrical redundancy firmware to the camera network, enabling EMP-proofing and light-amplified X-ray vision. Upgrade is done immediately upon purchase." //I <3 pointless technobabble //This used to have motion sensing as well, but testing quickly revealed that giving it to the whole cameranet is PURE HORROR. @@ -729,7 +729,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) unlock_text = "OTA firmware distribution complete! Cameras upgraded: CAMSUPGRADED. Light amplification system online." unlock_sound = 'sound/items/rped.ogg' -/datum/AI_Module/upgrade/upgrade_cameras/upgrade(mob/living/silicon/ai/AI) +/datum/ai_module/upgrade/upgrade_cameras/upgrade(mob/living/silicon/ai/AI) AI.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE //Night-vision, without which X-ray would be very limited in power. AI.update_sight() @@ -755,7 +755,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) unlock_text = replacetext(unlock_text, "CAMSUPGRADED", "[upgraded_cameras]") //This works, since unlock text is called after upgrade() /// AI Turret Upgrade: Increases the health and damage of all turrets. -/datum/AI_Module/upgrade/upgrade_turrets +/datum/ai_module/upgrade/upgrade_turrets name = "AI Turret Upgrade" description = "Improves the power and health of all AI turrets. This effect is permanent. Upgrade is done immediately upon purchase." cost = 30 @@ -763,14 +763,14 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) unlock_text = "You establish a power diversion to your turrets, upgrading their health and damage." unlock_sound = 'sound/items/rped.ogg' -/datum/AI_Module/upgrade/upgrade_turrets/upgrade(mob/living/silicon/ai/AI) +/datum/ai_module/upgrade/upgrade_turrets/upgrade(mob/living/silicon/ai/AI) for(var/obj/machinery/porta_turret/ai/turret in GLOB.machines) turret.obj_integrity += 30 turret.lethal_projectile = /obj/projectile/beam/laser/heavylaser //Once you see it, you will know what it means to FEAR. turret.lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg' /// Enhanced Surveillance: Enables AI to hear conversations going on near its active vision. -/datum/AI_Module/upgrade/eavesdrop +/datum/ai_module/upgrade/eavesdrop name = "Enhanced Surveillance" description = "Via a combination of hidden microphones and lip reading software, you are able to use your cameras to listen in on conversations. Upgrade is done immediately upon purchase." cost = 30 @@ -778,12 +778,12 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) unlock_text = "OTA firmware distribution complete! Cameras upgraded: Enhanced surveillance package online." unlock_sound = 'sound/items/rped.ogg' -/datum/AI_Module/upgrade/eavesdrop/upgrade(mob/living/silicon/ai/AI) +/datum/ai_module/upgrade/eavesdrop/upgrade(mob/living/silicon/ai/AI) if(AI.eyeobj) AI.eyeobj.relay_speech = TRUE /// Unlock Mech Domination: Unlocks the ability to dominate mechs. Big shocker, right? -/datum/AI_Module/upgrade/mecha_domination +/datum/ai_module/upgrade/mecha_domination name = "Unlock Mech Domination" description = "Allows you to hack into a mech's onboard computer, shunting all processes into it and ejecting any occupants. Once uploaded to the mech, it is impossible to leave.\ Do not allow the mech to leave the station's vicinity or allow it to be destroyed. Upgrade is done immediately upon purchase." @@ -792,7 +792,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) unlock_text = "Virus package compiled. Select a target mech at any time. You must remain on the station at all times. Loss of signal will result in total system lockout." unlock_sound = 'sound/mecha/nominal.ogg' -/datum/AI_Module/upgrade/mecha_domination/upgrade(mob/living/silicon/ai/AI) +/datum/ai_module/upgrade/mecha_domination/upgrade(mob/living/silicon/ai/AI) AI.can_dominate_mechs = TRUE //Yep. This is all it does. Honk! #undef DEFAULT_DOOMSDAY_TIMER diff --git a/code/modules/antagonists/traitor/equipment/contractor.dm b/code/modules/antagonists/traitor/equipment/contractor.dm index 2c3dff433e5..cd72eb4957d 100644 --- a/code/modules/antagonists/traitor/equipment/contractor.dm +++ b/code/modules/antagonists/traitor/equipment/contractor.dm @@ -229,7 +229,7 @@ to_chat(partner_mind.current, "\n[user.real_name] is your superior. Follow any, and all orders given by them. You're here to support their mission only.") to_chat(partner_mind.current, "Should they perish, or be otherwise unavailable, you're to assist other active agents in this mission area to the best of your ability.\n\n") - new /obj/effect/DPtarget(free_location, arrival_pod) + new /obj/effect/dp_target(free_location, arrival_pod) /datum/contractor_item/blackout name = "Blackout" diff --git a/code/modules/antagonists/traitor/equipment/module_picker.dm b/code/modules/antagonists/traitor/equipment/module_picker.dm index 2e586ef1123..11d8d94352c 100644 --- a/code/modules/antagonists/traitor/equipment/module_picker.dm +++ b/code/modules/antagonists/traitor/equipment/module_picker.dm @@ -11,14 +11,14 @@ /datum/module_picker/New() possible_modules = get_malf_modules() -/proc/cmp_malfmodules_priority(datum/AI_Module/A, datum/AI_Module/B) +/proc/cmp_malfmodules_priority(datum/ai_module/A, datum/ai_module/B) return B.cost - A.cost /proc/get_malf_modules() var/list/filtered_modules = list() for(var/path in GLOB.malf_modules) - var/datum/AI_Module/AM = new path + var/datum/ai_module/AM = new path if((AM.power_type == /datum/action/innate/ai) && !AM.upgrade) continue if(!filtered_modules[AM.category]) @@ -52,7 +52,7 @@ "name" = category, "items" = (category == selected_cat ? list() : null)) for(var/module in possible_modules[category]) - var/datum/AI_Module/AM = possible_modules[category][module] + var/datum/ai_module/AM = possible_modules[category][module] cat["items"] += list(list( "name" = AM.name, "cost" = AM.cost, @@ -74,7 +74,7 @@ for(var/category in possible_modules) buyable_items += possible_modules[category] for(var/key in buyable_items) - var/datum/AI_Module/AM = buyable_items[key] + var/datum/ai_module/AM = buyable_items[key] if(AM.name == item_name) purchase_module(usr, AM) return TRUE @@ -85,7 +85,7 @@ compact_mode = !compact_mode return TRUE -/datum/module_picker/proc/purchase_module(mob/living/silicon/ai/AI, datum/AI_Module/AM) +/datum/module_picker/proc/purchase_module(mob/living/silicon/ai/AI, datum/ai_module/AM) if(!istype(AM)) return if(!AI || AI.stat == DEAD) diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm index f32f60e7e68..4936aca541c 100644 --- a/code/modules/antagonists/traitor/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/syndicate_contract.dm @@ -68,7 +68,7 @@ empty_pod.explosionSize = list(0,0,0,1) empty_pod.leavingSound = 'sound/effects/podwoosh.ogg' - new /obj/effect/DPtarget(empty_pod_turf, empty_pod) + new /obj/effect/dp_target(empty_pod_turf, empty_pod) /datum/syndicate_contract/proc/enter_check(datum/source, sent_mob) if (istype(source, /obj/structure/closet/supplypod/extractionpod)) @@ -226,7 +226,7 @@ M.Dizzy(35) M.confused += 20 - new /obj/effect/DPtarget(possible_drop_loc[pod_rand_loc], return_pod) + new /obj/effect/dp_target(possible_drop_loc[pod_rand_loc], return_pod) else to_chat(M, "A million voices echo in your head... \"Seems where you got sent here from won't \ be able to handle our pod... You will die here instead.\"") diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index d9b88d3bc7c..9a1ff11e582 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -134,7 +134,7 @@ spell_type = /obj/effect/proc_holder/spell/aoe_turf/repulse category = "Defensive" -/datum/spellbook_entry/lightningPacket +/datum/spellbook_entry/lightning_packet name = "Thrown Lightning" spell_type = /obj/effect/proc_holder/spell/targeted/conjure_item/spellpacket category = "Defensive" diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 80351a1527f..a6b9240ad8b 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -105,15 +105,15 @@ ) -/datum/asset/simple/IRV +/datum/asset/simple/irv assets = list( "jquery-ui.custom-core-widgit-mouse-sortable-min.js" = 'html/IRV/jquery-ui.custom-core-widgit-mouse-sortable-min.js', ) -/datum/asset/group/IRV +/datum/asset/group/irv children = list( /datum/asset/simple/jquery, - /datum/asset/simple/IRV + /datum/asset/simple/irv ) /datum/asset/simple/changelog diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm index 6c4b0d23338..f08b52e252d 100644 --- a/code/modules/awaymissions/mission_code/Academy.dm +++ b/code/modules/awaymissions/mission_code/Academy.dm @@ -331,7 +331,7 @@ if(17) //Tator Kit T.visible_message("A suspicious box appears!") - new /obj/item/storage/box/syndicate/bundle_A(drop_location()) + new /obj/item/storage/box/syndicate/bundle_a(drop_location()) do_smoke(0, drop_location()) if(18) //Captain ID diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm index 3ad7c7cb509..5194b7348e2 100644 --- a/code/modules/awaymissions/mission_code/Cabin.dm +++ b/code/modules/awaymissions/mission_code/Cabin.dm @@ -112,46 +112,46 @@ speak = list() /*Cabin's forest. Removed in the new cabin map since it was buggy and I prefer manual placement.*/ -/datum/mapGenerator/snowy - modules = list(/datum/mapGeneratorModule/bottomlayer/snow, \ - /datum/mapGeneratorModule/snow/pineTrees, \ - /datum/mapGeneratorModule/snow/deadTrees, \ - /datum/mapGeneratorModule/snow/randBushes, \ - /datum/mapGeneratorModule/snow/randIceRocks, \ - /datum/mapGeneratorModule/snow/bunnies) +/datum/map_generator/snowy + modules = list(/datum/map_generator_module/bottomlayer/snow, \ + /datum/map_generator_module/snow/pine_trees, \ + /datum/map_generator_module/snow/dead_trees, \ + /datum/map_generator_module/snow/rand_bushes, \ + /datum/map_generator_module/snow/rand_ice_rocks, \ + /datum/map_generator_module/snow/bunnies) -/datum/mapGeneratorModule/snow/checkPlaceAtom(turf/T) +/datum/map_generator_module/snow/checkPlaceAtom(turf/T) if(istype(T, /turf/open/floor/plating/asteroid/snow)) return ..(T) return 0 -/datum/mapGeneratorModule/bottomlayer/snow +/datum/map_generator_module/bottomlayer/snow spawnableTurfs = list(/turf/open/floor/plating/asteroid/snow/atmosphere = 100) -/datum/mapGeneratorModule/snow/pineTrees +/datum/map_generator_module/snow/pine_trees spawnableAtoms = list(/obj/structure/flora/tree/pine = 30) -/datum/mapGeneratorModule/snow/deadTrees +/datum/map_generator_module/snow/dead_trees spawnableAtoms = list(/obj/structure/flora/tree/dead = 10) -/datum/mapGeneratorModule/snow/randBushes +/datum/map_generator_module/snow/rand_bushes spawnableAtoms = list() -/datum/mapGeneratorModule/snow/randBushes/New() +/datum/map_generator_module/snow/rand_bushes/New() ..() spawnableAtoms = typesof(/obj/structure/flora/ausbushes) for(var/i in spawnableAtoms) spawnableAtoms[i] = 1 -/datum/mapGeneratorModule/snow/bunnies +/datum/map_generator_module/snow/bunnies //spawnableAtoms = list(/mob/living/simple_animal/chicken/rabbit/normal = 0.1) spawnableAtoms = list(/mob/living/simple_animal/chicken/rabbit = 0.5) -/datum/mapGeneratorModule/snow/randIceRocks +/datum/map_generator_module/snow/rand_ice_rocks spawnableAtoms = list(/obj/structure/flora/rock/icy = 5, /obj/structure/flora/rock/pile/icy = 5) -/obj/effect/landmark/mapGenerator/snowy - mapGeneratorType = /datum/mapGenerator/snowy +/obj/effect/landmark/map_generator/snowy + mapGeneratorType = /datum/map_generator/snowy endTurfX = 159 endTurfY = 157 startTurfX = 37 diff --git a/code/modules/awaymissions/mission_code/caves.dm b/code/modules/awaymissions/mission_code/caves.dm index 13b526fddb5..478f80ca682 100644 --- a/code/modules/awaymissions/mission_code/caves.dm +++ b/code/modules/awaymissions/mission_code/caves.dm @@ -1,18 +1,18 @@ //Areas -/area/awaymission/caves/BMP_asteroid +/area/awaymission/caves/bmp_asteroid name = "\improper BMP Asteroid Level 1" icon_state = "awaycontent1" -/area/awaymission/caves/BMP_asteroid/level_two +/area/awaymission/caves/bmp_asteroid/level_two name = "\improper BMP Asteroid Level 2" icon_state = "awaycontent2" -/area/awaymission/caves/BMP_asteroid/level_three +/area/awaymission/caves/bmp_asteroid/level_three name = "\improper BMP Asteroid Level 3" icon_state = "awaycontent3" -/area/awaymission/caves/BMP_asteroid/level_four +/area/awaymission/caves/bmp_asteroid/level_four name = "\improper BMP Asteroid Level 4" icon_state = "awaycontent4" diff --git a/code/modules/awaymissions/mission_code/centcomAway.dm b/code/modules/awaymissions/mission_code/centcomAway.dm index a7a670f84f0..a6d1d7c9a6b 100644 --- a/code/modules/awaymissions/mission_code/centcomAway.dm +++ b/code/modules/awaymissions/mission_code/centcomAway.dm @@ -1,35 +1,35 @@ //centcomAway areas -/area/awaymission/centcomAway +/area/awaymission/centcom_away name = "XCC-P5831" icon_state = "away" requires_power = FALSE -/area/awaymission/centcomAway/general +/area/awaymission/centcom_away/general name = "XCC-P5831" ambientsounds = list('sound/ambience/ambigen3.ogg') -/area/awaymission/centcomAway/maint +/area/awaymission/centcom_away/maint name = "XCC-P5831 Maintenance" icon_state = "away1" ambientsounds = list('sound/ambience/ambisin1.ogg') -/area/awaymission/centcomAway/thunderdome +/area/awaymission/centcom_away/thunderdome name = "XCC-P5831 Thunderdome" icon_state = "away2" ambientsounds = list('sound/ambience/ambisin2.ogg') -/area/awaymission/centcomAway/cafe +/area/awaymission/centcom_away/cafe name = "XCC-P5831 Kitchen Arena" icon_state = "away3" ambientsounds = list('sound/ambience/ambisin3.ogg') -/area/awaymission/centcomAway/courtroom +/area/awaymission/centcom_away/courtroom name = "XCC-P5831 Courtroom" icon_state = "away4" ambientsounds = list('sound/ambience/ambisin4.ogg') -/area/awaymission/centcomAway/hangar +/area/awaymission/centcom_away/hangar name = "XCC-P5831 Hangars" icon_state = "away4" ambientsounds = list('sound/ambience/ambigen5.ogg') diff --git a/code/modules/buildmode/submodes/mapgen.dm b/code/modules/buildmode/submodes/mapgen.dm index 25b79b190b4..23f132c1d8a 100644 --- a/code/modules/buildmode/submodes/mapgen.dm +++ b/code/modules/buildmode/submodes/mapgen.dm @@ -11,10 +11,10 @@ to_chat(c, "***********************************************************") /datum/buildmode_mode/mapgen/change_settings(client/c) - var/list/gen_paths = subtypesof(/datum/mapGenerator) + var/list/gen_paths = subtypesof(/datum/map_generator) var/list/options = list() for(var/path in gen_paths) - var/datum/mapGenerator/MP = path + var/datum/map_generator/MP = path options[initial(MP.buildmode_name)] = path var/type = input(c,"Select Generator Type","Type") as null|anything in options if(!type) @@ -34,8 +34,8 @@ var/list/pa = params2list(params) var/left_click = pa.Find("left") if(left_click) - var/datum/mapGenerator/G = new generator_path - if(istype(G, /datum/mapGenerator/repair/reload_station_map)) + var/datum/map_generator/G = new generator_path + if(istype(G, /datum/map_generator/repair/reload_station_map)) if(GLOB.reloading_map) to_chat(c, "You are already reloading an area! Please wait for it to fully finish loading before trying to load another!") deselect_region() diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index e0058b74b3f..6e38a0c2be1 100644 --- a/code/modules/cargo/bounties/reagent.dm +++ b/code/modules/cargo/bounties/reagent.dm @@ -131,7 +131,7 @@ /datum/reagent/medicine/leporazine,\ /datum/reagent/medicine/clonexadone,\ /datum/reagent/medicine/mine_salve,\ - /datum/reagent/medicine/C2/convermol,\ + /datum/reagent/medicine/c2/convermol,\ /datum/reagent/medicine/ephedrine,\ /datum/reagent/medicine/diphenhydramine,\ /datum/reagent/drug/space_drugs,\ @@ -233,13 +233,13 @@ //reagent that are possible to be chem factory'd var/static/list/possible_reagents = list(\ /datum/reagent/medicine/spaceacillin,\ - /datum/reagent/medicine/C2/instabitaluri,\ + /datum/reagent/medicine/c2/instabitaluri,\ /datum/reagent/medicine/pen_acid,\ /datum/reagent/medicine/atropine,\ /datum/reagent/medicine/cryoxadone,\ /datum/reagent/medicine/salbutamol,\ - /datum/reagent/medicine/C2/hercuri,\ - /datum/reagent/medicine/C2/probital,\ + /datum/reagent/medicine/c2/hercuri,\ + /datum/reagent/medicine/c2/probital,\ /datum/reagent/drug/methamphetamine,\ /datum/reagent/drug/crank,\ /datum/reagent/nitrous_oxide,\ diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index 953907b4975..c3040336338 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -19,7 +19,7 @@ //Variables declared to change how items in the launch bay are picked and launched. (Almost) all of these are changed in the ui_act proc //Some effect groups are choices, while other are booleans. This is because some effects can stack, while others dont (ex: you can stack explosion and quiet, but you cant stack ordered launch and random launch) /datum/centcom_podlauncher - var/static/list/ignored_atoms = typecacheof(list(null, /mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object, /obj/effect/particle_effect/sparks, /obj/effect/DPtarget, /obj/effect/supplypod_selector )) + var/static/list/ignored_atoms = typecacheof(list(null, /mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object, /obj/effect/particle_effect/sparks, /obj/effect/dp_target, /obj/effect/supplypod_selector )) var/turf/oldTurf //Keeps track of where the user was at if they use the "teleport to centcom" button, so they can go back var/client/holder //client of whoever is using this datum var/area/bay //What bay we're using to launch shit from. @@ -48,7 +48,7 @@ var/mob/M = H holder = M.client //if its a mob, assign the mob's client to holder bay = locate(/area/centcom/supplypod/loading/one) in GLOB.sortedAreas //Locate the default bay (one) from the centcom map - temp_pod = new(locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas) //Create a new temp_pod in the podStorage area on centcom (so users are free to look at it and change other variables if needed) + temp_pod = new(locate(/area/centcom/supplypod/pod_storage) in GLOB.sortedAreas) //Create a new temp_pod in the podStorage area on centcom (so users are free to look at it and change other variables if needed) orderedArea = createOrderedArea(bay) //Order all the turfs in the selected bay (top left to bottom right) to a single list. Used for the "ordered" mode (launchChoice = 1) /datum/centcom_podlauncher/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, \ @@ -553,7 +553,7 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm var/obj/structure/closet/supplypod/centcompod/toLaunch = DuplicateObject(temp_pod) //Duplicate the temp_pod (which we have been varediting or configuring with the UI) and store the result toLaunch.bay = bay //Bay is currently a nonstatic expression, so it cant go into toLaunch using DuplicateObject toLaunch.update_icon()//we update_icon() here so that the door doesnt "flicker on" right after it lands - var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/flyMeToTheMoon] + var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/fly_me_to_the_moon] toLaunch.forceMove(shippingLane) if (launchClone) //We arent launching the actual items from the bay, rather we are creating clones and launching those if(launchRandomItem) @@ -569,7 +569,7 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm else for (var/atom/movable/O in launchList) //If we aren't cloning the objects, just go through the launchList O.forceMove(toLaunch) //and forceMove any atom/moveable into the supplypod - new /obj/effect/DPtarget(A, toLaunch) //Then, create the DPTarget effect, which will eventually forceMove the temp_pod to it's location + new /obj/effect/dp_target(A, toLaunch) //Then, create the DPTarget effect, which will eventually forceMove the temp_pod to it's location if (launchClone) launchCounter++ //We only need to increment launchCounter if we are cloning objects. //If we aren't cloning objects, taking and removing the first item each time from the acceptableTurfs list will inherently iterate through the list in order diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm index 440c0dcbcd4..ab8ebeb7a95 100644 --- a/code/modules/cargo/expressconsole.dm +++ b/code/modules/cargo/expressconsole.dm @@ -192,7 +192,7 @@ LZ = pick(empty_turfs) if (SO.pack.cost <= points_to_check && LZ)//we need to call the cost check again because of the CHECK_TICK call D.adjust_money(-SO.pack.cost) - new /obj/effect/DPtarget(LZ, podType, SO) + new /obj/effect/dp_target(LZ, podType, SO) . = TRUE update_icon() else @@ -210,7 +210,7 @@ for(var/i in 1 to MAX_EMAG_ROCKETS) var/LZ = pick(empty_turfs) LAZYREMOVE(empty_turfs, LZ) - new /obj/effect/DPtarget(LZ, podType, SO) + new /obj/effect/dp_target(LZ, podType, SO) . = TRUE update_icon() CHECK_TICK diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 694397fbb95..386fedc846c 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -895,7 +895,7 @@ crate_name = "grounding rod crate" crate_type = /obj/structure/closet/crate/engineering/electrical -/datum/supply_pack/engine/PA +/datum/supply_pack/engine/particle_accelerator name = "Particle Accelerator Crate" desc = "A supermassive black hole or hyper-powered teslaball are the perfect way to spice up any party! This \"My First Apocalypse\" kit contains everything you need to build your own Particle Accelerator! Ages 10 and up." cost = 3000 @@ -1149,12 +1149,12 @@ cost = 3500 contains = list(/obj/item/reagent_containers/blood, /obj/item/reagent_containers/blood, - /obj/item/reagent_containers/blood/APlus, - /obj/item/reagent_containers/blood/AMinus, - /obj/item/reagent_containers/blood/BPlus, - /obj/item/reagent_containers/blood/BMinus, - /obj/item/reagent_containers/blood/OPlus, - /obj/item/reagent_containers/blood/OMinus, + /obj/item/reagent_containers/blood/a_plus, + /obj/item/reagent_containers/blood/a_minus, + /obj/item/reagent_containers/blood/b_plus, + /obj/item/reagent_containers/blood/b_minus, + /obj/item/reagent_containers/blood/o_plus, + /obj/item/reagent_containers/blood/o_minus, /obj/item/reagent_containers/blood/lizard, /obj/item/reagent_containers/blood/ethereal) crate_name = "blood freezer" @@ -1218,7 +1218,7 @@ /obj/item/storage/firstaid/brute, /obj/item/storage/firstaid/fire, /obj/item/defibrillator/loaded, - /obj/item/reagent_containers/blood/OMinus, + /obj/item/reagent_containers/blood/o_minus, /obj/item/storage/pill_bottle/mining, /obj/item/reagent_containers/pill/neurine, /obj/item/stack/medical/bone_gel, @@ -1380,9 +1380,9 @@ contains = list(/obj/item/stamp, /obj/item/stamp/denied, /obj/item/export_scanner, - /obj/item/destTagger, + /obj/item/dest_tagger, /obj/item/hand_labeler, - /obj/item/stack/packageWrap) + /obj/item/stack/package_wrap) crate_name = "cargo supplies crate" /datum/supply_pack/service/noslipfloor @@ -1899,7 +1899,7 @@ if(prob(50)) var/mob/living/simple_animal/pet/cat/C = locate() in . qdel(C) - new /mob/living/simple_animal/pet/cat/Proc(.) + new /mob/living/simple_animal/pet/cat/proc(.) /datum/supply_pack/critter/chick name = "Chicken Crate" @@ -1922,7 +1922,7 @@ var/mob/living/simple_animal/pet/dog/corgi/D = locate() in . if(D.gender == FEMALE) qdel(D) - new /mob/living/simple_animal/pet/dog/corgi/Lisa(.) + new /mob/living/simple_animal/pet/dog/corgi/lisa(.) /datum/supply_pack/critter/cow name = "Cow Crate" @@ -2016,8 +2016,8 @@ /obj/item/clothing/head/collectable/rabbitears, /obj/item/clothing/head/collectable/wizard, /obj/item/clothing/head/collectable/hardhat, - /obj/item/clothing/head/collectable/HoS, - /obj/item/clothing/head/collectable/HoP, + /obj/item/clothing/head/collectable/hos, + /obj/item/clothing/head/collectable/hop, /obj/item/clothing/head/collectable/thunderdome, /obj/item/clothing/head/collectable/swat, /obj/item/clothing/head/collectable/slime, diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index a4da8c9e8a2..4b6591dbecb 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -122,7 +122,7 @@ if ((ismob(O) && !isliving(O)) || (is_type_in_typecache(O, GLOB.blacklisted_cargo_types) && !isliving(O))) //We dont want to take ghosts with us, and we don't want blacklisted items going, but we allow mobs. continue O.forceMove(holder) //Put objects inside before we close - var/obj/effect/temp_visual/risingPod = new /obj/effect/DPfall(get_turf(holder), src) //Make a nice animation of flying back up + var/obj/effect/temp_visual/risingPod = new /obj/effect/dp_fall(get_turf(holder), src) //Make a nice animation of flying back up risingPod.pixel_z = 0 //The initial value of risingPod's pixel_z is 200 because it normally comes down from a high spot animate(risingPod, pixel_z = 200, time = 10, easing = LINEAR_EASING) //Animate our rising pod if (returntobay) @@ -261,7 +261,7 @@ . = ..() //------------------------------------FALLING SUPPLY POD-------------------------------------// -/obj/effect/DPfall //Falling pod +/obj/effect/dp_fall //Falling pod name = "" icon = 'icons/obj/supplypods.dmi' pixel_x = -16 @@ -271,7 +271,7 @@ layer = FLY_LAYER//that wasn't flying, that was falling with style! icon_state = "" -/obj/effect/DPfall/Initialize(dropLocation, obj/structure/closet/supplypod/pod) +/obj/effect/dp_fall/Initialize(dropLocation, obj/structure/closet/supplypod/pod) if (pod.style == STYLE_SEETHROUGH) pixel_x = -16 pixel_y = 0 @@ -284,7 +284,7 @@ . = ..() //------------------------------------TEMPORARY_VISUAL-------------------------------------// -/obj/effect/DPtarget //This is the object that forceMoves the supplypod to it's location +/obj/effect/dp_target //This is the object that forceMoves the supplypod to it's location name = "Landing Zone Indicator" desc = "A holographic projection designating the landing zone of something. It's probably best to stand back." icon = 'icons/mob/actions/actions_items.dmi' @@ -297,7 +297,7 @@ /obj/effect/ex_act() return -/obj/effect/DPtarget/Initialize(mapload, podParam, single_order = null) +/obj/effect/dp_target/Initialize(mapload, podParam, single_order = null) . = ..() if (ispath(podParam)) //We can pass either a path for a pod (as expressconsoles do), or a reference to an instantiated pod (as the centcom_podlauncher does) podParam = new podParam() //If its just a path, instantiate it @@ -326,11 +326,11 @@ addtimer(CALLBACK(src, .proc/playFallingSound), soundStartTime) addtimer(CALLBACK(src, .proc/beginLaunch, pod.effectCircle), pod.landingDelay) -/obj/effect/DPtarget/proc/playFallingSound() +/obj/effect/dp_target/proc/playFallingSound() playsound(src, pod.fallingSound, pod.soundVolume, TRUE, 6) -/obj/effect/DPtarget/proc/beginLaunch(effectCircle) //Begin the animation for the pod falling. The effectCircle param determines whether the pod gets to come in from any descent angle - fallingPod = new /obj/effect/DPfall(drop_location(), pod) +/obj/effect/dp_target/proc/beginLaunch(effectCircle) //Begin the animation for the pod falling. The effectCircle param determines whether the pod gets to come in from any descent angle + fallingPod = new /obj/effect/dp_fall(drop_location(), pod) var/matrix/M = matrix(fallingPod.transform) //Create a new matrix that we can rotate var/angle = effectCircle ? rand(0,360) : rand(70,110) //The angle that we can come in from fallingPod.pixel_x = cos(angle)*400 //Use some ADVANCED MATHEMATICS to set the animated pod's position to somewhere on the edge of a circle with the center being the target @@ -344,7 +344,7 @@ animate(fallingPod, pixel_z = 0, pixel_x = -16, time = pod.fallDuration, , easing = LINEAR_EASING) //Make the pod fall! At an angle! addtimer(CALLBACK(src, .proc/endLaunch), pod.fallDuration, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation -/obj/effect/DPtarget/proc/endLaunch() +/obj/effect/dp_target/proc/endLaunch() pod.update_icon() pod.forceMove(drop_location()) //The fallingPod animation is over, now's a good time to forceMove the actual pod into position QDEL_NULL(fallingPod) //Delete the falling pod effect, because at this point its animation is over. We dont use temp_visual because we want to manually delete it as soon as the pod appears diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index 37013ec3ee9..b857b9d3515 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -102,7 +102,7 @@ var/list/clicklimiter ///goonchat chatoutput of the client - var/datum/chatOutput/chatOutput + var/datum/chat_output/chatOutput ///lazy list of all credit object bound to this client var/list/credits @@ -141,7 +141,7 @@ /// Messages currently seen by this client var/list/seen_messages - var/datum/viewData/view_size + var/datum/view_data/view_size ///A lazy list of atoms we've examined in the last EXAMINE_MORE_TIME (default 1.5) seconds, so that we will call [atom/proc/examine_more()] instead of [atom/proc/examine()] on them when examining var/list/recent_examines diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 7693a82ac49..f2dd78b355b 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -205,7 +205,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) /client/New(TopicData) var/tdata = TopicData //save this for later use - chatOutput = new /datum/chatOutput(src) + chatOutput = new /datum/chat_output(src) TopicData = null //Prevent calls to client.Topic from connect if(connection != "seeker" && connection != "web")//Invalid connection type. @@ -505,7 +505,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) return if(!SSdbcore.Connect()) return - var/datum/DBQuery/query_get_related_ip = SSdbcore.NewQuery( + var/datum/db_query/query_get_related_ip = SSdbcore.NewQuery( "SELECT ckey FROM [format_table_name("player")] WHERE ip = INET_ATON(:address) AND ckey != :ckey", list("address" = address, "ckey" = ckey) ) @@ -516,7 +516,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) while(query_get_related_ip.NextRow()) related_accounts_ip += "[query_get_related_ip.item[1]], " qdel(query_get_related_ip) - var/datum/DBQuery/query_get_related_cid = SSdbcore.NewQuery( + var/datum/db_query/query_get_related_cid = SSdbcore.NewQuery( "SELECT ckey FROM [format_table_name("player")] WHERE computerid = :computerid AND ckey != :ckey", list("computerid" = computer_id, "ckey" = ckey) ) @@ -534,7 +534,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) if (!GLOB.deadmins[ckey] && check_randomizer(connectiontopic)) return var/new_player - var/datum/DBQuery/query_client_in_db = SSdbcore.NewQuery( + var/datum/db_query/query_client_in_db = SSdbcore.NewQuery( "SELECT 1 FROM [format_table_name("player")] WHERE ckey = :ckey", list("ckey" = ckey) ) @@ -559,7 +559,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) new_player = 1 account_join_date = findJoinDate() - var/datum/DBQuery/query_add_player = SSdbcore.NewQuery({" + var/datum/db_query/query_add_player = SSdbcore.NewQuery({" INSERT INTO [format_table_name("player")] (`ckey`, `byond_key`, `firstseen`, `firstseen_round_id`, `lastseen`, `lastseen_round_id`, `ip`, `computerid`, `lastadminrank`, `accountjoindate`) VALUES (:ckey, :key, Now(), :round_id, Now(), :round_id, INET_ATON(:ip), :computerid, :adminrank, :account_join_date) "}, list("ckey" = ckey, "key" = key, "round_id" = GLOB.round_id, "ip" = address, "computerid" = computer_id, "adminrank" = admin_rank, "account_join_date" = account_join_date || null)) @@ -572,7 +572,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) account_join_date = "Error" account_age = -1 qdel(query_client_in_db) - var/datum/DBQuery/query_get_client_age = SSdbcore.NewQuery( + var/datum/db_query/query_get_client_age = SSdbcore.NewQuery( "SELECT firstseen, DATEDIFF(Now(),firstseen), accountjoindate, DATEDIFF(Now(),accountjoindate) FROM [format_table_name("player")] WHERE ckey = :ckey", list("ckey" = ckey) ) @@ -590,7 +590,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) if(!account_join_date) account_age = -1 else - var/datum/DBQuery/query_datediff = SSdbcore.NewQuery( + var/datum/db_query/query_datediff = SSdbcore.NewQuery( "SELECT DATEDIFF(Now(), :account_join_date)", list("account_join_date" = account_join_date) ) @@ -602,7 +602,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) qdel(query_datediff) qdel(query_get_client_age) if(!new_player) - var/datum/DBQuery/query_log_player = SSdbcore.NewQuery( + var/datum/db_query/query_log_player = SSdbcore.NewQuery( "UPDATE [format_table_name("player")] SET lastseen = Now(), lastseen_round_id = :round_id, ip = INET_ATON(:ip), computerid = :computerid, lastadminrank = :admin_rank, accountjoindate = :account_join_date WHERE ckey = :ckey", list("round_id" = GLOB.round_id, "ip" = address, "computerid" = computer_id, "admin_rank" = admin_rank, "account_join_date" = account_join_date || null, "ckey" = ckey) ) @@ -612,7 +612,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) qdel(query_log_player) if(!account_join_date) account_join_date = "Error" - var/datum/DBQuery/query_log_connection = SSdbcore.NewQuery({" + var/datum/db_query/query_log_connection = SSdbcore.NewQuery({" INSERT INTO `[format_table_name("connection_log")]` (`id`,`datetime`,`server_ip`,`server_port`,`round_id`,`ckey`,`ip`,`computerid`) VALUES(null,Now(),INET_ATON(:internet_address),:port,:round_id,:ckey,INET_ATON(:ip),:computerid) "}, list("internet_address" = world.internet_address || "0", "port" = world.port, "round_id" = GLOB.round_id, "ckey" = ckey, "ip" = address, "computerid" = computer_id)) @@ -640,7 +640,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) /client/proc/validate_key_in_db() var/sql_key - var/datum/DBQuery/query_check_byond_key = SSdbcore.NewQuery( + var/datum/db_query/query_check_byond_key = SSdbcore.NewQuery( "SELECT byond_key FROM [format_table_name("player")] WHERE ckey = :ckey", list("ckey" = ckey) ) @@ -660,7 +660,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) var/regex/R = regex("\\tkey = \"(.+)\"") if(R.Find(F)) var/web_key = R.group[1] - var/datum/DBQuery/query_update_byond_key = SSdbcore.NewQuery( + var/datum/db_query/query_update_byond_key = SSdbcore.NewQuery( "UPDATE [format_table_name("player")] SET byond_key = :byond_key WHERE ckey = :ckey", list("byond_key" = web_key, "ckey" = ckey) ) @@ -680,7 +680,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) var/static/tokens = list() var/static/cidcheck_failedckeys = list() //to avoid spamming the admins if the same guy keeps trying. var/static/cidcheck_spoofckeys = list() - var/datum/DBQuery/query_cidcheck = SSdbcore.NewQuery( + var/datum/db_query/query_cidcheck = SSdbcore.NewQuery( "SELECT computerid FROM [format_table_name("player")] WHERE ckey = :ckey", list("ckey" = ckey) ) @@ -759,7 +759,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) /client/proc/add_system_note(system_ckey, message) //check to see if we noted them in the last day. - var/datum/DBQuery/query_get_notes = SSdbcore.NewQuery( + var/datum/db_query/query_get_notes = SSdbcore.NewQuery( "SELECT id FROM [format_table_name("messages")] WHERE type = 'note' AND targetckey = :targetckey AND adminckey = :adminckey AND timestamp + INTERVAL 1 DAY < NOW() AND deleted = 0 AND (expire_timestamp > NOW() OR expire_timestamp IS NULL)", list("targetckey" = ckey, "adminckey" = system_ckey) ) diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index a5b2b9dd3e9..135d3a28952 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -1,10 +1,10 @@ //this works as is to create a single checked item, but has no back end code for toggleing the check yet #define TOGGLE_CHECKBOX(PARENT, CHILD) PARENT/CHILD/abstract = TRUE;PARENT/CHILD/checkbox = CHECKBOX_TOGGLE;PARENT/CHILD/verb/CHILD -//Example usage TOGGLE_CHECKBOX(datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_ears)() +//Example usage TOGGLE_CHECKBOX(datum/verbs/menu/settings/Ghost/chatterbox, toggle_ghost_ears)() //override because we don't want to save preferences twice. -/datum/verbs/menu/Settings/Set_checked(client/C, verbpath) +/datum/verbs/menu/settings/Set_checked(client/C, verbpath) if (checkbox == CHECKBOX_GROUP) C.prefs.menuoptions[type] = verbpath else if (checkbox == CHECKBOX_TOGGLE) @@ -12,7 +12,7 @@ C.prefs.menuoptions[type] = !checked winset(C, "[verbpath]", "is-checked = [!checked]") -/datum/verbs/menu/Settings/verb/setup_character() +/datum/verbs/menu/settings/verb/setup_character() set name = "Game Preferences" set category = "Preferences" set desc = "Open Game Preferences Window" @@ -20,10 +20,10 @@ usr.client.prefs.ShowChoices(usr) //toggles -/datum/verbs/menu/Settings/Ghost/chatterbox +/datum/verbs/menu/settings/ghost/chatterbox name = "Chat Box Spam" -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_ears)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_ears)() set name = "Show/Hide GhostEars" set category = "Preferences" set desc = "See All Speech" @@ -31,10 +31,10 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_ears)( to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Ears", "[usr.client.prefs.chat_toggles & CHAT_GHOSTEARS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_ears/Get_checked(client/C) +/datum/verbs/menu/settings/ghost/chatterbox/toggle_ghost_ears/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_GHOSTEARS -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_sight)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_sight)() set name = "Show/Hide GhostSight" set category = "Preferences" set desc = "See All Emotes" @@ -42,10 +42,10 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_sight) to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Sight", "[usr.client.prefs.chat_toggles & CHAT_GHOSTSIGHT ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_sight/Get_checked(client/C) +/datum/verbs/menu/settings/ghost/chatterbox/toggle_ghost_sight/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_GHOSTSIGHT -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_whispers)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_whispers)() set name = "Show/Hide GhostWhispers" set category = "Preferences" set desc = "See All Whispers" @@ -53,10 +53,10 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_whispe to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTWHISPER) ? "see all whispers in the world" : "only see whispers from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Whispers", "[usr.client.prefs.chat_toggles & CHAT_GHOSTWHISPER ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_whispers/Get_checked(client/C) +/datum/verbs/menu/settings/ghost/chatterbox/toggle_ghost_whispers/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_GHOSTWHISPER -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_radio)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_radio)() set name = "Show/Hide GhostRadio" set category = "Preferences" set desc = "See All Radio Chatter" @@ -64,10 +64,10 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_radio) to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTRADIO) ? "see radio chatter" : "not see radio chatter"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Radio", "[usr.client.prefs.chat_toggles & CHAT_GHOSTRADIO ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //social experiment, increase the generation whenever you copypaste this shamelessly GENERATION 1 -/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_radio/Get_checked(client/C) +/datum/verbs/menu/settings/ghost/chatterbox/toggle_ghost_radio/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_GHOSTRADIO -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_pda)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_pda)() set name = "Show/Hide GhostPDA" set category = "Preferences" set desc = "See All PDA Messages" @@ -75,10 +75,10 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_pda)() to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTPDA) ? "see all pda messages in the world" : "only see pda messages from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost PDA", "[usr.client.prefs.chat_toggles & CHAT_GHOSTPDA ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_pda/Get_checked(client/C) +/datum/verbs/menu/settings/ghost/chatterbox/toggle_ghost_pda/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_GHOSTPDA -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_laws)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_laws)() set name = "Show/Hide GhostLaws" set category = "Preferences" set desc = "See All Law Changes" @@ -86,14 +86,14 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_laws)( to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTLAWS) ? "be notified of all law changes" : "no longer be notified of law changes"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Laws", "[usr.client.prefs.chat_toggles & CHAT_GHOSTLAWS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_laws/Get_checked(client/C) +/datum/verbs/menu/settings/ghost/chatterbox/toggle_ghost_laws/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_GHOSTLAWS -/datum/verbs/menu/Settings/Ghost/chatterbox/Events +/datum/verbs/menu/settings/ghost/chatterbox/events name = "Events" //please be aware that the following two verbs have inverted stat output, so that "Toggle Deathrattle|1" still means you activated it -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox/Events, toggle_deathrattle)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox/events, toggle_deathrattle)() set name = "Toggle Deathrattle" set category = "Preferences" set desc = "Death" @@ -101,10 +101,10 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox/Events, toggle_death usr.client.prefs.save_preferences() to_chat(usr, "You will [(usr.client.prefs.toggles & DISABLE_DEATHRATTLE) ? "no longer" : "now"] get messages when a sentient mob dies.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Deathrattle", "[!(usr.client.prefs.toggles & DISABLE_DEATHRATTLE) ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, maybe you should spend some time reading the comments. -/datum/verbs/menu/Settings/Ghost/chatterbox/Events/toggle_deathrattle/Get_checked(client/C) +/datum/verbs/menu/settings/ghost/chatterbox/events/toggle_deathrattle/Get_checked(client/C) return !(C.prefs.toggles & DISABLE_DEATHRATTLE) -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox/Events, toggle_arrivalrattle)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox/events, toggle_arrivalrattle)() set name = "Toggle Arrivalrattle" set category = "Preferences" set desc = "New Player Arrival" @@ -112,10 +112,10 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox/Events, toggle_arriv to_chat(usr, "You will [(usr.client.prefs.toggles & DISABLE_ARRIVALRATTLE) ? "no longer" : "now"] get messages when someone joins the station.") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Arrivalrattle", "[!(usr.client.prefs.toggles & DISABLE_ARRIVALRATTLE) ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, maybe you should rethink where your life went so wrong. -/datum/verbs/menu/Settings/Ghost/chatterbox/Events/toggle_arrivalrattle/Get_checked(client/C) +/datum/verbs/menu/settings/ghost/chatterbox/events/toggle_arrivalrattle/Get_checked(client/C) return !(C.prefs.toggles & DISABLE_ARRIVALRATTLE) -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost, togglemidroundantag)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost, togglemidroundantag)() set name = "Toggle Midround Antagonist" set category = "Preferences" set desc = "Midround Antagonist" @@ -123,10 +123,10 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost, togglemidroundantag)() usr.client.prefs.save_preferences() to_chat(usr, "You will [(usr.client.prefs.toggles & MIDROUND_ANTAG) ? "now" : "no longer"] be considered for midround antagonist positions.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Midround Antag", "[usr.client.prefs.toggles & MIDROUND_ANTAG ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/verbs/menu/Settings/Ghost/togglemidroundantag/Get_checked(client/C) +/datum/verbs/menu/settings/ghost/togglemidroundantag/Get_checked(client/C) return C.prefs.toggles & MIDROUND_ANTAG -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggletitlemusic)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, toggletitlemusic)() set name = "Hear/Silence Lobby Music" set category = "Preferences" set desc = "Hear Music In Lobby" @@ -140,11 +140,11 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggletitlemusic)() to_chat(usr, "You will no longer hear music in the game lobby.") usr.stop_sound_channel(CHANNEL_LOBBYMUSIC) SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Lobby Music", "[usr.client.prefs.toggles & SOUND_LOBBY ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/verbs/menu/Settings/Sound/toggletitlemusic/Get_checked(client/C) +/datum/verbs/menu/settings/sound/toggletitlemusic/Get_checked(client/C) return C.prefs.toggles & SOUND_LOBBY -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggleendofroundsounds)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, toggleendofroundsounds)() set name = "Hear/Silence End of Round Sounds" set category = "Preferences" set desc = "Hear Round End Sounds" @@ -155,11 +155,11 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggleendofroundsounds)() else to_chat(usr, "You will no longer hear sounds played before the server restarts.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle End of Round Sounds", "[usr.client.prefs.toggles & SOUND_ENDOFROUND ? "Enabled" : "Disabled"]")) -/datum/verbs/menu/Settings/Sound/toggleendofroundsounds/Get_checked(client/C) +/datum/verbs/menu/settings/sound/toggleendofroundsounds/Get_checked(client/C) return C.prefs.toggles & SOUND_ENDOFROUND -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, togglemidis)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, togglemidis)() set name = "Hear/Silence Midis" set category = "Preferences" set desc = "Hear Admin Triggered Sounds (Midis)" @@ -174,11 +174,11 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, togglemidis)() if(C && C.chatOutput && !C.chatOutput.broken && C.chatOutput.loaded) C.chatOutput.stopMusic() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Hearing Midis", "[usr.client.prefs.toggles & SOUND_MIDI ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/verbs/menu/Settings/Sound/togglemidis/Get_checked(client/C) +/datum/verbs/menu/settings/sound/togglemidis/Get_checked(client/C) return C.prefs.toggles & SOUND_MIDI -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_instruments)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, toggle_instruments)() set name = "Hear/Silence Instruments" set category = "Preferences" set desc = "Hear In-game Instruments" @@ -189,11 +189,11 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_instruments)() else to_chat(usr, "You will no longer hear musical instruments.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Instruments", "[usr.client.prefs.toggles & SOUND_INSTRUMENTS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/verbs/menu/Settings/Sound/toggle_instruments/Get_checked(client/C) +/datum/verbs/menu/settings/sound/toggle_instruments/Get_checked(client/C) return C.prefs.toggles & SOUND_INSTRUMENTS -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, Toggle_Soundscape)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, Toggle_Soundscape)() set name = "Hear/Silence Ambience" set category = "Preferences" set desc = "Hear Ambient Sound Effects" @@ -206,11 +206,11 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, Toggle_Soundscape)() usr.stop_sound_channel(CHANNEL_AMBIENCE) usr.stop_sound_channel(CHANNEL_BUZZ) SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ambience", "[usr.client.prefs.toggles & SOUND_AMBIENCE ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/verbs/menu/Settings/Sound/Toggle_Soundscape/Get_checked(client/C) +/datum/verbs/menu/settings/sound/Toggle_Soundscape/Get_checked(client/C) return C.prefs.toggles & SOUND_AMBIENCE -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_ship_ambience)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, toggle_ship_ambience)() set name = "Hear/Silence Ship Ambience" set category = "Preferences" set desc = "Hear Ship Ambience Roar" @@ -223,11 +223,11 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_ship_ambience)() usr.stop_sound_channel(CHANNEL_BUZZ) usr.client.ambience_playing = 0 SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ship Ambience", "[usr.client.prefs.toggles & SOUND_SHIP_AMBIENCE ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, I bet you read this comment expecting to see the same thing :^) -/datum/verbs/menu/Settings/Sound/toggle_ship_ambience/Get_checked(client/C) +/datum/verbs/menu/settings/sound/toggle_ship_ambience/Get_checked(client/C) return C.prefs.toggles & SOUND_SHIP_AMBIENCE -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_announcement_sound)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, toggle_announcement_sound)() set name = "Hear/Silence Announcements" set category = "Preferences" set desc = "Hear Announcement Sound" @@ -235,11 +235,11 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_announcement_sound)() to_chat(usr, "You will now [(usr.client.prefs.toggles & SOUND_ANNOUNCEMENTS) ? "hear announcement sounds" : "no longer hear announcements"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Announcement Sound", "[usr.client.prefs.toggles & SOUND_ANNOUNCEMENTS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/verbs/menu/Settings/Sound/toggle_announcement_sound/Get_checked(client/C) +/datum/verbs/menu/settings/sound/toggle_announcement_sound/Get_checked(client/C) return C.prefs.toggles & SOUND_ANNOUNCEMENTS -/datum/verbs/menu/Settings/Sound/verb/stop_client_sounds() +/datum/verbs/menu/settings/sound/verb/stop_client_sounds() set name = "Stop Sounds" set category = "Preferences" set desc = "Stop Current Sounds" @@ -250,7 +250,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_announcement_sound)() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Stop Self Sounds")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_ooc)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings, listen_ooc)() set name = "Show/Hide OOC" set category = "Preferences" set desc = "Show OOC Chat" @@ -258,10 +258,10 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_ooc)() usr.client.prefs.save_preferences() to_chat(usr, "You will [(usr.client.prefs.chat_toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Seeing OOC", "[usr.client.prefs.chat_toggles & CHAT_OOC ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/verbs/menu/Settings/listen_ooc/Get_checked(client/C) +/datum/verbs/menu/settings/listen_ooc/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_OOC -TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_bank_card)() +TOGGLE_CHECKBOX(/datum/verbs/menu/settings, listen_bank_card)() set name = "Show/Hide Income Updates" set category = "Preferences" set desc = "Show or hide updates to your income" @@ -269,7 +269,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_bank_card)() usr.client.prefs.save_preferences() to_chat(usr, "You will [(usr.client.prefs.chat_toggles & CHAT_BANKCARD) ? "now" : "no longer"] be notified when you get paid.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Income Notifications", "[(usr.client.prefs.chat_toggles & CHAT_BANKCARD) ? "Enabled" : "Disabled"]")) -/datum/verbs/menu/Settings/listen_bank_card/Get_checked(client/C) +/datum/verbs/menu/settings/listen_bank_card/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_BANKCARD diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index efd2a82b44b..beeded6fe8c 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -161,7 +161,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") var/action = alert(src, "Invalid Chat Output data found!\nRecreate data?", "Wot?", "Recreate Chat Output data", "Cancel") if (action != "Recreate Chat Output data") return - chatOutput = new /datum/chatOutput(src) + chatOutput = new /datum/chat_output(src) chatOutput.start() action = alert(src, "Goon chat reloading, wait a bit and tell me if it's fixed", "", "Fixed", "Nope") if (action == "Fixed") diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 3111bb4f674..cdaba046b94 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -124,13 +124,13 @@ dog_fashion = /datum/dog_fashion/head -/obj/item/clothing/head/collectable/HoS +/obj/item/clothing/head/collectable/hos name = "collectable HoS hat" desc = "Now you too can beat prisoners, set silly sentences, and arrest for no reason!" icon_state = "hoscap" dynamic_hair_suffix = "" -/obj/item/clothing/head/collectable/HoP +/obj/item/clothing/head/collectable/hop name = "collectable HoP hat" desc = "It's your turn to demand excessive paperwork, signatures, stamps, and hire more clowns! Papers, please!" icon_state = "hopcap" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 25e0952951b..772e40d3e9b 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -137,7 +137,7 @@ //Security -/obj/item/clothing/head/HoS +/obj/item/clothing/head/hos name = "head of security cap" desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge." icon_state = "hoscap" @@ -145,16 +145,16 @@ strip_delay = 80 dynamic_hair_suffix = "" -/obj/item/clothing/head/HoS/syndicate +/obj/item/clothing/head/hos/syndicate name = "syndicate cap" desc = "A black cap fit for a high ranking syndicate officer." -/obj/item/clothing/head/HoS/beret +/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" -/obj/item/clothing/head/HoS/beret/syndicate +/obj/item/clothing/head/hos/beret/syndicate name = "syndicate beret" desc = "A black beret with thick armor padding inside. Stylish and robust." diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index e1260df3d0d..55a70812324 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -335,23 +335,23 @@ QDEL_NULL(W) . = ..() -/obj/item/clothing/shoes/kindleKicks +/obj/item/clothing/shoes/kindle_kicks name = "Kindle Kicks" desc = "They'll sure kindle something in you, and it's not childhood nostalgia..." icon_state = "kindleKicks" inhand_icon_state = "kindleKicks" - actions_types = list(/datum/action/item_action/kindleKicks) + actions_types = list(/datum/action/item_action/kindle_kicks) var/lightCycle = 0 var/active = FALSE -/obj/item/clothing/shoes/kindleKicks/ui_action_click(mob/user, action) +/obj/item/clothing/shoes/kindle_kicks/ui_action_click(mob/user, action) if(active) return active = TRUE set_light(2, 3, rgb(rand(0,255),rand(0,255),rand(0,255))) addtimer(CALLBACK(src, .proc/lightUp), 5) -/obj/item/clothing/shoes/kindleKicks/proc/lightUp(mob/user) +/obj/item/clothing/shoes/kindle_kicks/proc/lightUp(mob/user) if(lightCycle < 15) set_light(2, 3, rgb(rand(0,255),rand(0,255),rand(0,255))) lightCycle += 1 diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm index bcb24abfe21..0f885d4419c 100644 --- a/code/modules/clothing/under/trek.dm +++ b/code/modules/clothing/under/trek.dm @@ -57,7 +57,7 @@ //Q -/obj/item/clothing/under/trek/Q +/obj/item/clothing/under/trek/q name = "french marshall's uniform" desc = "Something about it feels off..." icon_state = "trek_Q" diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index 2adc2408bbb..634eac7acaf 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -19,12 +19,12 @@ var/range = 8 var/view_check = TRUE var/forensicPrintCount = 0 - actions_types = list(/datum/action/item_action/displayDetectiveScanResults) + actions_types = list(/datum/action/item_action/display_detective_scan_results) -/datum/action/item_action/displayDetectiveScanResults +/datum/action/item_action/display_detective_scan_results name = "Display Forensic Scanner Results" -/datum/action/item_action/displayDetectiveScanResults/Trigger() +/datum/action/item_action/display_detective_scan_results/Trigger() var/obj/item/detective_scanner/scanner = target if(istype(scanner)) scanner.displayDetectiveScanResults(usr) diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm index 9d9ead26e9b..d66e0469bb0 100644 --- a/code/modules/events/holiday/halloween.dm +++ b/code/modules/events/holiday/halloween.dm @@ -14,10 +14,10 @@ if(b) new /obj/item/storage/spooky(b) - for(var/mob/living/simple_animal/pet/dog/corgi/Ian/Ian in GLOB.mob_living_list) + for(var/mob/living/simple_animal/pet/dog/corgi/ian/Ian in GLOB.mob_living_list) Ian.place_on_head(new /obj/item/bedsheet(Ian)) - for(var/mob/living/simple_animal/parrot/Poly/Poly in GLOB.mob_living_list) - new /mob/living/simple_animal/parrot/Poly/ghost(Poly.loc) + for(var/mob/living/simple_animal/parrot/poly/Poly in GLOB.mob_living_list) + new /mob/living/simple_animal/parrot/poly/ghost(Poly.loc) qdel(Poly) /datum/round_event/spooky/announce(fake) diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index fb9b2b5053b..5ca8820912d 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -3,7 +3,7 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list( /mob/living/simple_animal/parrot, /mob/living/simple_animal/hostile/lizard, /mob/living/simple_animal/sloth, - /mob/living/simple_animal/mouse/brown/Tom, + /mob/living/simple_animal/mouse/brown/tom, /mob/living/simple_animal/hostile/retaliate/goat, /mob/living/simple_animal/chicken, /mob/living/simple_animal/cow, diff --git a/code/modules/events/stray_cargo.dm b/code/modules/events/stray_cargo.dm index f7ff0e6bc57..f9f0f359110 100644 --- a/code/modules/events/stray_cargo.dm +++ b/code/modules/events/stray_cargo.dm @@ -55,7 +55,7 @@ crate.locked = FALSE //Unlock secure crates crate.update_icon() var/obj/structure/closet/supplypod/pod = make_pod() - new /obj/effect/DPtarget(LZ, pod, crate) + new /obj/effect/dp_target(LZ, pod, crate) ///Handles the creation of the pod, in case it needs to be modified beforehand /datum/round_event/stray_cargo/proc/make_pod() diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index d947d76d33c..932cefc305d 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -14,7 +14,7 @@ var/randomProbability = 1 var/reagentsAmount = 100 var/list/saferChems = list(/datum/reagent/water,/datum/reagent/carbon,/datum/reagent/consumable/flour,/datum/reagent/space_cleaner,/datum/reagent/consumable/nutriment,/datum/reagent/consumable/condensedcapsaicin,/datum/reagent/drug/mushroomhallucinogen,/datum/reagent/lube,/datum/reagent/glitter/pink,/datum/reagent/cryptobiolin, - /datum/reagent/toxin/plantbgone,/datum/reagent/blood,/datum/reagent/medicine/C2/multiver,/datum/reagent/drug/space_drugs,/datum/reagent/medicine/morphine,/datum/reagent/water/holywater,/datum/reagent/consumable/ethanol,/datum/reagent/consumable/hot_coco,/datum/reagent/toxin/acid,/datum/reagent/toxin/mindbreaker,/datum/reagent/toxin/rotatium,/datum/reagent/bluespace, + /datum/reagent/toxin/plantbgone,/datum/reagent/blood,/datum/reagent/medicine/c2/multiver,/datum/reagent/drug/space_drugs,/datum/reagent/medicine/morphine,/datum/reagent/water/holywater,/datum/reagent/consumable/ethanol,/datum/reagent/consumable/hot_coco,/datum/reagent/toxin/acid,/datum/reagent/toxin/mindbreaker,/datum/reagent/toxin/rotatium,/datum/reagent/bluespace, /datum/reagent/pax,/datum/reagent/consumable/laughter,/datum/reagent/concentrated_barbers_aid,/datum/reagent/baldium,/datum/reagent/colorful_reagent,/datum/reagent/peaceborg/confuse,/datum/reagent/peaceborg/tire,/datum/reagent/consumable/sodiumchloride,/datum/reagent/consumable/ethanol/beer,/datum/reagent/hair_dye,/datum/reagent/consumable/sugar,/datum/reagent/glitter/white,/datum/reagent/growthserum) //needs to be chemid unit checked at some point diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index adba7822d06..cb594988199 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -46,7 +46,7 @@ God bless America. /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/food/condiment, /obj/item/storage, - /obj/item/smallDelivery, + /obj/item/small_delivery, /obj/item/his_grace)) var/datum/looping_sound/deep_fryer/fry_loop diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm index e9194f1b553..c8e7a68946f 100644 --- a/code/modules/goonchat/browserOutput.dm +++ b/code/modules/goonchat/browserOutput.dm @@ -9,7 +9,7 @@ For the main html chat area * The chatOutput datum exists to handle the goonchat browser. * On client, created on Client/New() */ -/datum/chatOutput +/datum/chat_output /// The client that owns us. var/client/owner /// How many times client data has been checked @@ -25,7 +25,7 @@ For the main html chat area var/list/connectionHistory //Contains the connection history passed from chat cookie var/adminMusicVolume = 25 //This is for the Play Global Sound verb -/datum/chatOutput/New(client/C) +/datum/chat_output/New(client/C) owner = C messageQueue = list() connectionHistory = list() @@ -35,7 +35,7 @@ For the main html chat area * Aborts if a problem is encountered. * Async because this is called from Client/New. */ -/datum/chatOutput/proc/start() +/datum/chat_output/proc/start() set waitfor = FALSE //Check for existing chat if(!owner) @@ -57,7 +57,7 @@ For the main html chat area return TRUE /// Loads goonchat and sends assets. -/datum/chatOutput/proc/load() +/datum/chat_output/proc/load() set waitfor = FALSE if(!owner) return @@ -68,7 +68,7 @@ For the main html chat area owner << browse(file('code/modules/goonchat/browserassets/html/browserOutput.html'), "window=browseroutput") /// Interprets input from the client. Will send data back if required. -/datum/chatOutput/Topic(href, list/href_list) +/datum/chat_output/Topic(href, list/href_list) if(usr.client != owner) return TRUE @@ -108,7 +108,7 @@ For the main html chat area /// Called on chat output done-loading by JS. -/datum/chatOutput/proc/doneLoading() +/datum/chat_output/proc/doneLoading() if(loaded) return @@ -130,7 +130,7 @@ For the main html chat area SEND_TEXT(owner, "Failed to load fancy chat, reverting to old chat. Certain features won't work.") /// Hides the standard output and makes the browser visible. -/datum/chatOutput/proc/showChat() +/datum/chat_output/proc/showChat() winset(owner, "output", "is-visible=false") winset(owner, "browseroutput", "is-disabled=false;is-visible=true") @@ -138,12 +138,12 @@ For the main html chat area /proc/syncChatRegexes() for (var/user in GLOB.clients) var/client/C = user - var/datum/chatOutput/Cchat = C.chatOutput + var/datum/chat_output/Cchat = C.chatOutput if (Cchat && !Cchat.broken && Cchat.loaded) Cchat.syncRegex() /// Used to dynamically add regexes to the browser output. Currently only used by the IC filter. -/datum/chatOutput/proc/syncRegex() +/datum/chat_output/proc/syncRegex() var/list/regexes = list() if (config.ic_filter_regex) @@ -157,7 +157,7 @@ For the main html chat area ehjax_send(data = list("syncRegex" = regexes)) /// Sends json encoded data to the browser. -/datum/chatOutput/proc/ehjax_send(client/C = owner, window = "browseroutput", data) +/datum/chat_output/proc/ehjax_send(client/C = owner, window = "browseroutput", data) if(islist(data)) data = json_encode(data) C << output("[data]", "[window]:ehjaxCallback") @@ -171,7 +171,7 @@ For the main html chat area ** "start" determines the start time of the sound ** "end" determines when the musics stops playing */ -/datum/chatOutput/proc/sendMusic(music, list/extra_data) +/datum/chat_output/proc/sendMusic(music, list/extra_data) if(!findtext(music, GLOB.is_http_protocol)) return var/list/music_data = list("adminMusic" = url_encode(url_encode(music))) @@ -184,16 +184,16 @@ For the main html chat area ehjax_send(data = music_data) /// Stops music playing throw the browser. -/datum/chatOutput/proc/stopMusic() +/datum/chat_output/proc/stopMusic() ehjax_send(data = "stopMusic") /// Setter for adminMusicVolume. Sanitizes the value to between 0 and 100. -/datum/chatOutput/proc/setMusicVolume(volume = "") +/datum/chat_output/proc/setMusicVolume(volume = "") if(volume) adminMusicVolume = clamp(text2num(volume), 0, 100) /// Sends client connection details to the chat to handle and save -/datum/chatOutput/proc/sendClientData() +/datum/chat_output/proc/sendClientData() //Get dem deets var/list/deets = list("clientData" = list()) deets["clientData"]["ckey"] = owner.ckey @@ -203,7 +203,7 @@ For the main html chat area ehjax_send(data = data) /// Called by client, sent data to investigate (cookie history so far) -/datum/chatOutput/proc/analyzeClientData(cookie = "") +/datum/chat_output/proc/analyzeClientData(cookie = "") //Spam check if(world.time > next_time_to_clear) next_time_to_clear = world.time + (3 SECONDS) @@ -250,11 +250,11 @@ For the main html chat area cookieSent = TRUE /// Called by js client every 60 seconds -/datum/chatOutput/proc/ping() +/datum/chat_output/proc/ping() return "pong" /// Called by js client on js error -/datum/chatOutput/proc/debug(error) +/datum/chat_output/proc/debug(error) log_world("\[[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]\] Client: [(src.owner.key ? src.owner.key : src.owner)] triggered JS error: [error]") /// Global chat proc. to_chat_immediate will circumvent SSchat and send data as soon as possible. @@ -321,11 +321,11 @@ For the main html chat area SSchat.queue(target, message, handle_whitespace, trailing_newline, confidential) /// Dark mode light mode stuff. Yell at KMC if this breaks! (See darkmode.dm for documentation) -/datum/chatOutput/proc/swaptolightmode() +/datum/chat_output/proc/swaptolightmode() owner.force_white_theme() /// Light mode stuff. (See darkmode.dm for documentation) -/datum/chatOutput/proc/swaptodarkmode() +/datum/chat_output/proc/swaptodarkmode() owner.force_dark_theme() #undef MAX_COOKIE_LENGTH diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index aefbc4fa980..fce3f1160e9 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -129,7 +129,7 @@ /obj/item/toy/balloon, /obj/item/toy/gun, /obj/item/toy/sword, - /obj/item/toy/talking/AI, + /obj/item/toy/talking/ai, /obj/item/toy/talking/owl, /obj/item/toy/talking/griffin, /obj/item/toy/minimeteor, @@ -151,7 +151,7 @@ /obj/item/toy/prize/clarke, /obj/item/toy/plush/carpplushie, /obj/item/toy/redbutton, - /obj/item/toy/windupToolbox, + /obj/item/toy/windup_toolbox, /obj/item/clothing/head/collectable/rabbitears) new won(where) new/obj/item/reagent_containers/food/snacks/chocolateegg(where) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 3c2e51465fd..bcf2c99faa2 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -250,21 +250,21 @@ begin_month = JULY drone_hat = /obj/item/clothing/head/nursehat -/datum/holiday/UFO +/datum/holiday/ufo name = "UFO Day" begin_day = 2 begin_month = JULY drone_hat = /obj/item/clothing/mask/facehugger/dead -/datum/holiday/UFO/getStationPrefix() //Is such a thing even possible? +/datum/holiday/ufo/getStationPrefix() //Is such a thing even possible? return pick("Ayy","Truth","Tsoukalos","Mulder","Scully") //Yes it is! -/datum/holiday/USA +/datum/holiday/usa name = "Independence Day" begin_day = 4 begin_month = JULY -/datum/holiday/USA/getStationPrefix() +/datum/holiday/usa/getStationPrefix() return pick("Independent","American","Burger","Bald Eagle","Star-Spangled", "Fireworks") /datum/holiday/writer @@ -520,7 +520,7 @@ for(var/obj/machinery/computer/security/telescreen/entertainment/Monitor in GLOB.machines) Monitor.icon_state_on = "entertainment_xmas" - for(var/mob/living/simple_animal/pet/dog/corgi/Ian/Ian in GLOB.mob_living_list) + for(var/mob/living/simple_animal/pet/dog/corgi/ian/Ian in GLOB.mob_living_list) Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian)) diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index 2460a0a7034..8746b157ad3 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -26,7 +26,7 @@ icon_dead = "ambrosia-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) mutatelist = list(/obj/item/seeds/ambrosia/deus) - reagents_add = list(/datum/reagent/medicine/C2/aiuri = 0.1, /datum/reagent/medicine/C2/libital = 0.1 ,/datum/reagent/drug/space_drugs = 0.15, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/toxin = 0.1) + reagents_add = list(/datum/reagent/medicine/c2/aiuri = 0.1, /datum/reagent/medicine/c2/libital = 0.1 ,/datum/reagent/drug/space_drugs = 0.15, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/toxin = 0.1) /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris seed = /obj/item/seeds/ambrosia diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index 05e3b485da7..ece20e5c8d3 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -234,7 +234,7 @@ species = "greengrape" plantname = "Green-Grape Vine" product = /obj/item/reagent_containers/food/snacks/grown/grapes/green - reagents_add = list( /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.1, /datum/reagent/medicine/C2/aiuri = 0.2) + reagents_add = list( /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.1, /datum/reagent/medicine/c2/aiuri = 0.2) /obj/item/reagent_containers/food/snacks/grown/grapes/green seed = /obj/item/seeds/grape/green diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 927eee842f1..dce153760af 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -16,7 +16,7 @@ icon_grow = "poppy-grow" icon_dead = "poppy-dead" mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/poppy/lily) - reagents_add = list(/datum/reagent/medicine/C2/libital = 0.2, /datum/reagent/consumable/nutriment = 0.05) + reagents_add = list(/datum/reagent/medicine/c2/libital = 0.2, /datum/reagent/consumable/nutriment = 0.05) /obj/item/reagent_containers/food/snacks/grown/poppy seed = /obj/item/seeds/poppy diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm index a418384dbf8..7764be7ecb7 100644 --- a/code/modules/hydroponics/grown/kudzu.dm +++ b/code/modules/hydroponics/grown/kudzu.dm @@ -15,7 +15,7 @@ growthstages = 4 rarity = 30 var/list/mutations = list() - reagents_add = list(/datum/reagent/medicine/C2/multiver = 0.04, /datum/reagent/consumable/nutriment = 0.02) + reagents_add = list(/datum/reagent/medicine/c2/multiver = 0.04, /datum/reagent/consumable/nutriment = 0.02) graft_gene = /datum/plant_gene/trait/plant_type/weed_hardy /obj/item/seeds/kudzu/Copy() diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 116ddc3e70c..4561fd1de55 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -22,7 +22,7 @@ growthstages = 4 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' - reagents_add = list(/datum/reagent/medicine/morphine = 0.35, /datum/reagent/medicine/C2/multiver = 0.35, /datum/reagent/consumable/nutriment = 0) + reagents_add = list(/datum/reagent/medicine/morphine = 0.35, /datum/reagent/medicine/c2/multiver = 0.35, /datum/reagent/consumable/nutriment = 0) graft_gene = /datum/plant_gene/trait/plant_type/fungal_metabolism /obj/item/reagent_containers/food/snacks/grown/mushroom/reishi diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm index 8c0e8095804..c4e9582039b 100644 --- a/code/modules/jobs/job_exp.dm +++ b/code/modules/jobs/job_exp.dm @@ -156,7 +156,7 @@ GLOBAL_PROTECT(exp_to_update) return -1 if(!SSdbcore.Connect()) return -1 - var/datum/DBQuery/exp_read = SSdbcore.NewQuery( + var/datum/db_query/exp_read = SSdbcore.NewQuery( "SELECT job, minutes FROM [format_table_name("role_time")] WHERE ckey = :ckey", list("ckey" = ckey) ) @@ -191,7 +191,7 @@ GLOBAL_PROTECT(exp_to_update) else prefs.db_flags |= newflag - var/datum/DBQuery/flag_update = SSdbcore.NewQuery( + var/datum/db_query/flag_update = SSdbcore.NewQuery( "UPDATE [format_table_name("player")] SET flags=:flags WHERE ckey=:ckey", list("flags" = "[prefs.db_flags]", "ckey" = ckey) ) @@ -274,7 +274,7 @@ GLOBAL_PROTECT(exp_to_update) if(!SSdbcore.Connect()) return FALSE - var/datum/DBQuery/flags_read = SSdbcore.NewQuery( + var/datum/db_query/flags_read = SSdbcore.NewQuery( "SELECT flags FROM [format_table_name("player")] WHERE ckey=:ckey", list("ckey" = ckey) ) diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm index ccd18dd72a6..f53166d9b04 100644 --- a/code/modules/jobs/job_types/ai.dm +++ b/code/modules/jobs/job_types/ai.dm @@ -24,8 +24,8 @@ /datum/job/ai/after_spawn(mob/H, mob/M, latejoin) . = ..() if(latejoin) - var/obj/structure/AIcore/latejoin_inactive/lateJoinCore - for(var/obj/structure/AIcore/latejoin_inactive/P in GLOB.latejoin_ai_cores) + var/obj/structure/ai_core/latejoin_inactive/lateJoinCore + for(var/obj/structure/ai_core/latejoin_inactive/P in GLOB.latejoin_ai_cores) if(P.is_available()) lateJoinCore = P GLOB.latejoin_ai_cores -= P @@ -57,7 +57,7 @@ if(!do_special_check) return TRUE for(var/i in GLOB.latejoin_ai_cores) - var/obj/structure/AIcore/latejoin_inactive/LAI = i + var/obj/structure/ai_core/latejoin_inactive/LAI = i if(istype(LAI)) if(LAI.is_available()) return TRUE diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 660968cc406..2105e65bd2e 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -43,7 +43,7 @@ shoes = /obj/item/clothing/shoes/jackboots suit = /obj/item/clothing/suit/armor/hos/trenchcoat gloves = /obj/item/clothing/gloves/color/black - head = /obj/item/clothing/head/HoS/beret + head = /obj/item/clothing/head/hos/beret 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/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 80ca8ca6981..1201333b677 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -52,7 +52,7 @@ SQLsearch += "author LIKE '%[author]%' AND title LIKE '%[title]%' AND category='[category]'" var/bookcount = 0 var/booksperpage = 20 - var/datum/DBQuery/query_library_count_books = SSdbcore.NewQuery({" + var/datum/db_query/query_library_count_books = SSdbcore.NewQuery({" SELECT COUNT(id) FROM [format_table_name("library")] WHERE isnull(deleted) AND author LIKE '%' + :author + '%' @@ -75,7 +75,7 @@ pagecount++ dat += pagelist.Join(" | ") search_page = text2num(search_page) - var/datum/DBQuery/query_library_list_books = SSdbcore.NewQuery({" + var/datum/db_query/query_library_list_books = SSdbcore.NewQuery({" SELECT author, title, category, id FROM [format_table_name("library")] WHERE isnull(deleted) @@ -168,7 +168,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums if(!SSdbcore.Connect()) return GLOB.cachedbooks = list() - var/datum/DBQuery/query_library_cache = SSdbcore.NewQuery("SELECT id, author, title, category FROM [format_table_name("library")] WHERE isnull(deleted)") + var/datum/db_query/query_library_cache = SSdbcore.NewQuery("SELECT id, author, title, category FROM [format_table_name("library")] WHERE isnull(deleted)") if(!query_library_cache.Execute()) qdel(query_library_cache) return @@ -449,7 +449,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums alert("Connection to Archive has been severed. Aborting.") else var/msg = "[key_name(usr)] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs" - var/datum/DBQuery/query_library_upload = SSdbcore.NewQuery({" + var/datum/db_query/query_library_upload = SSdbcore.NewQuery({" INSERT INTO [format_table_name("library")] (author, title, content, category, ckey, datetime, round_id_created) VALUES (:author, :title, :content, :category, :ckey, Now(), :round_id) "}, list("title" = scanner.cache.name, "author" = scanner.cache.author, "content" = scanner.cache.dat, "category" = upload_category, "ckey" = usr.ckey, "round_id" = GLOB.round_id)) @@ -490,7 +490,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums say("Printer unavailable. Please allow a short time before attempting to print.") else cooldown = world.time + PRINTER_COOLDOWN - var/datum/DBQuery/query_library_print = SSdbcore.NewQuery( + var/datum/db_query/query_library_print = SSdbcore.NewQuery( "SELECT * FROM [format_table_name("library")] WHERE id=:id AND isnull(deleted)", list("id" = id) ) diff --git a/code/modules/library/random_books.dm b/code/modules/library/random_books.dm index c667e38c4fa..835a95009c4 100644 --- a/code/modules/library/random_books.dm +++ b/code/modules/library/random_books.dm @@ -49,7 +49,7 @@ return if(prob(25)) category = null - var/datum/DBQuery/query_get_random_books = SSdbcore.NewQuery({" + var/datum/db_query/query_get_random_books = SSdbcore.NewQuery({" SELECT author, title, content FROM [format_table_name("library")] WHERE isnull(deleted) AND (:category IS NULL OR category = :category) diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index d3c53644096..7b17fa03820 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -170,7 +170,7 @@ new /obj/item/clothing/head/kitty(src) new /obj/item/clothing/neck/petcollar(src) if(63 to 64) - new /obj/item/clothing/shoes/kindleKicks(src) + new /obj/item/clothing/shoes/kindle_kicks(src) if(65 to 66) new /obj/item/clothing/suit/ianshirt(src) new /obj/item/clothing/suit/hooded/ian_costume(src) diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm index f589c58d411..12d7ae32b29 100644 --- a/code/modules/mining/aux_base_camera.dm +++ b/code/modules/mining/aux_base_camera.dm @@ -1,22 +1,22 @@ //Aux base construction console -/mob/camera/aiEye/remote/base_construction +/mob/camera/ai_eye/remote/base_construction name = "construction holo-drone" move_on_shuttle = 1 //Allows any curious crew to watch the base after it leaves. (This is safe as the base cannot be modified once it leaves) icon = 'icons/obj/mining.dmi' icon_state = "construction_drone" var/area/starting_area -/mob/camera/aiEye/remote/base_construction/Initialize() +/mob/camera/ai_eye/remote/base_construction/Initialize() . = ..() starting_area = get_area(loc) -/mob/camera/aiEye/remote/base_construction/setLoc(var/t) +/mob/camera/ai_eye/remote/base_construction/setLoc(var/t) var/area/curr_area = get_area(t) if(curr_area == starting_area || istype(curr_area, /area/shuttle/auxiliary_base)) return ..() //While players are only allowed to build in the base area, but consoles starting outside the base can move into the base area to begin work. -/mob/camera/aiEye/remote/base_construction/relaymove(mob/user, direct) +/mob/camera/ai_eye/remote/base_construction/relaymove(mob/user, direct) dir = direct //This camera eye is visible as a drone, and needs to keep the dir updated ..() @@ -74,7 +74,7 @@ spawn_spot = src - eyeobj = new /mob/camera/aiEye/remote/base_construction(get_turf(spawn_spot)) + eyeobj = new /mob/camera/ai_eye/remote/base_construction(get_turf(spawn_spot)) eyeobj.origin = src @@ -130,7 +130,7 @@ /datum/action/innate/aux_base //Parent aux base action icon_icon = 'icons/mob/actions/actions_construction.dmi' var/mob/living/C //Mob using the action - var/mob/camera/aiEye/remote/base_construction/remote_eye //Console's eye mob + var/mob/camera/ai_eye/remote/base_construction/remote_eye //Console's eye mob var/obj/machinery/computer/camera_advanced/base_construction/B //Console itself /datum/action/innate/aux_base/Activate() diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 1d5762d523b..3c3cab50d73 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -176,7 +176,7 @@ to_chat(itemUser, failText) return to_chat(itemUser, "The snake, satisfied with your oath, attaches itself and the rod to your forearm with an inseparable grip. Your thoughts seem to only revolve around the core idea of helping others, and harm is nothing more than a distant, wicked memory...") - var/datum/status_effect/hippocraticOath/effect = itemUser.apply_status_effect(STATUS_EFFECT_HIPPOCRATIC_OATH) + var/datum/status_effect/hippocratic_oath/effect = itemUser.apply_status_effect(STATUS_EFFECT_HIPPOCRATIC_OATH) effect.hand = usedHand activated() diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 3267c2cc40b..ee5462fd23f 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -61,7 +61,7 @@ var/isadmin = FALSE if(client?.holder) isadmin = TRUE - var/datum/DBQuery/query_get_new_polls = SSdbcore.NewQuery({" + var/datum/db_query/query_get_new_polls = SSdbcore.NewQuery({" SELECT id FROM [format_table_name("poll_question")] WHERE (adminonly = 0 OR :isadmin = 1) AND Now() BETWEEN starttime AND endtime diff --git a/code/modules/mob/dead/new_player/poll.dm b/code/modules/mob/dead/new_player/poll.dm index 23f1c721645..173282282a9 100644 --- a/code/modules/mob/dead/new_player/poll.dm +++ b/code/modules/mob/dead/new_player/poll.dm @@ -42,7 +42,7 @@ * */ /mob/dead/new_player/proc/poll_player_option(datum/poll_question/poll) - var/datum/DBQuery/query_option_get_voted = SSdbcore.NewQuery({" + var/datum/db_query/query_option_get_voted = SSdbcore.NewQuery({" SELECT optionid FROM [format_table_name("poll_vote")] WHERE pollid = :pollid AND ckey = :ckey AND deleted = 0 "}, list("pollid" = poll.poll_id, "ckey" = ckey)) @@ -86,7 +86,7 @@ * */ /mob/dead/new_player/proc/poll_player_text(datum/poll_question/poll) - var/datum/DBQuery/query_text_get_replytext = SSdbcore.NewQuery({" + var/datum/db_query/query_text_get_replytext = SSdbcore.NewQuery({" SELECT replytext FROM [format_table_name("poll_textreply")] WHERE pollid = :pollid AND ckey = :ckey AND deleted = 0 "}, list("pollid" = poll.poll_id, "ckey" = ckey)) @@ -123,7 +123,7 @@ * */ /mob/dead/new_player/proc/poll_player_rating(datum/poll_question/poll) - var/datum/DBQuery/query_rating_get_votes = SSdbcore.NewQuery({" + var/datum/db_query/query_rating_get_votes = SSdbcore.NewQuery({" SELECT optionid, rating FROM [format_table_name("poll_vote")] WHERE pollid = :pollid AND ckey = :ckey AND deleted = 0 "}, list("pollid" = poll.poll_id, "ckey" = ckey)) @@ -178,7 +178,7 @@ * */ /mob/dead/new_player/proc/poll_player_multi(datum/poll_question/poll) - var/datum/DBQuery/query_multi_get_votes = SSdbcore.NewQuery({" + var/datum/db_query/query_multi_get_votes = SSdbcore.NewQuery({" SELECT optionid FROM [format_table_name("poll_vote")] WHERE pollid = :pollid AND ckey = :ckey AND deleted = 0 "}, list("pollid" = poll.poll_id, "ckey" = ckey)) @@ -222,9 +222,9 @@ * */ /mob/dead/new_player/proc/poll_player_irv(datum/poll_question/poll) - var/datum/asset/irv_assets = get_asset_datum(/datum/asset/group/IRV) + var/datum/asset/irv_assets = get_asset_datum(/datum/asset/group/irv) irv_assets.send(src) - var/datum/DBQuery/query_irv_get_votes = SSdbcore.NewQuery({" + var/datum/db_query/query_irv_get_votes = SSdbcore.NewQuery({" SELECT optionid FROM [format_table_name("poll_vote")] WHERE pollid = :pollid AND ckey = :ckey AND deleted = 0 "}, list("pollid" = poll.poll_id, "ckey" = ckey)) @@ -336,7 +336,7 @@ table = "poll_textreply" var/sql_poll_id = poll.poll_id var/vote_id //only used for option and text polls to save needing another query - var/datum/DBQuery/query_validate_poll_vote = SSdbcore.NewQuery({" + var/datum/db_query/query_validate_poll_vote = SSdbcore.NewQuery({" SELECT (SELECT id FROM [format_table_name(table)] WHERE ckey = :ckey AND pollid = :pollid AND deleted = 0 LIMIT 1) FROM [format_table_name("poll_question")] @@ -388,7 +388,7 @@ if(!option) to_chat(src, "No option was selected.") return - var/datum/DBQuery/query_vote_option = SSdbcore.NewQuery({" + var/datum/db_query/query_vote_option = SSdbcore.NewQuery({" INSERT INTO [format_table_name("poll_vote")] (id, datetime, pollid, optionid, ckey, ip, adminrank) VALUES (:vote_id, NOW(), :poll_id, :option_id, :ckey, INET_ATON(:ip), :admin_rank) ON DUPLICATE KEY UPDATE datetime = NOW(), optionid = :option_id, ip = INET_ATON(:ip), adminrank = :admin_rank @@ -420,7 +420,7 @@ if(!reply_text || (length(reply_text) > 2048)) to_chat(src, "The text you entered was blank or too long. Please correct the text and submit again.") return - var/datum/DBQuery/query_vote_text = SSdbcore.NewQuery({" + var/datum/db_query/query_vote_text = SSdbcore.NewQuery({" INSERT INTO [format_table_name("poll_textreply")] (id, datetime, pollid, ckey, ip, replytext, adminrank) VALUES (:vote_id, NOW(), :poll_id, :ckey, INET_ATON(:ip), :reply_text, :admin_rank) ON DUPLICATE KEY UPDATE datetime = NOW(), ip = INET_ATON(:ip), replytext = :reply_text, adminrank = :admin_rank @@ -449,7 +449,7 @@ if(IsAdminAdvancedProcCall()) return var/list/votes = list() - var/datum/DBQuery/query_get_rating_votes = SSdbcore.NewQuery({" + var/datum/db_query/query_get_rating_votes = SSdbcore.NewQuery({" SELECT id, optionid FROM [format_table_name("poll_vote")] WHERE pollid = :pollid AND ckey = :ckey AND deleted = 0 "}, list("pollid" = sql_poll_id, "ckey" = ckey)) @@ -518,7 +518,7 @@ )) /*with revoting and poll editing possible there can be an edge case where a poll is changed to allow less multiple choice options than a user has already voted on rather than trying to calculate which options should be updated and which deleted, we just delete all of a user's votes and re-insert as needed*/ - var/datum/DBQuery/query_delete_multi_votes = SSdbcore.NewQuery({" + var/datum/db_query/query_delete_multi_votes = SSdbcore.NewQuery({" UPDATE [format_table_name("poll_vote")] SET deleted = 1 WHERE pollid = :pollid AND ckey = :ckey "}, list("pollid" = sql_poll_id, "ckey" = ckey)) if(!query_delete_multi_votes.warn_execute()) @@ -558,7 +558,7 @@ "adminrank" = admin_rank )) //IRV results are calculated based on id order, we delete all of a user's votes to avoid potential errors caused by revoting and option editing - var/datum/DBQuery/query_delete_irv_votes = SSdbcore.NewQuery({" + var/datum/db_query/query_delete_irv_votes = SSdbcore.NewQuery({" UPDATE [format_table_name("poll_vote")] SET deleted = 1 WHERE pollid = :pollid AND ckey = :ckey "}, list("pollid" = sql_poll_id, "ckey" = ckey)) if(!query_delete_irv_votes.warn_execute()) diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm index cd53ec564e0..dd8a1805867 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -399,7 +399,7 @@ name = "Jensen Hair" icon_state = "hair_jensen" -/datum/sprite_accessory/hair/Joestar +/datum/sprite_accessory/hair/joestar name = "Joestar" icon_state = "hair_joestar" diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm index 97f994c3c0d..69001449fb4 100644 --- a/code/modules/mob/living/carbon/human/species_types/synths.dm +++ b/code/modules/mob/living/carbon/human/species_types/synths.dm @@ -41,7 +41,7 @@ UnregisterSignal(H, COMSIG_MOB_SAY) /datum/species/synth/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) - if(chem.type == /datum/reagent/medicine/C2/instabitaluri) + if(chem.type == /datum/reagent/medicine/c2/instabitaluri) chem.reaction_mob(H, TOUCH, 2 ,0) //heal a little H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM) return 1 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 93cd43fa4c3..3ee56f2cb81 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -50,7 +50,7 @@ //MALFUNCTION var/datum/module_picker/malf_picker - var/list/datum/AI_Module/current_modules = list() + var/list/datum/ai_module/current_modules = list() var/can_dominate_mechs = FALSE var/shunted = FALSE //1 if the AI is currently shunted. Used to differentiate between shunted and ghosted/braindead @@ -77,12 +77,12 @@ var/nuking = FALSE var/obj/machinery/doomsday_device/doomsday_device - var/mob/camera/aiEye/eyeobj + var/mob/camera/ai_eye/eyeobj var/sprint = 10 var/cooldown = 0 var/acceleration = 1 - var/obj/structure/AIcore/deactivated/linked_core //For exosuit control + var/obj/structure/ai_core/deactivated/linked_core //For exosuit control var/mob/living/silicon/robot/deployed_shell = null //For shell control var/datum/action/innate/deploy_shell/deploy_action = new var/datum/action/innate/deploy_last_shell/redeploy_action = new @@ -104,7 +104,7 @@ /mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, mob/target_ai) . = ..() if(!target_ai) //If there is no player/brain inside. - new/obj/structure/AIcore/deactivated(loc) //New empty terminal. + new/obj/structure/ai_core/deactivated(loc) //New empty terminal. return INITIALIZE_HINT_QDEL //Delete AI. ADD_TRAIT(src, TRAIT_NO_TELEPORT, src) @@ -201,7 +201,7 @@ /// Removes all malfunction-related abilities from the AI /mob/living/silicon/ai/proc/remove_malf_abilities() QDEL_NULL(modules_action) - for(var/datum/AI_Module/AM in current_modules) + for(var/datum/ai_module/AM in current_modules) for(var/datum/action/A in actions) if(istype(A, initial(AM.power_type))) qdel(A) @@ -778,7 +778,7 @@ to_chat(user, "No intelligence patterns detected.") return ShutOffDoomsdayDevice() - var/obj/structure/AIcore/new_core = new /obj/structure/AIcore/deactivated(loc)//Spawns a deactivated terminal at AI location. + var/obj/structure/ai_core/new_core = new /obj/structure/ai_core/deactivated(loc)//Spawns a deactivated terminal at AI location. new_core.circuit.battery = battery ai_restore_power()//So the AI initially has power. control_disabled = TRUE //Can't control things remotely if you're stuck in a card! @@ -1007,7 +1007,7 @@ if(!target_ai) target_ai = src //cheat! just give... ourselves as the spawned AI, because that's technically correct -/mob/living/silicon/ai/proc/camera_visibility(mob/camera/aiEye/moved_eye) +/mob/living/silicon/ai/proc/camera_visibility(mob/camera/ai_eye/moved_eye) GLOB.cameranet.visibility(moved_eye, client, all_eyes, USE_STATIC_OPAQUE) /mob/living/silicon/ai/forceMove(atom/destination) diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm index 4e3f5359c11..1714bc5f86d 100644 --- a/code/modules/mob/living/silicon/ai/ai_defense.dm +++ b/code/modules/mob/living/silicon/ai/ai_defense.dm @@ -1,7 +1,7 @@ /mob/living/silicon/ai/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/aiModule)) - var/obj/item/aiModule/MOD = W + if(istype(W, /obj/item/ai_module)) + var/obj/item/ai_module/MOD = W if(!mind) //A player mind is required for law procs to run antag checks. to_chat(user, "[src] is entirely unresponsive!") return diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm index dfe76fe9481..124f7effca5 100644 --- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm +++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm @@ -71,7 +71,7 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new) C.images += obscured for(var/V in moved_eyes) - var/mob/camera/aiEye/eye = V + var/mob/camera/ai_eye/eye = V var/list/visibleChunks = list() if(eye.loc) // 0xf = 15 diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm index c2794394ed6..485ecd363d5 100644 --- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm +++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm @@ -18,7 +18,7 @@ // Add an AI eye to the chunk, then update if changed. -/datum/camerachunk/proc/add(mob/camera/aiEye/eye) +/datum/camerachunk/proc/add(mob/camera/ai_eye/eye) eye.visibleCameraChunks += src seenby += eye if(changed) @@ -26,7 +26,7 @@ // Remove an AI eye from the chunk, then update if changed. -/datum/camerachunk/proc/remove(mob/camera/aiEye/eye, remove_static_with_last_chunk = TRUE) +/datum/camerachunk/proc/remove(mob/camera/ai_eye/eye, remove_static_with_last_chunk = TRUE) eye.visibleCameraChunks -= src seenby -= eye if(remove_static_with_last_chunk && !eye.visibleCameraChunks.len) diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index d0b438534e4..957a85117bd 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -3,7 +3,7 @@ // An invisible (no icon) mob that the AI controls to look around the station with. // It streams chunks as it moves around, which will show it what the AI can and cannot see. -/mob/camera/aiEye +/mob/camera/ai_eye name = "Inactive AI Eye" icon_state = "ai_camera" @@ -18,13 +18,13 @@ var/ai_detector_visible = TRUE var/ai_detector_color = COLOR_RED -/mob/camera/aiEye/Initialize() +/mob/camera/ai_eye/Initialize() . = ..() GLOB.aiEyes += src update_ai_detect_hud() setLoc(loc, TRUE) -/mob/camera/aiEye/proc/update_ai_detect_hud() +/mob/camera/ai_eye/proc/update_ai_detect_hud() var/datum/atom_hud/ai_detector/hud = GLOB.huds[DATA_HUD_AI_DETECT] var/list/old_images = hud_list[AI_DETECT_HUD] if(!ai_detector_visible) @@ -56,7 +56,7 @@ hud_list[AI_DETECT_HUD] = new_images hud.add_to_hud(src) -/mob/camera/aiEye/proc/get_visible_turfs() +/mob/camera/ai_eye/proc/get_visible_turfs() if(!isturf(loc)) return list() var/client/C = GetViewerClient() @@ -68,7 +68,7 @@ // Use this when setting the aiEye's location. // It will also stream the chunk that the new loc is in. -/mob/camera/aiEye/proc/setLoc(T, force_update = FALSE) +/mob/camera/ai_eye/proc/setLoc(T, force_update = FALSE) if(ai) if(!isturf(ai.loc)) return @@ -95,7 +95,7 @@ ai.master_multicam.refresh_view() //it uses setLoc not forceMove, talks to the sillycone and not the camera mob -/mob/camera/aiEye/zMove(dir, feedback = FALSE) +/mob/camera/ai_eye/zMove(dir, feedback = FALSE) if(dir != UP && dir != DOWN) return FALSE var/turf/target = get_step_multiz(src, dir) @@ -110,18 +110,18 @@ setLoc(target, TRUE) return TRUE -/mob/camera/aiEye/canZMove(direction, turf/target) //cameras do not respect these FLOORS you speak so much of +/mob/camera/ai_eye/canZMove(direction, turf/target) //cameras do not respect these FLOORS you speak so much of return TRUE -/mob/camera/aiEye/Move() +/mob/camera/ai_eye/Move() return 0 -/mob/camera/aiEye/proc/GetViewerClient() +/mob/camera/ai_eye/proc/GetViewerClient() if(ai) return ai.client return null -/mob/camera/aiEye/Destroy() +/mob/camera/ai_eye/Destroy() if(ai) ai.all_eyes -= src ai = null @@ -188,7 +188,7 @@ /mob/living/silicon/ai/proc/create_eye() if(eyeobj) return - eyeobj = new /mob/camera/aiEye() + eyeobj = new /mob/camera/ai_eye() all_eyes += eyeobj eyeobj.ai = src eyeobj.setLoc(loc) @@ -211,7 +211,7 @@ acceleration = !acceleration to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].") -/mob/camera/aiEye/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode) +/mob/camera/ai_eye/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode) . = ..() if(relay_speech && speaker && ai && !radio_freq && speaker != ai && near_camera(speaker)) ai.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans, message_mode) diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm index 241b6b9f33e..401f97fc730 100644 --- a/code/modules/mob/living/silicon/ai/multicam.dm +++ b/code/modules/mob/living/silicon/ai/multicam.dm @@ -4,11 +4,11 @@ var/mob/living/silicon/ai/ai var/mutable_appearance/highlighted_background var/highlighted = FALSE - var/mob/camera/aiEye/pic_in_pic/aiEye + var/mob/camera/ai_eye/pic_in_pic/aiEye /obj/screen/movable/pic_in_pic/ai/Initialize() . = ..() - aiEye = new /mob/camera/aiEye/pic_in_pic() + aiEye = new /mob/camera/ai_eye/pic_in_pic() aiEye.screen = src /obj/screen/movable/pic_in_pic/ai/Destroy() @@ -119,7 +119,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) //Dummy camera eyes -/mob/camera/aiEye/pic_in_pic +/mob/camera/ai_eye/pic_in_pic name = "Secondary AI Eye" invisibility = INVISIBILITY_OBSERVER mouse_opacity = MOUSE_OPACITY_ICON @@ -130,11 +130,11 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) var/telegraph_range = 7 ai_detector_color = COLOR_ORANGE -/mob/camera/aiEye/pic_in_pic/GetViewerClient() +/mob/camera/ai_eye/pic_in_pic/GetViewerClient() if(screen && screen.ai) return screen.ai.client -/mob/camera/aiEye/pic_in_pic/setLoc(turf/T) +/mob/camera/ai_eye/pic_in_pic/setLoc(turf/T) if (T) forceMove(T) else @@ -146,10 +146,10 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) update_camera_telegraphing() update_ai_detect_hud() -/mob/camera/aiEye/pic_in_pic/get_visible_turfs() +/mob/camera/ai_eye/pic_in_pic/get_visible_turfs() return screen ? screen.get_visible_turfs() : list() -/mob/camera/aiEye/pic_in_pic/proc/update_camera_telegraphing() +/mob/camera/ai_eye/pic_in_pic/proc/update_camera_telegraphing() if(!telegraph_cameras) return var/list/obj/machinery/camera/add = list() @@ -181,7 +181,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) C.in_use_lights++ C.update_icon() -/mob/camera/aiEye/pic_in_pic/proc/disable_camera_telegraphing() +/mob/camera/ai_eye/pic_in_pic/proc/disable_camera_telegraphing() telegraph_cameras = FALSE for (var/V in cameras_telegraphed) var/obj/machinery/camera/C = V @@ -191,7 +191,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) C.update_icon() cameras_telegraphed.Cut() -/mob/camera/aiEye/pic_in_pic/Destroy() +/mob/camera/ai_eye/pic_in_pic/Destroy() disable_camera_telegraphing() return ..() diff --git a/code/modules/mob/living/silicon/pai/personality.dm b/code/modules/mob/living/silicon/pai/personality.dm index 1b95b60061e..583d296e3d0 100644 --- a/code/modules/mob/living/silicon/pai/personality.dm +++ b/code/modules/mob/living/silicon/pai/personality.dm @@ -7,10 +7,10 @@ ready = 0 */ -/datum/paiCandidate/proc/savefile_path(mob/user) +/datum/pai_candidate/proc/savefile_path(mob/user) return "data/player_saves/[user.ckey[1]]/[user.ckey]/pai.sav" -/datum/paiCandidate/proc/savefile_save(mob/user) +/datum/pai_candidate/proc/savefile_save(mob/user) if(IsGuestKey(user.key)) return 0 @@ -31,7 +31,7 @@ // returns 1 if loaded (or file was incompatible) // returns 0 if savefile did not exist -/datum/paiCandidate/proc/savefile_load(mob/user, silent = TRUE) +/datum/pai_candidate/proc/savefile_load(mob/user, silent = TRUE) if (IsGuestKey(user.key)) return 0 diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index 45407da2e2f..358464b81be 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -134,8 +134,8 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real qdel(D) return - if(istype(W, /obj/item/aiModule)) - var/obj/item/aiModule/MOD = W + if(istype(W, /obj/item/ai_module)) + var/obj/item/ai_module/MOD = W if(!opened) to_chat(user, "You need access to the robot's insides to do that!") return diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 79ba044b204..703c7360b7b 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -647,7 +647,7 @@ /obj/item/stack/sheet/rglass/cyborg, /obj/item/stack/rods/cyborg, /obj/item/stack/tile/plasteel/cyborg, - /obj/item/destTagger/borg, + /obj/item/dest_tagger/borg, /obj/item/stack/cable_coil/cyborg, /obj/item/pinpointer/syndicate_cyborg, /obj/item/borg_chameleon, diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 0930d59cb44..f13061e4a85 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -90,7 +90,7 @@ collar_type = "kitten" //RUNTIME IS ALIVE! SQUEEEEEEEE~ -/mob/living/simple_animal/pet/cat/Runtime +/mob/living/simple_animal/pet/cat/runtime name = "Runtime" desc = "GCAT" icon_state = "cat" @@ -105,7 +105,7 @@ var/memory_saved = FALSE held_state = "cat" -/mob/living/simple_animal/pet/cat/Runtime/Initialize() +/mob/living/simple_animal/pet/cat/runtime/Initialize() if(prob(5)) icon_state = "original" icon_living = "original" @@ -113,7 +113,7 @@ Read_Memory() . = ..() -/mob/living/simple_animal/pet/cat/Runtime/Life() +/mob/living/simple_animal/pet/cat/runtime/Life() if(!cats_deployed && SSticker.current_state >= GAME_STATE_SETTING_UP) Deploy_The_Cats() if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) @@ -121,18 +121,18 @@ memory_saved = TRUE ..() -/mob/living/simple_animal/pet/cat/Runtime/make_babies() +/mob/living/simple_animal/pet/cat/runtime/make_babies() var/mob/baby = ..() if(baby) children += baby return baby -/mob/living/simple_animal/pet/cat/Runtime/death() +/mob/living/simple_animal/pet/cat/runtime/death() if(!memory_saved) Write_Memory(TRUE) ..() -/mob/living/simple_animal/pet/cat/Runtime/proc/Read_Memory() +/mob/living/simple_animal/pet/cat/runtime/proc/Read_Memory() if(fexists("data/npc_saves/Runtime.sav")) //legacy compatability to convert old format to new var/savefile/S = new /savefile("data/npc_saves/Runtime.sav") S["family"] >> family @@ -146,7 +146,7 @@ if(isnull(family)) family = list() -/mob/living/simple_animal/pet/cat/Runtime/proc/Write_Memory(dead) +/mob/living/simple_animal/pet/cat/runtime/proc/Write_Memory(dead) var/json_file = file("data/npc_saves/Runtime.json") var/list/file_data = list() family = list() @@ -162,14 +162,14 @@ fdel(json_file) WRITE_FILE(json_file, json_encode(file_data)) -/mob/living/simple_animal/pet/cat/Runtime/proc/Deploy_The_Cats() +/mob/living/simple_animal/pet/cat/runtime/proc/Deploy_The_Cats() cats_deployed = 1 for(var/cat_type in family) if(family[cat_type] > 0) for(var/i in 1 to min(family[cat_type],100)) //Limits to about 500 cats, you wouldn't think this would be needed (BUT IT IS) new cat_type(loc) -/mob/living/simple_animal/pet/cat/Proc +/mob/living/simple_animal/pet/cat/_proc name = "Proc" gender = MALE gold_core_spawnable = NO_SPAWN @@ -200,7 +200,7 @@ if((src.loc) && isturf(src.loc)) if(!stat && !resting && !buckled) for(var/mob/living/simple_animal/mouse/M in view(1,src)) - if(istype(M, /mob/living/simple_animal/mouse/brown/Tom) && (name == "Jerry")) //Turns out there's no jerry subtype. + if(istype(M, /mob/living/simple_animal/mouse/brown/tom) && (name == "Jerry")) //Turns out there's no jerry subtype. if (emote_cooldown < (world.time - 600)) visible_message("[src] chases [M] around, to no avail!") step(M, pick(GLOB.cardinals)) diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index 2420a91b25d..1ed9484e580 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -39,7 +39,7 @@ regenerate_icons() //COFFEE! SQUEEEEEEEEE! -/mob/living/simple_animal/crab/Coffee +/mob/living/simple_animal/crab/coffee name = "Coffee" real_name = "Coffee" desc = "It's Coffee, the other pet!" diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 1273a4261e3..111458af7be 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -379,7 +379,7 @@ DF.apply(src) //IAN! SQUEEEEEEEEE~ -/mob/living/simple_animal/pet/dog/corgi/Ian +/mob/living/simple_animal/pet/dog/corgi/ian name = "Ian" real_name = "Ian" //Intended to hold the name without altering it. gender = MALE @@ -397,7 +397,7 @@ var/memory_saved = FALSE var/saved_head //path -/mob/living/simple_animal/pet/dog/corgi/Ian/Initialize() +/mob/living/simple_animal/pet/dog/corgi/ian/Initialize() . = ..() //parent call must happen first to ensure IAN //is not in nullspace when child puppies spawn @@ -420,18 +420,18 @@ desc = "At a ripe old age of [record_age], Ian's not as spry as he used to be, but he'll always be the HoP's beloved corgi." //RIP turns_per_move = 20 -/mob/living/simple_animal/pet/dog/corgi/Ian/Life() +/mob/living/simple_animal/pet/dog/corgi/ian/Life() if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) Write_Memory(FALSE) memory_saved = TRUE ..() -/mob/living/simple_animal/pet/dog/corgi/Ian/death() +/mob/living/simple_animal/pet/dog/corgi/ian/death() if(!memory_saved) Write_Memory(TRUE) ..() -/mob/living/simple_animal/pet/dog/corgi/Ian/proc/Read_Memory() +/mob/living/simple_animal/pet/dog/corgi/ian/proc/Read_Memory() if(fexists("data/npc_saves/Ian.sav")) //legacy compatability to convert old format to new var/savefile/S = new /savefile("data/npc_saves/Ian.sav") S["age"] >> age @@ -453,7 +453,7 @@ if(saved_head) place_on_head(new saved_head) -/mob/living/simple_animal/pet/dog/corgi/Ian/proc/Write_Memory(dead) +/mob/living/simple_animal/pet/dog/corgi/ian/proc/Write_Memory(dead) var/json_file = file("data/npc_saves/Ian.json") var/list/file_data = list() if(!dead) @@ -473,7 +473,7 @@ fdel(json_file) WRITE_FILE(json_file, json_encode(file_data)) -/mob/living/simple_animal/pet/dog/corgi/Ian/narsie_act() +/mob/living/simple_animal/pet/dog/corgi/ian/narsie_act() playsound(src, 'sound/magic/demon_dies.ogg', 75, TRUE) var/mob/living/simple_animal/pet/dog/corgi/narsie/N = new(loc) N.setDir(dir) @@ -600,7 +600,7 @@ //LISA! SQUEEEEEEEEE~ -/mob/living/simple_animal/pet/dog/corgi/Lisa +/mob/living/simple_animal/pet/dog/corgi/lisa name = "Lisa" real_name = "Lisa" gender = FEMALE @@ -620,13 +620,13 @@ var/puppies = 0 //Lisa already has a cute bow! -/mob/living/simple_animal/pet/dog/corgi/Lisa/Topic(href, href_list) +/mob/living/simple_animal/pet/dog/corgi/lisa/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) to_chat(usr, "[src] already has a cute bow!") return ..() -/mob/living/simple_animal/pet/dog/corgi/Lisa/Life() +/mob/living/simple_animal/pet/dog/corgi/lisa/Life() ..() make_babies() diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm index 29500c78663..8af6b2a6ef5 100644 --- a/code/modules/mob/living/simple_animal/friendly/fox.dm +++ b/code/modules/mob/living/simple_animal/friendly/fox.dm @@ -27,7 +27,7 @@ footstep_type = FOOTSTEP_MOB_CLAW //Captain fox -/mob/living/simple_animal/pet/fox/Renault +/mob/living/simple_animal/pet/fox/renault name = "Renault" desc = "Renault, the Captain's trustworthy fox." gender = FEMALE diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 76c67514698..15f39cfae68 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -141,7 +141,7 @@ return ..() //TOM IS ALIVE! SQUEEEEEEEE~K :) -/mob/living/simple_animal/mouse/brown/Tom +/mob/living/simple_animal/mouse/brown/tom name = "Tom" desc = "Jerry the cat is not amused." response_help_continuous = "pets" diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 5f78de33b55..ef2de827ab0 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -53,7 +53,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/cooldown = 0 var/mob/living/summoner var/range = 10 //how far from the user the spirit can be - var/toggle_button_type = /obj/screen/guardian/ToggleMode/Inactive //what sort of toggle button the hud uses + var/toggle_button_type = /obj/screen/guardian/toggle_mode/inactive //what sort of toggle button the hud uses var/playstyle_string = "You are a Guardian without any type. You shouldn't exist!" var/magic_fluff_string = "You draw the Coder, symbolizing bugs and errors. This shouldn't happen! Submit a bug report!" var/tech_fluff_string = "BOOT SEQUENCE COMPLETE. ERROR MODULE LOADED. THIS SHOULDN'T HAPPEN. Submit a bug report!" diff --git a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm index 01f101c6455..d4a1bbdac1d 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm @@ -11,7 +11,7 @@ tech_fluff_string = "Boot sequence complete. Assassin modules loaded. Holoparasite swarm online." carp_fluff_string = "CARP CARP CARP! Caught one! It's an assassin carp! Just when you thought it was safe to go back to the water... which is unhelpful, because we're in space." miner_fluff_string = "You encounter... Glass, a sharp, fragile attacker." - toggle_button_type = /obj/screen/guardian/ToggleMode/Assassin + toggle_button_type = /obj/screen/guardian/toggle_mode/assassin var/toggle = FALSE var/stealthcooldown = 160 var/obj/screen/alert/canstealthalert diff --git a/code/modules/mob/living/simple_animal/guardian/types/protector.dm b/code/modules/mob/living/simple_animal/guardian/types/protector.dm index bb2682c464d..8de0c5229d6 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/protector.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/protector.dm @@ -9,7 +9,7 @@ tech_fluff_string = "Boot sequence complete. Protector modules loaded. Holoparasite swarm online." carp_fluff_string = "CARP CARP CARP! You caught one! Wait, no... it caught you! The fisher has become the fishy." miner_fluff_string = "You encounter... Uranium, a very resistant guardian." - toggle_button_type = /obj/screen/guardian/ToggleMode + toggle_button_type = /obj/screen/guardian/toggle_mode var/toggle = FALSE /mob/living/simple_animal/hostile/guardian/protector/ex_act(severity) diff --git a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm index 17018e55266..e2aa31323bc 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm @@ -25,7 +25,7 @@ miner_fluff_string = "You encounter... Diamond, a powerful projectile thrower." see_invisible = SEE_INVISIBLE_LIVING see_in_dark = 8 - toggle_button_type = /obj/screen/guardian/ToggleMode + toggle_button_type = /obj/screen/guardian/toggle_mode var/list/snares = list() var/toggle = FALSE diff --git a/code/modules/mob/living/simple_animal/guardian/types/support.dm b/code/modules/mob/living/simple_animal/guardian/types/support.dm index 368a993ed8b..16001fa6b4f 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/support.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/support.dm @@ -12,7 +12,7 @@ carp_fluff_string = "CARP CARP CARP! You caught a support carp. It's a kleptocarp!" tech_fluff_string = "Boot sequence complete. Support modules active. Holoparasite swarm online." miner_fluff_string = "You encounter... Bluespace, the master of support." - toggle_button_type = /obj/screen/guardian/ToggleMode + toggle_button_type = /obj/screen/guardian/toggle_mode var/obj/structure/receiving_pad/beacon var/beacon_cooldown = 0 var/toggle = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 00f93474267..7f3056ec998 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -73,7 +73,7 @@ //SPACE BEARS! SQUEEEEEEEE~ OW! FUCK! IT BIT MY HAND OFF!! -/mob/living/simple_animal/hostile/bear/Hudson +/mob/living/simple_animal/hostile/bear/hudson name = "Hudson" gender = MALE desc = "Feared outlaw, this guy is one bad news bear." //I'm sorry... diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm index 34fb3c4e948..b0793ee453e 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -69,9 +69,9 @@ /// The togglable small sprite action var/small_sprite_type = /datum/action/small_sprite/megafauna/spacedragon /// The innate ability to use wing gust - var/datum/action/innate/space_dragon/gustAttack/gust + var/datum/action/innate/space_dragon/gust_attack/gust /// The innate ability to summon rifts - var/datum/action/innate/space_dragon/summonRift/rift + var/datum/action/innate/space_dragon/summon_rift/rift /mob/living/simple_animal/hostile/space_dragon/Initialize(mapload) . = ..() @@ -360,12 +360,12 @@ mob/living/simple_animal/hostile/space_dragon/proc/dragon_fire_line(turf/T) background_icon_state = "bg_default" icon_icon = 'icons/mob/actions/actions_space_dragon.dmi' -/datum/action/innate/space_dragon/gustAttack +/datum/action/innate/space_dragon/gust_attack name = "Gust Attack" button_icon_state = "gust_attack" desc = "Use your wings to knock back foes with gusts of air, pushing them away and stunning them. Using this too often will leave you vulnerable for longer periods of time." -/datum/action/innate/space_dragon/gustAttack/Activate() +/datum/action/innate/space_dragon/gust_attack/Activate() var/mob/living/simple_animal/hostile/space_dragon/S = owner if(S.using_special) return @@ -373,12 +373,12 @@ mob/living/simple_animal/hostile/space_dragon/proc/dragon_fire_line(turf/T) S.icon_state = "spacedragon_gust" S.useGust(0) -/datum/action/innate/space_dragon/summonRift +/datum/action/innate/space_dragon/summon_rift name = "Summon Rift" button_icon_state = "carp_rift" desc = "Summon a rift to bring forth a horde of space carp." -/datum/action/innate/space_dragon/summonRift/Activate() +/datum/action/innate/space_dragon/summon_rift/Activate() var/mob/living/simple_animal/hostile/space_dragon/S = owner if(S.using_special) return diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index e7ee443a7f4..67fc37b90db 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -867,7 +867,7 @@ /* * Sub-types */ -/mob/living/simple_animal/parrot/Poly +/mob/living/simple_animal/parrot/poly name = "Poly" desc = "Poly the Parrot. An expert on quantum cracker theory." speak = list("Poly wanna cracker!", ":e Check the crystal, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE") @@ -878,7 +878,7 @@ var/longest_survival = 0 var/longest_deathstreak = 0 -/mob/living/simple_animal/parrot/Poly/Initialize() +/mob/living/simple_animal/parrot/poly/Initialize() ears = new /obj/item/radio/headset/headset_eng(src) available_channels = list(":e") Read_Memory() @@ -899,24 +899,24 @@ . = ..() -/mob/living/simple_animal/parrot/Poly/Life() +/mob/living/simple_animal/parrot/poly/Life() if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) Write_Memory(FALSE) memory_saved = TRUE ..() -/mob/living/simple_animal/parrot/Poly/death(gibbed) +/mob/living/simple_animal/parrot/poly/death(gibbed) if(!memory_saved) Write_Memory(TRUE) if(rounds_survived == longest_survival || rounds_survived == longest_deathstreak || prob(0.666)) - var/mob/living/simple_animal/parrot/Poly/ghost/G = new(loc) + var/mob/living/simple_animal/parrot/poly/ghost/G = new(loc) if(mind) mind.transfer_to(G) else G.key = key ..(gibbed) -/mob/living/simple_animal/parrot/Poly/proc/Read_Memory() +/mob/living/simple_animal/parrot/poly/proc/Read_Memory() if(fexists("data/npc_saves/Poly.sav")) //legacy compatability to convert old format to new var/savefile/S = new /savefile("data/npc_saves/Poly.sav") S["phrases"] >> speech_buffer @@ -936,7 +936,7 @@ if(!islist(speech_buffer)) speech_buffer = list() -/mob/living/simple_animal/parrot/Poly/proc/Write_Memory(dead) +/mob/living/simple_animal/parrot/poly/proc/Write_Memory(dead) var/json_file = file("data/npc_saves/Poly.json") var/list/file_data = list() if(islist(speech_buffer)) @@ -958,7 +958,7 @@ fdel(json_file) WRITE_FILE(json_file, json_encode(file_data)) -/mob/living/simple_animal/parrot/Poly/ghost +/mob/living/simple_animal/parrot/poly/ghost name = "The Ghost of Poly" desc = "Doomed to squawk the Earth." color = "#FFFFFF77" @@ -967,16 +967,16 @@ incorporeal_move = INCORPOREAL_MOVE_BASIC butcher_results = list(/obj/item/ectoplasm = 1) -/mob/living/simple_animal/parrot/Poly/ghost/Initialize() +/mob/living/simple_animal/parrot/poly/ghost/Initialize() memory_saved = TRUE //At this point nothing is saved . = ..() -/mob/living/simple_animal/parrot/Poly/ghost/handle_automated_speech() +/mob/living/simple_animal/parrot/poly/ghost/handle_automated_speech() if(ismob(loc)) return ..() -/mob/living/simple_animal/parrot/Poly/ghost/handle_automated_movement() +/mob/living/simple_animal/parrot/poly/ghost/handle_automated_movement() if(isliving(parrot_interest)) if(!ishuman(parrot_interest)) parrot_interest = null @@ -985,7 +985,7 @@ Possess(parrot_interest) ..() -/mob/living/simple_animal/parrot/Poly/ghost/proc/Possess(mob/living/carbon/human/H) +/mob/living/simple_animal/parrot/poly/ghost/proc/Possess(mob/living/carbon/human/H) if(!ishuman(H)) return var/datum/disease/parrot_possession/P = new diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 382c9712207..8292909681e 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -754,7 +754,7 @@ if(statpanel("SDQL2")) stat("Access Global SDQL2 List", GLOB.sdql2_vv_statobj) for(var/i in GLOB.sdql2_queries) - var/datum/SDQL2_query/Q = i + var/datum/sdql2_query/Q = i Q.generate_stat() if(listed_turf && client) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 5b26c32ad51..b39c9967f3a 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -203,7 +203,7 @@ var/list/client_colours = list() var/hud_type = /datum/hud - var/datum/hSB/sandbox = null + var/datum/h_sandbox/sandbox = null var/bloody_hands = 0 diff --git a/code/modules/modular_computers/computers/machinery/modular_console.dm b/code/modules/modular_computers/computers/machinery/modular_console.dm index 5d596f98e4f..0e27d813053 100644 --- a/code/modules/modular_computers/computers/machinery/modular_console.dm +++ b/code/modules/modular_computers/computers/machinery/modular_console.dm @@ -37,7 +37,7 @@ var/obj/item/computer_hardware/network_card/wired/network_card = new() cpu.install_component(network_card) - cpu.install_component(new /obj/item/computer_hardware/recharger/APC) + cpu.install_component(new /obj/item/computer_hardware/recharger/apc_recharger) cpu.install_component(new /obj/item/computer_hardware/hard_drive/super) // Consoles generally have better HDDs due to lower space limitations var/area/A = get_area(src) diff --git a/code/modules/modular_computers/hardware/recharger.dm b/code/modules/modular_computers/hardware/recharger.dm index bc01c7a50e4..c88084ddcaa 100644 --- a/code/modules/modular_computers/hardware/recharger.dm +++ b/code/modules/modular_computers/hardware/recharger.dm @@ -23,13 +23,13 @@ holder.give_power(charge_rate * GLOB.CELLRATE) -/obj/item/computer_hardware/recharger/APC +/obj/item/computer_hardware/recharger/apc_recharger name = "area power connector" desc = "A device that wirelessly recharges connected device from nearby APC." icon_state = "charger_APC" w_class = WEIGHT_CLASS_SMALL // Can't be installed into tablets/PDAs -/obj/item/computer_hardware/recharger/APC/use_power(amount, charging=0) +/obj/item/computer_hardware/recharger/apc_recharger/use_power(amount, charging=0) if(ismachinery(holder.physical)) var/obj/machinery/M = holder.physical if(M.powered()) diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index eed03dc9286..ab13cc0fbd9 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -102,7 +102,7 @@ if(dev_apc_recharger) total_price += 399 if(fabricate) - fabricated_laptop.install_component(new /obj/item/computer_hardware/recharger/APC) + fabricated_laptop.install_component(new /obj/item/computer_hardware/recharger/apc_recharger) if(dev_printer) total_price += 99 if(fabricate) diff --git a/code/modules/photography/photos/album.dm b/code/modules/photography/photos/album.dm index 8e7654e71d1..d5962d70950 100644 --- a/code/modules/photography/photos/album.dm +++ b/code/modules/photography/photos/album.dm @@ -56,31 +56,31 @@ if(!SEND_SIGNAL(src, COMSIG_TRY_STORAGE_INSERT, P, null, TRUE, TRUE)) qdel(P) -/obj/item/storage/photo_album/HoS +/obj/item/storage/photo_album/hos name = "photo album (Head of Security)" persistence_id = "HoS" -/obj/item/storage/photo_album/RD +/obj/item/storage/photo_album/rd name = "photo album (Research Director)" persistence_id = "RD" -/obj/item/storage/photo_album/HoP +/obj/item/storage/photo_album/hop name = "photo album (Head of Personnel)" persistence_id = "HoP" -/obj/item/storage/photo_album/Captain +/obj/item/storage/photo_album/captain name = "photo album (Captain)" persistence_id = "Captain" -/obj/item/storage/photo_album/CMO +/obj/item/storage/photo_album/cmo name = "photo album (Chief Medical Officer)" persistence_id = "CMO" -/obj/item/storage/photo_album/QM +/obj/item/storage/photo_album/qm name = "photo album (Quartermaster)" persistence_id = "QM" -/obj/item/storage/photo_album/CE +/obj/item/storage/photo_album/ce name = "photo album (Chief Engineer)" persistence_id = "CE" diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 06e5d27f6d4..df9ed8dce5b 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -207,7 +207,7 @@ /obj/machinery/field/containment, /obj/structure/disposalpipe, /obj/structure/disposaloutlet, - /obj/machinery/disposal/deliveryChute, + /obj/machinery/disposal/delivery_chute, /obj/machinery/camera, /obj/structure/sign, /obj/machinery/gateway, diff --git a/code/modules/procedural_mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm index 323f74d0efe..5b70fee96f7 100644 --- a/code/modules/procedural_mapping/mapGenerator.dm +++ b/code/modules/procedural_mapping/mapGenerator.dm @@ -17,7 +17,7 @@ //All #define CLUSTER_CHECK_ALL 30 //Don't let anything cluster, like, at all -/datum/mapGenerator +/datum/map_generator //Map information var/list/map = list() @@ -27,7 +27,7 @@ var/buildmode_name = "Undocumented" -/datum/mapGenerator/New() +/datum/map_generator/New() ..() if(buildmode_name == "Undocumented") buildmode_name = copytext_char("[type]", 20) // / d a t u m / m a p g e n e r a t o r / = 20 characters. @@ -35,7 +35,7 @@ //Defines the region the map represents, sets map //Returns the map -/datum/mapGenerator/proc/defineRegion(turf/Start, turf/End, replace = 0) +/datum/map_generator/proc/defineRegion(turf/Start, turf/End, replace = 0) if(!checkRegion(Start, End)) return 0 @@ -47,7 +47,7 @@ //Defines the region the map represents, as a CIRCLE!, sets map //Returns the map -/datum/mapGenerator/proc/defineCircularRegion(turf/Start, turf/End, replace = 0) +/datum/map_generator/proc/defineCircularRegion(turf/Start, turf/End, replace = 0) if(!checkRegion(Start, End)) return 0 @@ -82,13 +82,13 @@ //Empties the map list, he's dead jim. -/datum/mapGenerator/proc/undefineRegion() +/datum/map_generator/proc/undefineRegion() map = list() //bai bai //Checks for and Rejects bad region coordinates //Returns 1/0 -/datum/mapGenerator/proc/checkRegion(turf/Start, turf/End) +/datum/map_generator/proc/checkRegion(turf/Start, turf/End) . = 1 if(!Start || !End) @@ -103,27 +103,27 @@ //Requests the mapGeneratorModule(s) to (re)generate -/datum/mapGenerator/proc/generate() +/datum/map_generator/proc/generate() syncModules() if(!modules || !modules.len) return - for(var/datum/mapGeneratorModule/mod in modules) - INVOKE_ASYNC(mod, /datum/mapGeneratorModule.proc/generate) + for(var/datum/map_generator_module/mod in modules) + INVOKE_ASYNC(mod, /datum/map_generator_module.proc/generate) //Requests the mapGeneratorModule(s) to (re)generate this one turf -/datum/mapGenerator/proc/generateOneTurf(turf/T) +/datum/map_generator/proc/generateOneTurf(turf/T) if(!T) return syncModules() if(!modules || !modules.len) return - for(var/datum/mapGeneratorModule/mod in modules) - INVOKE_ASYNC(mod, /datum/mapGeneratorModule.proc/place, T) + for(var/datum/map_generator_module/mod in modules) + INVOKE_ASYNC(mod, /datum/map_generator_module.proc/place, T) //Replaces all paths in the module list with actual module datums -/datum/mapGenerator/proc/initialiseModules() +/datum/map_generator/proc/initialiseModules() for(var/path in modules) if(ispath(path)) modules.Remove(path) @@ -132,8 +132,8 @@ //Sync mapGeneratorModule(s) to mapGenerator -/datum/mapGenerator/proc/syncModules() - for(var/datum/mapGeneratorModule/mod in modules) +/datum/map_generator/proc/syncModules() + for(var/datum/map_generator_module/mod in modules) mod.sync(src) @@ -146,7 +146,7 @@ set name = "Test Nature Map Generator" set category = "Debug" - var/datum/mapGenerator/nature/N = new() + var/datum/map_generator/nature/N = new() var/startInput = input(usr,"Start turf of Map, (X;Y;Z)", "Map Gen Settings", "1;1;1") as text|null if (isnull(startInput)) @@ -195,7 +195,7 @@ theCluster = CLUSTER_CHECK_NONE if(theCluster) - for(var/datum/mapGeneratorModule/M in N.modules) + for(var/datum/map_generator_module/M in N.modules) M.clusterCheckFlags = theCluster diff --git a/code/modules/procedural_mapping/mapGeneratorModule.dm b/code/modules/procedural_mapping/mapGeneratorModule.dm index 3a78d8385ed..412a439a0ab 100644 --- a/code/modules/procedural_mapping/mapGeneratorModule.dm +++ b/code/modules/procedural_mapping/mapGeneratorModule.dm @@ -1,6 +1,6 @@ -/datum/mapGeneratorModule - var/datum/mapGenerator/mother = null +/datum/map_generator_module + var/datum/map_generator/mother = null var/list/spawnableAtoms = list() var/list/spawnableTurfs = list() var/clusterMax = 5 @@ -10,14 +10,14 @@ //Syncs the module up with its mother -/datum/mapGeneratorModule/proc/sync(datum/mapGenerator/mum) +/datum/map_generator_module/proc/sync(datum/map_generator/mum) mother = null if(mum) mother = mum //Generates its spawnable atoms and turfs -/datum/mapGeneratorModule/proc/generate() +/datum/map_generator_module/proc/generate() if(!mother) return var/list/map = mother.map @@ -26,7 +26,7 @@ //Place a spawnable atom or turf on this turf -/datum/mapGeneratorModule/proc/place(turf/T) +/datum/map_generator_module/proc/place(turf/T) if(!T) return 0 @@ -104,7 +104,7 @@ //Checks and Rejects dense turfs -/datum/mapGeneratorModule/proc/checkPlaceAtom(turf/T) +/datum/map_generator_module/proc/checkPlaceAtom(turf/T) . = 1 if(!T) return 0 @@ -128,19 +128,19 @@ //Settings appropriate for a turf that covers the entire map region, eg a fill colour on a bottom layer in a graphics program. //Should only have one of these in your mapGenerator unless you want to waste CPU -/datum/mapGeneratorModule/bottomLayer +/datum/map_generator_module/bottom_layer clusterCheckFlags = CLUSTER_CHECK_NONE spawnableAtoms = list()//Recommended: No atoms. spawnableTurfs = list(/turf = 100) //Settings appropriate for turfs/atoms that cover SOME of the map region, sometimes referred to as a splatter layer. -/datum/mapGeneratorModule/splatterLayer +/datum/map_generator_module/splatter_layer clusterCheckFlags = CLUSTER_CHECK_ALL spawnableAtoms = list(/atom = 30) spawnableTurfs = list(/turf = 30) //Settings appropriate for turfs/atoms that cover a lot of the map region, eg a dense forest. -/datum/mapGeneratorModule/denseLayer +/datum/map_generator_module/dense_layer clusterCheckFlags = CLUSTER_CHECK_NONE spawnableAtoms = list(/atom = 75) spawnableTurfs = list(/turf = 75) diff --git a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm index 00dba2d0001..b1e8bbb9dae 100644 --- a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm +++ b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm @@ -2,11 +2,11 @@ // Helper to repressurize the area in case it was run in space -/datum/mapGeneratorModule/bottomLayer/repressurize +/datum/map_generator_module/bottom_layer/repressurize spawnableAtoms = list() spawnableTurfs = list() -/datum/mapGeneratorModule/bottomLayer/repressurize/generate() +/datum/map_generator_module/bottom_layer/repressurize/generate() if(!mother) return var/list/map = mother.map @@ -17,38 +17,38 @@ T.air.copy_from_turf(T) SSair.add_to_active(T) -/datum/mapGeneratorModule/bottomLayer/massdelete +/datum/map_generator_module/bottom_layer/massdelete spawnableAtoms = list() spawnableTurfs = list() var/deleteturfs = TRUE //separate var for the empty type. var/list/ignore_typecache -/datum/mapGeneratorModule/bottomLayer/massdelete/generate() +/datum/map_generator_module/bottom_layer/massdelete/generate() if(!mother) return for(var/V in mother.map) var/turf/T = V T.empty(deleteturfs? null : T.type, null, ignore_typecache, CHANGETURF_FORCEOP) -/datum/mapGeneratorModule/bottomLayer/massdelete/no_delete_mobs/New() +/datum/map_generator_module/bottom_layer/massdelete/no_delete_mobs/New() ..() ignore_typecache = GLOB.typecache_mob -/datum/mapGeneratorModule/bottomLayer/massdelete/leave_turfs +/datum/map_generator_module/bottom_layer/massdelete/leave_turfs deleteturfs = FALSE -/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete +/datum/map_generator_module/bottom_layer/massdelete/regeneration_delete deleteturfs = FALSE -/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete/New() +/datum/map_generator_module/bottom_layer/massdelete/regeneration_delete/New() ..() ignore_typecache = GLOB.typecache_mob //Only places atoms/turfs on area borders -/datum/mapGeneratorModule/border +/datum/map_generator_module/border clusterCheckFlags = CLUSTER_CHECK_NONE -/datum/mapGeneratorModule/border/generate() +/datum/map_generator_module/border/generate() if(!mother) return var/list/map = mother.map @@ -56,29 +56,29 @@ if(is_border(T)) place(T) -/datum/mapGeneratorModule/border/proc/is_border(turf/T) +/datum/map_generator_module/border/proc/is_border(turf/T) for(var/direction in list(SOUTH,EAST,WEST,NORTH)) if (get_step(T,direction) in mother.map) continue return 1 return 0 -/datum/mapGenerator/repressurize - modules = list(/datum/mapGeneratorModule/bottomLayer/repressurize) +/datum/map_generator/repressurize + modules = list(/datum/map_generator_module/bottom_layer/repressurize) buildmode_name = "Block: Restore Roundstart Air Contents" -/datum/mapGenerator/massdelete - modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete) +/datum/map_generator/massdelete + modules = list(/datum/map_generator_module/bottom_layer/massdelete) buildmode_name = "Block: Full Mass Deletion" -/datum/mapGenerator/massdelete/nomob - modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete/no_delete_mobs) +/datum/map_generator/massdelete/nomob + modules = list(/datum/map_generator_module/bottom_layer/massdelete/no_delete_mobs) buildmode_name = "Block: Mass Deletion - Leave Mobs" -/datum/mapGenerator/massdelete/noturf - modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete/leave_turfs) +/datum/map_generator/massdelete/noturf + modules = list(/datum/map_generator_module/bottom_layer/massdelete/leave_turfs) buildmode_name = "Block: Mass Deletion - Leave Turfs" -/datum/mapGenerator/massdelete/regen - modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete) +/datum/map_generator/massdelete/regen + modules = list(/datum/map_generator_module/bottom_layer/massdelete/regeneration_delete) buildmode_name = "Block: Mass Deletion - Leave Mobs and Turfs" diff --git a/code/modules/procedural_mapping/mapGeneratorModules/nature.dm b/code/modules/procedural_mapping/mapGeneratorModules/nature.dm index d0589b909de..1f9cc5f1e90 100644 --- a/code/modules/procedural_mapping/mapGeneratorModules/nature.dm +++ b/code/modules/procedural_mapping/mapGeneratorModules/nature.dm @@ -3,18 +3,18 @@ //Pine Trees -/datum/mapGeneratorModule/pineTrees +/datum/map_generator_module/pine_trees spawnableAtoms = list(/obj/structure/flora/tree/pine = 30) //Dead Trees -/datum/mapGeneratorModule/deadTrees +/datum/map_generator_module/dead_trees spawnableAtoms = list(/obj/structure/flora/tree/dead = 10) //Random assortment of bushes -/datum/mapGeneratorModule/randBushes +/datum/map_generator_module/rand_bushes spawnableAtoms = list() -/datum/mapGeneratorModule/randBushes/New() +/datum/map_generator_module/rand_bushes/New() ..() spawnableAtoms = typesof(/obj/structure/flora/ausbushes) for(var/i in spawnableAtoms) @@ -22,16 +22,16 @@ //Random assortment of rocks and rockpiles -/datum/mapGeneratorModule/randRocks +/datum/map_generator_module/rand_rocks spawnableAtoms = list(/obj/structure/flora/rock = 40, /obj/structure/flora/rock/pile = 20) //Grass turfs -/datum/mapGeneratorModule/bottomLayer/grassTurfs +/datum/map_generator_module/bottom_layer/grass_turfs spawnableTurfs = list(/turf/open/floor/grass = 100) //Grass tufts with a high spawn chance -/datum/mapGeneratorModule/denseLayer/grassTufts +/datum/map_generator_module/dense_layer/grass_tufts spawnableTurfs = list() spawnableAtoms = list(/obj/structure/flora/ausbushes/grassybush = 75) diff --git a/code/modules/procedural_mapping/mapGeneratorObj.dm b/code/modules/procedural_mapping/mapGeneratorObj.dm index 63abccc571f..a12a96da66f 100644 --- a/code/modules/procedural_mapping/mapGeneratorObj.dm +++ b/code/modules/procedural_mapping/mapGeneratorObj.dm @@ -1,14 +1,14 @@ -/obj/effect/landmark/mapGenerator +/obj/effect/landmark/map_generator var/startTurfX = 0 var/startTurfY = 0 var/startTurfZ = -1 var/endTurfX = 0 var/endTurfY = 0 var/endTurfZ = -1 - var/mapGeneratorType = /datum/mapGenerator/nature - var/datum/mapGenerator/mapGenerator + var/mapGeneratorType = /datum/map_generator/nature + var/datum/map_generator/mapGenerator -/obj/effect/landmark/mapGenerator/New() +/obj/effect/landmark/map_generator/New() ..() if(startTurfZ < 0) startTurfZ = z diff --git a/code/modules/procedural_mapping/mapGeneratorReadme.dm b/code/modules/procedural_mapping/mapGeneratorReadme.dm index ac22e5fca74..e75b2d031d7 100644 --- a/code/modules/procedural_mapping/mapGeneratorReadme.dm +++ b/code/modules/procedural_mapping/mapGeneratorReadme.dm @@ -38,7 +38,7 @@ mapGenerator: initialiseModules() Example: initialiseModules() - Desc: Replaces all typepaths in the modules list with actual /datum/mapGenerator/Module types + Desc: Replaces all typepaths in the modules list with actual /datum/map_generator/Module types Existing Calls: mapGenerator/New() syncModules() @@ -51,7 +51,7 @@ mapGeneratorModule Desc: a mapGeneratorModule has spawnableAtoms and spawnableTurfs lists which it will generate on turfs in it's mother's map based on cluster variables - sync(var/datum/mapGenerator/mum) + sync(var/datum/map_generator/mum) Example: sync(a_mapGenerator_as_a_variable) Desc: Sets the Mother variable to the mum argument Existing Calls: mapGenerator/syncModules() diff --git a/code/modules/procedural_mapping/mapGenerators/asteroid.dm b/code/modules/procedural_mapping/mapGenerators/asteroid.dm index 8a2b0a97860..bf6bb81c213 100644 --- a/code/modules/procedural_mapping/mapGenerators/asteroid.dm +++ b/code/modules/procedural_mapping/mapGenerators/asteroid.dm @@ -1,23 +1,23 @@ //Asteroid turfs -/datum/mapGeneratorModule/bottomLayer/asteroidTurfs +/datum/map_generator_module/bottom_layer/asteroid_turfs spawnableTurfs = list(/turf/open/floor/plating/asteroid = 100) -/datum/mapGeneratorModule/bottomLayer/asteroidWalls +/datum/map_generator_module/bottom_layer/asteroid_walls spawnableTurfs = list(/turf/closed/mineral = 100) //Border walls -/datum/mapGeneratorModule/border/asteroidWalls +/datum/map_generator_module/border/asteroid_walls spawnableAtoms = list() spawnableTurfs = list(/turf/closed/mineral = 100) //Random walls -/datum/mapGeneratorModule/splatterLayer/asteroidWalls +/datum/map_generator_module/splatter_layer/asteroid_walls clusterCheckFlags = CLUSTER_CHECK_NONE spawnableAtoms = list() spawnableTurfs = list(/turf/closed/mineral = 30) //Monsters -/datum/mapGeneratorModule/splatterLayer/asteroidMonsters +/datum/map_generator_module/splatter_layer/asteroid_monsters spawnableTurfs = list() spawnableAtoms = list(/mob/living/simple_animal/hostile/asteroid/basilisk = 10, \ /mob/living/simple_animal/hostile/asteroid/hivelord = 10, \ @@ -26,24 +26,24 @@ // GENERATORS -/datum/mapGenerator/asteroid/hollow - modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \ - /datum/mapGeneratorModule/border/asteroidWalls) +/datum/map_generator/asteroid/hollow + modules = list(/datum/map_generator_module/bottom_layer/asteroid_turfs, \ + /datum/map_generator_module/border/asteroid_walls) buildmode_name = "Pattern: Asteroid Room \[AIRLESS!\]" -/datum/mapGenerator/asteroid/hollow/random - modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \ - /datum/mapGeneratorModule/border/asteroidWalls, \ - /datum/mapGeneratorModule/splatterLayer/asteroidWalls) +/datum/map_generator/asteroid/hollow/random + modules = list(/datum/map_generator_module/bottom_layer/asteroid_turfs, \ + /datum/map_generator_module/border/asteroid_walls, \ + /datum/map_generator_module/splatter_layer/asteroid_walls) buildmode_name = "Pattern: Asteroid Room: Splatter Walls \[AIRLESS!\]" -/datum/mapGenerator/asteroid/hollow/random/monsters - modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \ - /datum/mapGeneratorModule/border/asteroidWalls, \ - /datum/mapGeneratorModule/splatterLayer/asteroidWalls, \ - /datum/mapGeneratorModule/splatterLayer/asteroidMonsters) +/datum/map_generator/asteroid/hollow/random/monsters + modules = list(/datum/map_generator_module/bottom_layer/asteroid_turfs, \ + /datum/map_generator_module/border/asteroid_walls, \ + /datum/map_generator_module/splatter_layer/asteroid_walls, \ + /datum/map_generator_module/splatter_layer/asteroid_monsters) buildmode_name = "Pattern: Asteroid Room: Splatter Walls + Monsters \[AIRLESS!\]" -/datum/mapGenerator/asteroid/filled - modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidWalls) +/datum/map_generator/asteroid/filled + modules = list(/datum/map_generator_module/bottom_layer/asteroid_walls) buildmode_name = "Block: Asteroid Walls" diff --git a/code/modules/procedural_mapping/mapGenerators/cellular.dm b/code/modules/procedural_mapping/mapGenerators/cellular.dm index 5fc1344dc4e..6c5be6fd426 100644 --- a/code/modules/procedural_mapping/mapGenerators/cellular.dm +++ b/code/modules/procedural_mapping/mapGenerators/cellular.dm @@ -2,7 +2,7 @@ // Mostly for better caves // Should probably move these up and refactor modules so these can be mixed with other ones -/datum/mapGenerator/ca +/datum/map_generator/ca var/list/b_rule = list() // 0 -> 1, 1 -> 1 var/list/s_rule = list() // 0 -> 0, 1 -> 1 var/iterations = 1 @@ -15,7 +15,7 @@ var/list/type_map = list(/turf/open/floor/plating, /turf/closed/wall) var/turf/start = null -/datum/mapGenerator/ca/defineRegion(turf/Start, turf/End, replace = 0) +/datum/map_generator/ca/defineRegion(turf/Start, turf/End, replace = 0) . = ..() var/min_x = min(Start.x,End.x) @@ -28,7 +28,7 @@ //We assume 2D everywhere anyway start = locate(min_x,min_y,Start.z) -/datum/mapGenerator/ca/proc/initialize() +/datum/map_generator/ca/proc/initialize() old_state = new/list(width) for(var/i = 1,i<=width,i++) old_state[i] = new/list(height) @@ -37,7 +37,7 @@ current_state = old_state.Copy() -/datum/mapGenerator/ca/generate() +/datum/map_generator/ca/generate() //Abandon all hope for efficency all who enter here //Maybe some less basic implemetation later, but this is just simple admin tool initialize() @@ -55,7 +55,7 @@ if(T) T.ChangeTurf(type_map[current_state[i][j]+1]) -/datum/mapGenerator/ca/proc/apply_rule(i,j) +/datum/map_generator/ca/proc/apply_rule(i,j) var/value = 0 for(var/dx=-1,dx<=1,dx++) for(var/dy=-1,dy<=1,dy++) @@ -83,13 +83,13 @@ return old_state[i][j] return 0 -/datum/mapGenerator/ca/caves +/datum/map_generator/ca/caves b_rule = list(5,6,7,8) s_rule = list(4) type_map = list(/turf/open/floor/plating/asteroid/basalt, /turf/closed/mineral/volcanic) iterations = 5 -/datum/mapGenerator/ca/maze +/datum/map_generator/ca/maze b_rule = list(3) s_rule = list(1,2,3,4,5) iterations = 20 diff --git a/code/modules/procedural_mapping/mapGenerators/cult.dm b/code/modules/procedural_mapping/mapGenerators/cult.dm index 09016f883f8..02cf661fccc 100644 --- a/code/modules/procedural_mapping/mapGenerators/cult.dm +++ b/code/modules/procedural_mapping/mapGenerators/cult.dm @@ -1,16 +1,16 @@ -/datum/mapGeneratorModule/bottomLayer/cultFloor +/datum/map_generator_module/bottom_layer/cult_floor spawnableTurfs = list(/turf/open/floor/engine/cult = 100) -/datum/mapGeneratorModule/border/cultWalls +/datum/map_generator_module/border/cult_walls spawnableTurfs = list(/turf/closed/wall/mineral/cult = 100) -/datum/mapGenerator/cult //walls and floor only - modules = list(/datum/mapGeneratorModule/bottomLayer/cultFloor, \ - /datum/mapGeneratorModule/border/cultWalls, \ - /datum/mapGeneratorModule/bottomLayer/repressurize) +/datum/map_generator/cult //walls and floor only + modules = list(/datum/map_generator_module/bottom_layer/cult_floor, \ + /datum/map_generator_module/border/cult_walls, \ + /datum/map_generator_module/bottom_layer/repressurize) buildmode_name = "Pattern: Cult Room" -/datum/mapGenerator/cult/floor //floors only - modules = list(/datum/mapGeneratorModule/bottomLayer/cultFloor, \ - /datum/mapGeneratorModule/bottomLayer/repressurize) +/datum/map_generator/cult/floor //floors only + modules = list(/datum/map_generator_module/bottom_layer/cult_floor, \ + /datum/map_generator_module/bottom_layer/repressurize) buildmode_name = "Block: Cult Floor" diff --git a/code/modules/procedural_mapping/mapGenerators/lava_river.dm b/code/modules/procedural_mapping/mapGenerators/lava_river.dm index 0486acae563..723bc5f5782 100644 --- a/code/modules/procedural_mapping/mapGenerators/lava_river.dm +++ b/code/modules/procedural_mapping/mapGenerators/lava_river.dm @@ -1,14 +1,14 @@ -/datum/mapGenerator/lavaland +/datum/map_generator/lavaland var/start_z var/min_x = 0 var/min_y = 0 var/max_x = 0 var/max_y = 0 - modules = list(/datum/mapGeneratorModule/river) + modules = list(/datum/map_generator_module/river) buildmode_name = "Pattern: Lava Rivers" -/datum/mapGenerator/lavaland/defineRegion(turf/Start, turf/End, replace = 0) +/datum/map_generator/lavaland/defineRegion(turf/Start, turf/End, replace = 0) start_z = Start.z min_x = min(Start.x,End.x) min_y = min(Start.y,End.y) @@ -16,12 +16,12 @@ max_y = max(Start.y,End.y) ..() -/datum/mapGeneratorModule/river +/datum/map_generator_module/river var/river_type = /turf/open/lava/smooth var/river_nodes = 4 -/datum/mapGeneratorModule/river/generate() - var/datum/mapGenerator/lavaland/L = mother +/datum/map_generator_module/river/generate() + var/datum/map_generator/lavaland/L = mother if(!istype(L)) return spawn_rivers(L.start_z, river_nodes, river_type, min_x = L.min_x, min_y = L.min_y, max_x = L.max_x, max_y = L.max_y) diff --git a/code/modules/procedural_mapping/mapGenerators/lavaland.dm b/code/modules/procedural_mapping/mapGenerators/lavaland.dm index 9e50b3ae958..37bbe107abd 100644 --- a/code/modules/procedural_mapping/mapGenerators/lavaland.dm +++ b/code/modules/procedural_mapping/mapGenerators/lavaland.dm @@ -1,33 +1,33 @@ -/datum/mapGeneratorModule/bottomLayer/lavaland_default +/datum/map_generator_module/bottom_layer/lavaland_default spawnableTurfs = list(/turf/open/floor/plating/asteroid/basalt/lava_land_surface = 100) -/datum/mapGeneratorModule/bottomLayer/lavaland_mineral +/datum/map_generator_module/bottom_layer/lavaland_mineral spawnableTurfs = list(/turf/closed/mineral/random/volcanic = 100) -/datum/mapGeneratorModule/bottomLayer/lavaland_mineral/dense +/datum/map_generator_module/bottom_layer/lavaland_mineral/dense spawnableTurfs = list(/turf/closed/mineral/random/high_chance/volcanic = 100) -/datum/mapGeneratorModule/splatterLayer/lavalandMonsters +/datum/map_generator_module/splatter_layer/lavaland_monsters spawnableTurfs = list() spawnableAtoms = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast = 10, /mob/living/simple_animal/hostile/asteroid/hivelord/legion = 10, /mob/living/simple_animal/hostile/asteroid/basilisk/watcher = 10) -/datum/mapGeneratorModule/splatterLayer/lavalandTendrils +/datum/map_generator_module/splatter_layer/lavaland_tendrils spawnableTurfs = list() spawnableAtoms = list(/obj/structure/spawner/lavaland = 5, /obj/structure/spawner/lavaland/legion = 5, /obj/structure/spawner/lavaland/goliath = 5) -/datum/mapGenerator/lavaland/ground_only - modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_default) +/datum/map_generator/lavaland/ground_only + modules = list(/datum/map_generator_module/bottom_layer/lavaland_default) buildmode_name = "Block: Lavaland Floor" -/datum/mapGenerator/lavaland/dense_ores - modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_mineral/dense) +/datum/map_generator/lavaland/dense_ores + modules = list(/datum/map_generator_module/bottom_layer/lavaland_mineral/dense) buildmode_name = "Block: Lavaland Ores: Dense" -/datum/mapGenerator/lavaland/normal_ores - modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_mineral) +/datum/map_generator/lavaland/normal_ores + modules = list(/datum/map_generator_module/bottom_layer/lavaland_mineral) buildmode_name = "Block: Lavaland Ores" diff --git a/code/modules/procedural_mapping/mapGenerators/nature.dm b/code/modules/procedural_mapping/mapGenerators/nature.dm index abb4e7ed105..ae4d8bbb486 100644 --- a/code/modules/procedural_mapping/mapGenerators/nature.dm +++ b/code/modules/procedural_mapping/mapGenerators/nature.dm @@ -1,11 +1,11 @@ //Exists primarily as a test type. -/datum/mapGenerator/nature - modules = list(/datum/mapGeneratorModule/bottomLayer/grassTurfs, \ - /datum/mapGeneratorModule/pineTrees, \ - /datum/mapGeneratorModule/deadTrees, \ - /datum/mapGeneratorModule/randBushes, \ - /datum/mapGeneratorModule/randRocks, \ - /datum/mapGeneratorModule/denseLayer/grassTufts) +/datum/map_generator/nature + modules = list(/datum/map_generator_module/bottom_layer/grass_turfs, \ + /datum/map_generator_module/pine_trees, \ + /datum/map_generator_module/dead_trees, \ + /datum/map_generator_module/rand_bushes, \ + /datum/map_generator_module/rand_rocks, \ + /datum/map_generator_module/dense_layer/grass_tufts) buildmode_name = "Pattern: Nature" diff --git a/code/modules/procedural_mapping/mapGenerators/repair.dm b/code/modules/procedural_mapping/mapGenerators/repair.dm index bc8e9f74f1f..7b6d667d45b 100644 --- a/code/modules/procedural_mapping/mapGenerators/repair.dm +++ b/code/modules/procedural_mapping/mapGenerators/repair.dm @@ -1,25 +1,25 @@ -/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel +/datum/map_generator_module/bottom_layer/repair_floor_plasteel spawnableTurfs = list(/turf/open/floor/plasteel = 100) var/ignore_wall = FALSE allowAtomsOnSpace = TRUE -/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/place(turf/T) +/datum/map_generator_module/bottom_layer/repair_floor_plasteel/place(turf/T) if(isclosedturf(T) && !ignore_wall) return FALSE return ..() -/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/flatten +/datum/map_generator_module/bottom_layer/repair_floor_plasteel/flatten ignore_wall = TRUE -/datum/mapGeneratorModule/border/normalWalls +/datum/map_generator_module/border/normal_walls spawnableAtoms = list() spawnableTurfs = list(/turf/closed/wall = 100) allowAtomsOnSpace = TRUE -/datum/mapGeneratorModule/reload_station_map/generate() - if(!istype(mother, /datum/mapGenerator/repair/reload_station_map)) +/datum/map_generator_module/reload_station_map/generate() + if(!istype(mother, /datum/map_generator/repair/reload_station_map)) return - var/datum/mapGenerator/repair/reload_station_map/mother1 = mother + var/datum/map_generator/repair/reload_station_map/mother1 = mother GLOB.reloading_map = TRUE // This is kind of finicky on multi-Z maps but the reader would need to be // changed to allow Z cropping and that's a mess @@ -54,42 +54,42 @@ SSair.setup_template_machinery(atmos_machines) GLOB.reloading_map = FALSE -/datum/mapGenerator/repair - modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel, - /datum/mapGeneratorModule/bottomLayer/repressurize) +/datum/map_generator/repair + modules = list(/datum/map_generator_module/bottom_layer/repair_floor_plasteel, + /datum/map_generator_module/bottom_layer/repressurize) buildmode_name = "Repair: Floor" -/datum/mapGenerator/repair/delete_walls - modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/flatten, - /datum/mapGeneratorModule/bottomLayer/repressurize) +/datum/map_generator/repair/delete_walls + modules = list(/datum/map_generator_module/bottom_layer/repair_floor_plasteel/flatten, + /datum/map_generator_module/bottom_layer/repressurize) buildmode_name = "Repair: Floor: Flatten Walls" -/datum/mapGenerator/repair/enclose_room - modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/flatten, - /datum/mapGeneratorModule/border/normalWalls, - /datum/mapGeneratorModule/bottomLayer/repressurize) +/datum/map_generator/repair/enclose_room + modules = list(/datum/map_generator_module/bottom_layer/repair_floor_plasteel/flatten, + /datum/map_generator_module/border/normal_walls, + /datum/map_generator_module/bottom_layer/repressurize) buildmode_name = "Repair: Generate Aired Room" -/datum/mapGenerator/repair/reload_station_map - modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete/no_delete_mobs) +/datum/map_generator/repair/reload_station_map + modules = list(/datum/map_generator_module/bottom_layer/massdelete/no_delete_mobs) var/x_low = 0 var/x_high = 0 var/y_low = 0 var/y_high = 0 var/z = 0 var/cleanload = FALSE - var/datum/mapGeneratorModule/reload_station_map/loader + var/datum/map_generator_module/reload_station_map/loader buildmode_name = "Repair: Reload Block \[DO NOT USE\]" -/datum/mapGenerator/repair/reload_station_map/clean +/datum/map_generator/repair/reload_station_map/clean buildmode_name = "Repair: Reload Block - Mass Delete" cleanload = TRUE -/datum/mapGenerator/repair/reload_station_map/clean/in_place - modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete) +/datum/map_generator/repair/reload_station_map/clean/in_place + modules = list(/datum/map_generator_module/bottom_layer/massdelete/regeneration_delete) buildmode_name = "Repair: Reload Block - Mass Delete - In Place" -/datum/mapGenerator/repair/reload_station_map/defineRegion(turf/start, turf/end) +/datum/map_generator/repair/reload_station_map/defineRegion(turf/start, turf/end) . = ..() if(!is_station_level(start.z) || !is_station_level(end.z)) return @@ -101,7 +101,7 @@ GLOBAL_VAR_INIT(reloading_map, FALSE) -/datum/mapGenerator/repair/reload_station_map/generate(clean = cleanload) +/datum/map_generator/repair/reload_station_map/generate(clean = cleanload) if(!loader) loader = new if(cleanload) diff --git a/code/modules/procedural_mapping/mapGenerators/shuttle.dm b/code/modules/procedural_mapping/mapGenerators/shuttle.dm index ba877eeabb3..2039d7d90d7 100644 --- a/code/modules/procedural_mapping/mapGenerators/shuttle.dm +++ b/code/modules/procedural_mapping/mapGenerators/shuttle.dm @@ -1,17 +1,17 @@ -/datum/mapGeneratorModule/bottomLayer/shuttleFloor +/datum/map_generator_module/bottom_layer/shuttle_floor spawnableTurfs = list(/turf/open/floor/plasteel/shuttle = 100) -/datum/mapGeneratorModule/border/shuttleWalls +/datum/map_generator_module/border/shuttle_walls spawnableAtoms = list() spawnableTurfs = list(/turf/closed/wall/mineral/titanium = 100) // Generators -/datum/mapGenerator/shuttle/full - modules = list(/datum/mapGeneratorModule/bottomLayer/shuttleFloor, \ - /datum/mapGeneratorModule/border/shuttleWalls,\ - /datum/mapGeneratorModule/bottomLayer/repressurize) +/datum/map_generator/shuttle/full + modules = list(/datum/map_generator_module/bottom_layer/shuttle_floor, \ + /datum/map_generator_module/border/shuttle_walls,\ + /datum/map_generator_module/bottom_layer/repressurize) buildmode_name = "Pattern: Shuttle Room" -/datum/mapGenerator/shuttle/floor - modules = list(/datum/mapGeneratorModule/bottomLayer/shuttleFloor) +/datum/map_generator/shuttle/floor + modules = list(/datum/map_generator_module/bottom_layer/shuttle_floor) buildmode_name = "Block: Shuttle Floor" diff --git a/code/modules/procedural_mapping/mapGenerators/syndicate.dm b/code/modules/procedural_mapping/mapGenerators/syndicate.dm index 758df6e0a07..9e498db37f6 100644 --- a/code/modules/procedural_mapping/mapGenerators/syndicate.dm +++ b/code/modules/procedural_mapping/mapGenerators/syndicate.dm @@ -4,22 +4,22 @@ /turf/open/floor/plasteel/shuttle/red/syndicate name = "floor" //Not Brig Floor -/datum/mapGeneratorModule/bottomLayer/syndieFloor +/datum/map_generator_module/bottom_layer/syndie_floor spawnableTurfs = list(/turf/open/floor/plasteel/shuttle/red/syndicate = 100) -/datum/mapGeneratorModule/border/syndieWalls +/datum/map_generator_module/border/syndie_walls spawnableAtoms = list() spawnableTurfs = list(/turf/closed/wall/r_wall = 100) -/datum/mapGeneratorModule/syndieFurniture +/datum/map_generator_module/syndie_furniture clusterCheckFlags = CLUSTER_CHECK_ALL spawnableTurfs = list() spawnableAtoms = list(/obj/structure/table = 20,/obj/structure/chair = 15,/obj/structure/chair/stool = 10, \ /obj/structure/frame/computer = 15, /obj/item/storage/toolbox/syndicate = 15 ,\ /obj/structure/closet/syndicate = 25, /obj/machinery/suit_storage_unit/syndicate = 15) -/datum/mapGeneratorModule/splatterLayer/syndieMobs +/datum/map_generator_module/splatter_layer/syndie_mobs spawnableAtoms = list(/mob/living/simple_animal/hostile/syndicate = 30, \ /mob/living/simple_animal/hostile/syndicate/melee = 20, \ /mob/living/simple_animal/hostile/syndicate/ranged = 20, \ @@ -28,30 +28,30 @@ // Generators -/datum/mapGenerator/syndicate/empty //walls and floor only - modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \ - /datum/mapGeneratorModule/border/syndieWalls,\ - /datum/mapGeneratorModule/bottomLayer/repressurize) +/datum/map_generator/syndicate/empty //walls and floor only + modules = list(/datum/map_generator_module/bottom_layer/syndie_floor, \ + /datum/map_generator_module/border/syndie_walls,\ + /datum/map_generator_module/bottom_layer/repressurize) buildmode_name = "Pattern: Shuttle Room: Syndicate" -/datum/mapGenerator/syndicate/mobsonly - modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \ - /datum/mapGeneratorModule/border/syndieWalls,\ - /datum/mapGeneratorModule/splatterLayer/syndieMobs, \ - /datum/mapGeneratorModule/bottomLayer/repressurize) +/datum/map_generator/syndicate/mobsonly + modules = list(/datum/map_generator_module/bottom_layer/syndie_floor, \ + /datum/map_generator_module/border/syndie_walls,\ + /datum/map_generator_module/splatter_layer/syndie_mobs, \ + /datum/map_generator_module/bottom_layer/repressurize) buildmode_name = "Pattern: Shuttle Room: Syndicate: Mobs" -/datum/mapGenerator/syndicate/furniture - modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \ - /datum/mapGeneratorModule/border/syndieWalls,\ - /datum/mapGeneratorModule/syndieFurniture, \ - /datum/mapGeneratorModule/bottomLayer/repressurize) +/datum/map_generator/syndicate/furniture + modules = list(/datum/map_generator_module/bottom_layer/syndie_floor, \ + /datum/map_generator_module/border/syndie_walls,\ + /datum/map_generator_module/syndie_furniture, \ + /datum/map_generator_module/bottom_layer/repressurize) buildmode_name = "Pattern: Shuttle Room: Syndicate: Furniture" -/datum/mapGenerator/syndicate/full - modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \ - /datum/mapGeneratorModule/border/syndieWalls,\ - /datum/mapGeneratorModule/syndieFurniture, \ - /datum/mapGeneratorModule/splatterLayer/syndieMobs, \ - /datum/mapGeneratorModule/bottomLayer/repressurize) +/datum/map_generator/syndicate/full + modules = list(/datum/map_generator_module/bottom_layer/syndie_floor, \ + /datum/map_generator_module/border/syndie_walls,\ + /datum/map_generator_module/syndie_furniture, \ + /datum/map_generator_module/splatter_layer/syndie_mobs, \ + /datum/map_generator_module/bottom_layer/repressurize) buildmode_name = "Pattern: Shuttle Room: Syndicate: All" diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm index a7e0cbeacc6..b31bc498943 100644 --- a/code/modules/projectiles/ammunition/ballistic/pistol.dm +++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm @@ -47,8 +47,8 @@ // .50AE (Desert Eagle) -/obj/item/ammo_casing/a50AE +/obj/item/ammo_casing/a50ae name = ".50AE bullet casing" desc = "A .50AE bullet casing." caliber = ".50" - projectile_type = /obj/projectile/bullet/a50AE + projectile_type = /obj/projectile/bullet/a50ae diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm index 5f3439b4d8d..3d0d48b4ad2 100644 --- a/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -79,7 +79,7 @@ /obj/item/ammo_box/magazine/m50 name = "handgun magazine (.50ae)" icon_state = "50ae" - ammo_type = /obj/item/ammo_casing/a50AE + ammo_type = /obj/item/ammo_casing/a50ae caliber = ".50" max_ammo = 7 multiple_sprites = AMMO_BOX_PER_BULLET diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm index 7a399287a56..ffedb1283e4 100644 --- a/code/modules/projectiles/projectile/bullets/revolver.dm +++ b/code/modules/projectiles/projectile/bullets/revolver.dm @@ -6,7 +6,7 @@ // .50AE (Desert Eagle) -/obj/projectile/bullet/a50AE +/obj/projectile/bullet/a50ae name = ".50AE bullet" damage = 60 diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index a30b3887004..a812250d326 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -1,12 +1,12 @@ // Category 2 medicines are medicines that have an ill effect regardless of volume/OD to dissuade doping. Mostly used as emergency chemicals OR to convert damage (and heal a bit in the process). The type is used to prompt borgs that the medicine is harmful. -/datum/reagent/medicine/C2 +/datum/reagent/medicine/c2 harmful = TRUE metabolization_rate = 0.2 /******BRUTE******/ /*Suffix: -bital*/ -/datum/reagent/medicine/C2/helbital //kinda a C2 only if you're not in hardcrit. +/datum/reagent/medicine/c2/helbital //kinda a C2 only if you're not in hardcrit. name = "Helbital" description = "Named after the norse goddess Hel, this medicine heals the patient's bruises the closer they are to death. Patients will find the medicine 'aids' their healing if not near death by causing asphyxiation." color = "#9400D3" @@ -16,7 +16,7 @@ var/helbent = FALSE var/reaping = FALSE -/datum/reagent/medicine/C2/helbital/on_mob_life(mob/living/carbon/M) +/datum/reagent/medicine/c2/helbital/on_mob_life(mob/living/carbon/M) . = TRUE var/death_is_coming = (M.getToxLoss() + M.getOxyLoss() + M.getFireLoss() + M.getBruteLoss()) var/thou_shall_heal = 0 @@ -66,39 +66,39 @@ ..() return -/datum/reagent/medicine/C2/helbital/overdose_process(mob/living/carbon/M) +/datum/reagent/medicine/c2/helbital/overdose_process(mob/living/carbon/M) if(!helbent) M.apply_necropolis_curse(CURSE_WASTING | CURSE_BLINDING) helbent = TRUE ..() return TRUE -/datum/reagent/medicine/C2/helbital/on_mob_delete(mob/living/L) +/datum/reagent/medicine/c2/helbital/on_mob_delete(mob/living/L) if(helbent) L.remove_status_effect(STATUS_EFFECT_NECROPOLIS_CURSE) ..() -/datum/reagent/medicine/C2/libital //messes with your liber +/datum/reagent/medicine/c2/libital //messes with your liber name = "Libital" description = "A bruise reliever. Does minor liver damage." color = "#ECEC8D" // rgb: 236 236 141 taste_description = "bitter with a hint of alcohol" reagent_state = SOLID -/datum/reagent/medicine/C2/libital/on_mob_life(mob/living/carbon/M) +/datum/reagent/medicine/c2/libital/on_mob_life(mob/living/carbon/M) M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.3*REM) M.adjustBruteLoss(-3*REM) ..() return TRUE -/datum/reagent/medicine/C2/probital +/datum/reagent/medicine/c2/probital name = "Probital" description = "Originally developed as a prototype-gym supliment for those looking for quick workout turnover, this oral medication quickly repairs broken muscle tissue but causes lactic acid buildup, tiring the patient. Overdosing can cause extreme drowsiness. An Influx of nutrients promotes the muscle repair even further." reagent_state = SOLID color = "#FFFF6B" overdose_threshold = 20 -/datum/reagent/medicine/C2/probital/on_mob_life(mob/living/carbon/M) +/datum/reagent/medicine/c2/probital/on_mob_life(mob/living/carbon/M) M.adjustBruteLoss(-2.25*REM, FALSE) var/ooo_youaregettingsleepy = 3.5 switch(round(M.getStaminaLoss())) @@ -112,7 +112,7 @@ ..() . = TRUE -/datum/reagent/medicine/C2/probital/overdose_process(mob/living/M) +/datum/reagent/medicine/c2/probital/overdose_process(mob/living/M) M.adjustStaminaLoss(3*REM, 0) if(M.getStaminaLoss() >= 80) M.drowsyness++ @@ -123,18 +123,18 @@ ..() . = TRUE -/datum/reagent/medicine/C2/probital/on_transfer(atom/A, method=INGEST, trans_volume) +/datum/reagent/medicine/c2/probital/on_transfer(atom/A, method=INGEST, trans_volume) if(method != INGEST || !iscarbon(A)) return - A.reagents.remove_reagent(/datum/reagent/medicine/C2/probital, trans_volume * 0.05) + A.reagents.remove_reagent(/datum/reagent/medicine/c2/probital, trans_volume * 0.05) A.reagents.add_reagent(/datum/reagent/medicine/metafactor, trans_volume * 0.25) ..() /******BURN******/ /*Suffix: -uri*/ -/datum/reagent/medicine/C2/lenturi +/datum/reagent/medicine/c2/lenturi name = "Lenturi" description = "Used to treat burns. Makes you move slower while it is in your system. Applies stomach damage when it leaves your system." reagent_state = LIQUID @@ -142,21 +142,21 @@ var/resetting_probability = 0 var/spammer = 0 -/datum/reagent/medicine/C2/lenturi/on_mob_life(mob/living/carbon/M) +/datum/reagent/medicine/c2/lenturi/on_mob_life(mob/living/carbon/M) M.adjustFireLoss(-3 * REM) M.adjustOrganLoss(ORGAN_SLOT_STOMACH, 0.4 * REM) ..() return TRUE -/datum/reagent/medicine/C2/lenturi/on_mob_metabolize(mob/living/carbon/M) +/datum/reagent/medicine/c2/lenturi/on_mob_metabolize(mob/living/carbon/M) M.add_movespeed_modifier(/datum/movespeed_modifier/reagent/lenturi) return ..() -/datum/reagent/medicine/C2/lenturi/on_mob_end_metabolize(mob/living/carbon/M) +/datum/reagent/medicine/c2/lenturi/on_mob_end_metabolize(mob/living/carbon/M) M.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/lenturi) return ..() -/datum/reagent/medicine/C2/aiuri +/datum/reagent/medicine/c2/aiuri name = "Aiuri" description = "Used to treat burns. Does minor eye damage." reagent_state = LIQUID @@ -164,13 +164,13 @@ var/resetting_probability = 0 var/message_cd = 0 -/datum/reagent/medicine/C2/aiuri/on_mob_life(mob/living/carbon/M) +/datum/reagent/medicine/c2/aiuri/on_mob_life(mob/living/carbon/M) M.adjustFireLoss(-2*REM) M.adjustOrganLoss(ORGAN_SLOT_EYES,0.25*REM) ..() return TRUE -/datum/reagent/medicine/C2/hercuri +/datum/reagent/medicine/c2/hercuri name = "Hercuri" description = "Not to be confused with element Mercury, this medicine excels in reverting effects of dangerous high-temperature environments. Prolonged exposure can cause hypothermia." reagent_state = LIQUID @@ -178,7 +178,7 @@ overdose_threshold = 25 reagent_weight = 0.6 -/datum/reagent/medicine/C2/hercuri/on_mob_life(mob/living/carbon/M) +/datum/reagent/medicine/c2/hercuri/on_mob_life(mob/living/carbon/M) if(M.getFireLoss() > 50) M.adjustFireLoss(-2*REM, FALSE) else @@ -189,7 +189,7 @@ ..() . = TRUE -/datum/reagent/medicine/C2/hercuri/reaction_mob(mob/living/carbon/M, method=VAPOR, reac_volume) +/datum/reagent/medicine/c2/hercuri/reaction_mob(mob/living/carbon/M, method=VAPOR, reac_volume) if(method != VAPOR) return @@ -200,7 +200,7 @@ ..() -/datum/reagent/medicine/C2/hercuri/overdose_process(mob/living/carbon/M) +/datum/reagent/medicine/c2/hercuri/overdose_process(mob/living/carbon/M) M.adjust_bodytemperature(-10*TEMPERATURE_DAMAGE_COEFFICIENT*REM,50) //chilly chilly ..() @@ -209,14 +209,14 @@ /*Suffix: -mol*/ #define CONVERMOL_RATIO 5 //# Oxygen damage to result in 1 tox -/datum/reagent/medicine/C2/convermol +/datum/reagent/medicine/c2/convermol name = "Convermol" description = "Restores oxygen deprivation while producing a lesser amount of toxic byproducts. Both scale with exposure to the drug and current amount of oxygen deprivation. Overdose causes toxic byproducts regardless of oxygen deprivation." reagent_state = LIQUID color = "#FF6464" overdose_threshold = 35 // at least 2 full syringes +some, this stuff is nasty if left in for long -/datum/reagent/medicine/C2/convermol/on_mob_life(mob/living/carbon/human/M) +/datum/reagent/medicine/c2/convermol/on_mob_life(mob/living/carbon/human/M) var/oxycalc = 2.5*REM*current_cycle if(!overdosed) oxycalc = min(oxycalc,M.getOxyLoss()+0.5) //if NOT overdosing, we lower our toxdamage to only the damage we actually healed with a minimum of 0.1*current_cycle. IE if we only heal 10 oxygen damage but we COULD have healed 20, we will only take toxdamage for the 10. We would take the toxdamage for the extra 10 if we were overdosing. @@ -227,20 +227,20 @@ ..() return TRUE -/datum/reagent/medicine/C2/convermol/overdose_process(mob/living/carbon/human/M) +/datum/reagent/medicine/c2/convermol/overdose_process(mob/living/carbon/human/M) metabolization_rate += 1 ..() return TRUE #undef CONVERMOL_RATIO -/datum/reagent/medicine/C2/tirimol +/datum/reagent/medicine/c2/tirimol name = "Tirimol" description = "An oxygen deprivation medication that causes fatigue. Prolonged exposure causes the patient to fall asleep once the medicine metabolizes." color = "#FF6464" var/drowsycd = 0 -/datum/reagent/medicine/C2/tirimol/on_mob_life(mob/living/carbon/human/M) +/datum/reagent/medicine/c2/tirimol/on_mob_life(mob/living/carbon/human/M) M.adjustOxyLoss(-3) M.adjustStaminaLoss(2) if(drowsycd && (world.time > drowsycd)) @@ -251,7 +251,7 @@ ..() return TRUE -/datum/reagent/medicine/C2/tirimol/on_mob_end_metabolize(mob/living/L) +/datum/reagent/medicine/c2/tirimol/on_mob_end_metabolize(mob/living/L) if(current_cycle > 20) L.Sleeping(10 SECONDS) ..() @@ -259,16 +259,16 @@ /******TOXIN******/ /*Suffix: -iver*/ -/datum/reagent/medicine/C2/seiver //a bit of a gray joke +/datum/reagent/medicine/c2/seiver //a bit of a gray joke name = "Seiver" description = "A medicine that shifts functionality based on temperature. Colder temperatures incurs radiation removal while hotter temperatures promote antitoxicity. Damages the heart." //CHEM HOLDER TEMPS, NOT AIR TEMPS var/radbonustemp = (T0C - 100) //being below this number gives you 10% off rads. -/datum/reagent/medicine/C2/seiver/on_mob_metabolize(mob/living/carbon/human/M) +/datum/reagent/medicine/c2/seiver/on_mob_metabolize(mob/living/carbon/human/M) . = ..() radbonustemp = rand(radbonustemp - 50, radbonustemp + 50) // Basically this means 50K and below will always give the percent heal, and upto 150K could. Calculated once. -/datum/reagent/medicine/C2/seiver/on_mob_life(mob/living/carbon/human/M) +/datum/reagent/medicine/c2/seiver/on_mob_life(mob/living/carbon/human/M) var/chemtemp = min(M.reagents?.chem_temp, 1000) chemtemp = chemtemp ? chemtemp : 273 //why do you have null sweaty var/healypoints = 0 //5 healypoints = 1 heart damage; 5 rads = 1 tox damage healed for the purpose of healypoints @@ -297,11 +297,11 @@ ..() return TRUE -/datum/reagent/medicine/C2/multiver //enhanced with MULTIple medicines +/datum/reagent/medicine/c2/multiver //enhanced with MULTIple medicines name = "Multiver" description = "A chem-purger that becomes more effective the more unique medicines present. Slightly heals toxicity but causes lung damage (mitigatable by unique medicines)." -/datum/reagent/medicine/C2/multiver/on_mob_life(mob/living/carbon/human/M) +/datum/reagent/medicine/c2/multiver/on_mob_life(mob/living/carbon/human/M) var/medibonus = 0 //it will always have itself which makes it REALLY start @ 1 for(var/r in M.reagents.reagent_list) var/datum/reagent/the_reagent = r @@ -321,13 +321,13 @@ return TRUE // Antitoxin binds plants pretty well. So the tox goes significantly down -/datum/reagent/medicine/C2/multiver/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user) +/datum/reagent/medicine/c2/multiver/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user) . = ..() mytray.adjustToxic(-round(chems.get_reagent_amount(type) * 2)) -#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 +#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 -/datum/reagent/medicine/C2/syriniver //Inject >> SYRINge +/datum/reagent/medicine/c2/syriniver //Inject >> SYRINge name = "Syriniver" description = "A potent antidote for intravenous use with a narrow therapeutic index, it is considered an active prodrug of musiver." reagent_state = LIQUID @@ -336,7 +336,7 @@ overdose_threshold = 6 var/conversion_amount -/datum/reagent/medicine/C2/syriniver/on_transfer(atom/A, method=INJECT, trans_volume) +/datum/reagent/medicine/c2/syriniver/on_transfer(atom/A, method=INJECT, trans_volume) if(method != INJECT || !iscarbon(A)) return var/mob/living/carbon/C = A @@ -346,11 +346,11 @@ if((L.organ_flags & ORGAN_FAILING) || !L) return conversion_amount = trans_volume * (min(100 -C.getOrganLoss(ORGAN_SLOT_LIVER), 80) / 100) //the more damaged the liver the worse we metabolize. - C.reagents.remove_reagent(/datum/reagent/medicine/C2/syriniver, conversion_amount) - C.reagents.add_reagent(/datum/reagent/medicine/C2/musiver, conversion_amount) + C.reagents.remove_reagent(/datum/reagent/medicine/c2/syriniver, conversion_amount) + C.reagents.add_reagent(/datum/reagent/medicine/c2/musiver, conversion_amount) ..() -/datum/reagent/medicine/C2/syriniver/on_mob_life(mob/living/carbon/M) +/datum/reagent/medicine/c2/syriniver/on_mob_life(mob/living/carbon/M) M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.8) M.adjustToxLoss(-1*REM, 0) for(var/datum/reagent/R in M.reagents.reagent_list) @@ -361,14 +361,14 @@ ..() . = 1 -/datum/reagent/medicine/C2/syriniver/overdose_process(mob/living/carbon/M) +/datum/reagent/medicine/c2/syriniver/overdose_process(mob/living/carbon/M) M.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5) M.adjust_disgust(3) - M.reagents.add_reagent(/datum/reagent/medicine/C2/musiver, 0.225 * REM) + M.reagents.add_reagent(/datum/reagent/medicine/c2/musiver, 0.225 * REM) ..() . = 1 -/datum/reagent/medicine/C2/musiver //MUScles +/datum/reagent/medicine/c2/musiver //MUScles name = "Musiver" description = "The active metabolite of syriniver. Causes muscle weakness on overdose" reagent_state = LIQUID @@ -377,7 +377,7 @@ overdose_threshold = 25 var/datum/brain_trauma/mild/muscle_weakness/U -/datum/reagent/medicine/C2/musiver/on_mob_life(mob/living/carbon/M) +/datum/reagent/medicine/c2/musiver/on_mob_life(mob/living/carbon/M) M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.1) M.adjustToxLoss(-1*REM, 0) for(var/datum/reagent/R in M.reagents.reagent_list) @@ -387,17 +387,17 @@ ..() . = 1 -/datum/reagent/medicine/C2/musiver/overdose_start(mob/living/carbon/M) +/datum/reagent/medicine/c2/musiver/overdose_start(mob/living/carbon/M) U = new() M.gain_trauma(U, TRAUMA_RESILIENCE_ABSOLUTE) ..() -/datum/reagent/medicine/C2/musiver/on_mob_delete(mob/living/carbon/M) +/datum/reagent/medicine/c2/musiver/on_mob_delete(mob/living/carbon/M) if(U) QDEL_NULL(U) return ..() -/datum/reagent/medicine/C2/musiver/overdose_process(mob/living/carbon/M) +/datum/reagent/medicine/c2/musiver/overdose_process(mob/living/carbon/M) M.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5) M.adjust_disgust(3) ..() @@ -406,13 +406,13 @@ #undef issyrinormusc /******COMBOS******/ /*Suffix: Combo of healing, prob gonna get wack REAL fast*/ -/datum/reagent/medicine/C2/instabitaluri +/datum/reagent/medicine/c2/instabitaluri name = "Synthflesh (Instabitaluri)" description = "Heals brute and burn damage at the cost of toxicity (66% of damage healed). Touch application only." reagent_state = LIQUID color = "#FFEBEB" -/datum/reagent/medicine/C2/instabitaluri/reaction_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1) +/datum/reagent/medicine/c2/instabitaluri/reaction_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1) if(iscarbon(M)) var/mob/living/carbon/carbies = M if (carbies.stat == DEAD) @@ -426,7 +426,7 @@ if(show_message) to_chat(carbies, "You feel your burns and bruises healing! It stings like hell!") SEND_SIGNAL(carbies, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) - if(HAS_TRAIT_FROM(M, TRAIT_HUSK, "burn") && carbies.getFireLoss() < THRESHOLD_UNHUSK && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/C2/instabitaluri) + reac_volume >= 100)) + if(HAS_TRAIT_FROM(M, TRAIT_HUSK, "burn") && carbies.getFireLoss() < THRESHOLD_UNHUSK && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/c2/instabitaluri) + reac_volume >= 100)) carbies.cure_husk("burn") carbies.visible_message("A rubbery liquid coats [carbies]'s burns. [carbies] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because carbies could be a skeleton or a golem or something ..() @@ -444,13 +444,13 @@ *causing you to loose your soft crit, hard crit and heart stabilization effects. *Overdosing on penthrite also causes a heart failure. */ -/datum/reagent/medicine/C2/penthrite +/datum/reagent/medicine/c2/penthrite name = "Penthrite" description = "An expensive medicine that aids with pumping blood around the body even without a heart, and prevents the heart from slowing down. It reacts violently with other emergency medication." color = "#F5F5F5" overdose_threshold = 50 -/datum/reagent/medicine/C2/penthrite/on_mob_add(mob/living/M) +/datum/reagent/medicine/c2/penthrite/on_mob_add(mob/living/M) . = ..() to_chat(M,"Your heart begins to beat with great force!") ADD_TRAIT(M, TRAIT_STABLEHEART, type) @@ -459,7 +459,7 @@ M.crit_threshold = M.crit_threshold + HEALTH_THRESHOLD_FULLCRIT*2 //your heart is still pumping! -/datum/reagent/medicine/C2/penthrite/on_mob_life(mob/living/carbon/human/H) +/datum/reagent/medicine/c2/penthrite/on_mob_life(mob/living/carbon/human/H) H.adjustOrganLoss(ORGAN_SLOT_STOMACH,0.25) if(H.health <= HEALTH_THRESHOLD_CRIT && H.health > H.crit_threshold) //we cannot save someone above our raised crit threshold. @@ -487,14 +487,14 @@ volume = 0 . = ..() -/datum/reagent/medicine/C2/penthrite/on_mob_end_metabolize(mob/living/M) +/datum/reagent/medicine/c2/penthrite/on_mob_end_metabolize(mob/living/M) M.crit_threshold = M.crit_threshold - HEALTH_THRESHOLD_FULLCRIT*2 //your heart is still pumping! REMOVE_TRAIT(M, TRAIT_STABLEHEART, type) REMOVE_TRAIT(M, TRAIT_NOHARDCRIT,type) REMOVE_TRAIT(M, TRAIT_NOSOFTCRIT,type) . = ..() -/datum/reagent/medicine/C2/penthrite/overdose_process(mob/living/carbon/human/H) +/datum/reagent/medicine/c2/penthrite/overdose_process(mob/living/carbon/human/H) REMOVE_TRAIT(H, TRAIT_STABLEHEART, type) H.adjustStaminaLoss(10) H.adjustOrganLoss(ORGAN_SLOT_HEART,10) diff --git a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm index 4e4205d6f80..48a4b590763 100644 --- a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm +++ b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm @@ -3,30 +3,30 @@ /*****BRUTE*****/ /datum/chemical_reaction/helbital - results = list(/datum/reagent/medicine/C2/helbital = 3) + results = list(/datum/reagent/medicine/c2/helbital = 3) required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/fluorine = 1, /datum/reagent/carbon = 1) mix_message = "The mixture turns into a thick, yellow powder." /datum/chemical_reaction/libital - results = list(/datum/reagent/medicine/C2/libital = 3) + results = list(/datum/reagent/medicine/c2/libital = 3) required_reagents = list(/datum/reagent/phenol = 1, /datum/reagent/oxygen = 1, /datum/reagent/nitrogen = 1) /datum/chemical_reaction/probital - results = list(/datum/reagent/medicine/C2/probital = 4) + results = list(/datum/reagent/medicine/c2/probital = 4) required_reagents = list(/datum/reagent/copper = 1, /datum/reagent/acetone = 2, /datum/reagent/phosphorus = 1) /*****BURN*****/ /datum/chemical_reaction/lenturi - results = list(/datum/reagent/medicine/C2/lenturi = 5) + results = list(/datum/reagent/medicine/c2/lenturi = 5) required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/silver = 1, /datum/reagent/sulfur = 1, /datum/reagent/oxygen = 1, /datum/reagent/chlorine = 1) /datum/chemical_reaction/aiuri - results = list(/datum/reagent/medicine/C2/aiuri = 4) + results = list(/datum/reagent/medicine/c2/aiuri = 4) required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/toxin/acid = 1, /datum/reagent/hydrogen = 2) /datum/chemical_reaction/hercuri - results = list(/datum/reagent/medicine/C2/hercuri = 5) + results = list(/datum/reagent/medicine/c2/hercuri = 5) required_reagents = list(/datum/reagent/cryostylane = 3, /datum/reagent/bromine = 1, /datum/reagent/lye = 1) required_temp = 47 is_cold_recipe = TRUE @@ -34,32 +34,32 @@ /*****OXY*****/ /datum/chemical_reaction/convermol - results = list(/datum/reagent/medicine/C2/convermol = 3) + results = list(/datum/reagent/medicine/c2/convermol = 3) required_reagents = list(/datum/reagent/hydrogen = 1, /datum/reagent/fluorine = 1, /datum/reagent/fuel/oil = 1) required_temp = 370 mix_message = "The mixture rapidly turns into a dense pink liquid." /datum/chemical_reaction/tirimol - results = list(/datum/reagent/medicine/C2/tirimol = 5) + results = list(/datum/reagent/medicine/c2/tirimol = 5) required_reagents = list(/datum/reagent/nitrogen = 3, /datum/reagent/acetone = 2) required_catalysts = list(/datum/reagent/toxin/acid = 1) /*****TOX*****/ /datum/chemical_reaction/seiver - results = list(/datum/reagent/medicine/C2/seiver = 3) + results = list(/datum/reagent/medicine/c2/seiver = 3) required_reagents = list(/datum/reagent/nitrogen = 1, /datum/reagent/potassium = 1, /datum/reagent/aluminium = 1) /datum/chemical_reaction/multiver - results = list(/datum/reagent/medicine/C2/multiver = 2) + results = list(/datum/reagent/medicine/c2/multiver = 2) required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/sodiumchloride = 1) mix_message = "The mixture yields a fine black powder." required_temp = 380 /datum/chemical_reaction/syriniver - results = list(/datum/reagent/medicine/C2/syriniver = 5) + results = list(/datum/reagent/medicine/c2/syriniver = 5) required_reagents = list(/datum/reagent/sulfur = 1, /datum/reagent/fluorine = 1, /datum/reagent/toxin = 1, /datum/reagent/nitrous_oxide = 2) /datum/chemical_reaction/penthrite - results = list(/datum/reagent/medicine/C2/penthrite = 3) + results = list(/datum/reagent/medicine/c2/penthrite = 3) required_reagents = list(/datum/reagent/pentaerythritol = 1, /datum/reagent/acetone = 1, /datum/reagent/toxin/acid/nitracid = 1 , /datum/reagent/wittel = 1) diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm index 199409494df..3165fe9f4a8 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -14,12 +14,12 @@ /datum/chemical_reaction/oculine results = list(/datum/reagent/medicine/oculine = 3) - required_reagents = list(/datum/reagent/medicine/C2/multiver = 1, /datum/reagent/carbon = 1, /datum/reagent/hydrogen = 1) + required_reagents = list(/datum/reagent/medicine/c2/multiver = 1, /datum/reagent/carbon = 1, /datum/reagent/hydrogen = 1) mix_message = "The mixture bubbles noticeably and becomes a dark grey color!" /datum/chemical_reaction/inacusiate results = list(/datum/reagent/medicine/inacusiate = 2) - required_reagents = list(/datum/reagent/water = 1, /datum/reagent/carbon = 1, /datum/reagent/medicine/C2/multiver = 1) + required_reagents = list(/datum/reagent/water = 1, /datum/reagent/carbon = 1, /datum/reagent/medicine/c2/multiver = 1) mix_message = "The mixture sputters loudly and becomes a light grey color!" /datum/chemical_reaction/synaptizine @@ -39,8 +39,8 @@ 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 /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) + 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) /datum/chemical_reaction/calomel results = list(/datum/reagent/medicine/calomel = 2) @@ -108,7 +108,7 @@ /datum/chemical_reaction/antihol results = list(/datum/reagent/medicine/antihol = 3) - required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/medicine/C2/multiver = 1, /datum/reagent/copper = 1) + required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/medicine/c2/multiver = 1, /datum/reagent/copper = 1) /datum/chemical_reaction/cryoxadone results = list(/datum/reagent/medicine/cryoxadone = 3) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 08b5ccb98f3..bb5f6f2e5b3 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -1,7 +1,7 @@ /datum/chemical_reaction/sterilizine results = list(/datum/reagent/space_cleaner/sterilizine = 3) - required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/medicine/C2/multiver = 1, /datum/reagent/chlorine = 1) + required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/medicine/c2/multiver = 1, /datum/reagent/chlorine = 1) /datum/chemical_reaction/lube results = list(/datum/reagent/lube = 4) @@ -401,14 +401,14 @@ 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) /datum/chemical_reaction/life - required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/medicine/C2/instabitaluri = 1, /datum/reagent/blood = 1) + required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/medicine/c2/instabitaluri = 1, /datum/reagent/blood = 1) required_temp = 374 /datum/chemical_reaction/life/on_reaction(datum/reagents/holder, created_volume) chemical_mob_spawn(holder, rand(1, round(created_volume, 1)), "Life (hostile)") //defaults to HOSTILE_SPAWN /datum/chemical_reaction/life_friendly - required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/medicine/C2/instabitaluri = 1, /datum/reagent/consumable/sugar = 1) + required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/medicine/c2/instabitaluri = 1, /datum/reagent/consumable/sugar = 1) required_temp = 374 /datum/chemical_reaction/life_friendly/on_reaction(datum/reagents/holder, created_volume) diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index e14b3b620c1..bf78df46c6b 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -116,11 +116,11 @@ required_temp = 550 + rand(-49,49) /datum/chemical_reaction/reagent_explosion/penthrite_explosion_epinephrine - required_reagents = list(/datum/reagent/medicine/C2/penthrite = 1, /datum/reagent/medicine/epinephrine = 1) + required_reagents = list(/datum/reagent/medicine/c2/penthrite = 1, /datum/reagent/medicine/epinephrine = 1) strengthdiv = 5 /datum/chemical_reaction/reagent_explosion/penthrite_explosion_atropine - required_reagents = list(/datum/reagent/medicine/C2/penthrite = 1, /datum/reagent/medicine/atropine = 1) + required_reagents = list(/datum/reagent/medicine/c2/penthrite = 1, /datum/reagent/medicine/atropine = 1) strengthdiv = 5 modifier = 5 @@ -157,7 +157,7 @@ /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) + required_reagents = list(/datum/reagent/saltpetre = 1, /datum/reagent/medicine/c2/multiver = 1, /datum/reagent/sulfur = 1) /datum/chemical_reaction/reagent_explosion/gunpowder_explosion required_reagents = list(/datum/reagent/gunpowder = 1) diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 5cb6352ab1e..f56d193f7bb 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -541,12 +541,12 @@ ..() //Rainbow :o) -/datum/chemical_reaction/slime/slimeRNG +/datum/chemical_reaction/slime/slime_rng required_reagents = list(/datum/reagent/toxin/plasma = 1) required_other = TRUE required_container = /obj/item/slime_extract/rainbow -/datum/chemical_reaction/slime/slimeRNG/on_reaction(datum/reagents/holder, created_volume) +/datum/chemical_reaction/slime/slime_rng/on_reaction(datum/reagents/holder, created_volume) if(created_volume >= 5) var/obj/item/grenade/clusterbuster/slime/S = new (get_turf(holder.my_atom)) S.visible_message("Infused with plasma, the core begins to expand uncontrollably!") diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm index 2f42ed6f4c0..5f9b48bea30 100644 --- a/code/modules/reagents/chemistry/recipes/toxins.dm +++ b/code/modules/reagents/chemistry/recipes/toxins.dm @@ -16,7 +16,7 @@ /datum/chemical_reaction/itching_powder results = list(/datum/reagent/toxin/itching_powder = 3) - required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/ammonia = 1, /datum/reagent/medicine/C2/multiver = 1) + required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/ammonia = 1, /datum/reagent/medicine/c2/multiver = 1) /datum/chemical_reaction/facid results = list(/datum/reagent/toxin/acid/fluacid = 4) @@ -62,7 +62,7 @@ /datum/chemical_reaction/mindbreaker results = list(/datum/reagent/toxin/mindbreaker = 5) - required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/hydrogen = 1, /datum/reagent/medicine/C2/multiver = 1) + required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/hydrogen = 1, /datum/reagent/medicine/c2/multiver = 1) /datum/chemical_reaction/heparin results = list(/datum/reagent/toxin/heparin = 4) diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index fd87ab82d5a..0ff2618f661 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -40,22 +40,22 @@ blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L") return ..() -/obj/item/reagent_containers/blood/APlus +/obj/item/reagent_containers/blood/a_plus blood_type = "A+" -/obj/item/reagent_containers/blood/AMinus +/obj/item/reagent_containers/blood/a_minus blood_type = "A-" -/obj/item/reagent_containers/blood/BPlus +/obj/item/reagent_containers/blood/b_plus blood_type = "B+" -/obj/item/reagent_containers/blood/BMinus +/obj/item/reagent_containers/blood/b_minus blood_type = "B-" -/obj/item/reagent_containers/blood/OPlus +/obj/item/reagent_containers/blood/o_plus blood_type = "O+" -/obj/item/reagent_containers/blood/OMinus +/obj/item/reagent_containers/blood/o_minus blood_type = "O-" /obj/item/reagent_containers/blood/lizard diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index ae8859b5371..7f1cb8d35e9 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -27,7 +27,7 @@ Borg Hypospray var/bypass_protection = 0 //If the hypospray can go through armor or thick material var/list/datum/reagents/reagent_list = list() - var/list/reagent_ids = list(/datum/reagent/medicine/C2/convermol, /datum/reagent/medicine/C2/libital, /datum/reagent/medicine/C2/multiver, /datum/reagent/medicine/C2/aiuri, /datum/reagent/medicine/epinephrine, /datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution) + var/list/reagent_ids = list(/datum/reagent/medicine/c2/convermol, /datum/reagent/medicine/c2/libital, /datum/reagent/medicine/c2/multiver, /datum/reagent/medicine/c2/aiuri, /datum/reagent/medicine/epinephrine, /datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution) var/accepts_reagent_upgrades = TRUE //If upgrades can increase number of reagents dispensed. var/list/modes = list() //Basically the inverse of reagent_ids. Instead of having numbers as "keys" and strings as values it has strings as keys and numbers as values. //Used as list for input() in shakers. @@ -76,7 +76,7 @@ Borg Hypospray /obj/item/reagent_containers/borghypo/proc/del_reagent(datum/reagent/reagent) reagent_ids -= reagent - if(istype(reagent, /datum/reagent/medicine/C2)) + if(istype(reagent, /datum/reagent/medicine/c2)) reagent_names -= C2NAMEREAGENT else reagent_names -= initial(reagent.name) diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 551b2bda733..118e00b28af 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -55,7 +55,7 @@ /obj/item/reagent_containers/glass/bottle/multiver name = "multiver bottle" desc = "A small bottle of multiver, which removes toxins and other chemicals from the bloodstream but causes shortness of breath. All effects scale with the amount of reagents in the patient." - list_reagents = list(/datum/reagent/medicine/C2/multiver = 30) + list_reagents = list(/datum/reagent/medicine/c2/multiver = 30) /obj/item/reagent_containers/glass/bottle/calomel name = "calomel bottle" @@ -65,7 +65,7 @@ /obj/item/reagent_containers/glass/bottle/syriniver name = "syriniver bottle" desc = "A small bottle of syriniver." - list_reagents = list(/datum/reagent/medicine/C2/syriniver = 30) + list_reagents = list(/datum/reagent/medicine/c2/syriniver = 30) /obj/item/reagent_containers/glass/bottle/mutagen name = "unstable mutagen bottle" diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index f9fd8213cf4..b7cd730ed54 100755 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -192,22 +192,22 @@ /obj/item/reagent_containers/glass/beaker/large/libital name = "libital reserve tank (diluted)" - list_reagents = list(/datum/reagent/medicine/C2/libital = 10,/datum/reagent/medicine/granibitaluri = 40) + list_reagents = list(/datum/reagent/medicine/c2/libital = 10,/datum/reagent/medicine/granibitaluri = 40) /obj/item/reagent_containers/glass/beaker/large/aiuri name = "aiuri reserve tank (diluted)" - list_reagents = list(/datum/reagent/medicine/C2/aiuri = 10, /datum/reagent/medicine/granibitaluri = 40) + list_reagents = list(/datum/reagent/medicine/c2/aiuri = 10, /datum/reagent/medicine/granibitaluri = 40) /obj/item/reagent_containers/glass/beaker/large/multiver name = "multiver reserve tank (diluted)" - list_reagents = list(/datum/reagent/medicine/C2/multiver = 10, /datum/reagent/medicine/granibitaluri = 40) + list_reagents = list(/datum/reagent/medicine/c2/multiver = 10, /datum/reagent/medicine/granibitaluri = 40) /obj/item/reagent_containers/glass/beaker/large/epinephrine name = "epinephrine reserve tank (diluted)" list_reagents = list(/datum/reagent/medicine/epinephrine = 50) /obj/item/reagent_containers/glass/beaker/instabitaluri - list_reagents = list(/datum/reagent/medicine/C2/instabitaluri = 50) + list_reagents = list(/datum/reagent/medicine/c2/instabitaluri = 50) /obj/item/reagent_containers/glass/bucket name = "bucket" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 61353a40c63..863540c1647 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -54,7 +54,7 @@ return FALSE -/obj/item/reagent_containers/hypospray/CMO +/obj/item/reagent_containers/hypospray/cmo list_reagents = list(/datum/reagent/medicine/omnizine = 30) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF diff --git a/code/modules/reagents/reagent_containers/medigel.dm b/code/modules/reagents/reagent_containers/medigel.dm index 6371c739a01..78f910aa942 100644 --- a/code/modules/reagents/reagent_containers/medigel.dm +++ b/code/modules/reagents/reagent_containers/medigel.dm @@ -79,21 +79,21 @@ desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap. This one contains libital, for treating cuts and bruises. Libital does minor liver damage. Diluted with granibitaluri." icon_state = "brutegel" current_skin = "brutegel" - list_reagents = list(/datum/reagent/medicine/C2/libital = 24, /datum/reagent/medicine/granibitaluri = 36) + list_reagents = list(/datum/reagent/medicine/c2/libital = 24, /datum/reagent/medicine/granibitaluri = 36) /obj/item/reagent_containers/medigel/aiuri name = "medical gel (aiuri)" desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap. This one contains aiuri, useful for treating burns. Aiuri does minor eye damage. Diluted with granibitaluri." icon_state = "burngel" current_skin = "burngel" - list_reagents = list(/datum/reagent/medicine/C2/aiuri = 24, /datum/reagent/medicine/granibitaluri = 36) + list_reagents = list(/datum/reagent/medicine/c2/aiuri = 24, /datum/reagent/medicine/granibitaluri = 36) /obj/item/reagent_containers/medigel/instabitaluri name = "medical gel (instabitaluri)" desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap. This one contains instabitaluri, a slightly toxic medicine capable of healing both bruises and burns." icon_state = "synthgel" current_skin = "synthgel" - list_reagents = list(/datum/reagent/medicine/C2/instabitaluri = 60) + list_reagents = list(/datum/reagent/medicine/c2/instabitaluri = 60) custom_price = 600 /obj/item/reagent_containers/medigel/sterilizine diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index 85ee9b91ca8..5d710348fc3 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -30,17 +30,17 @@ /obj/item/reagent_containers/pill/patch/libital name = "libital patch (brute)" desc = "A pain reliever. Does minor liver damage. Diluted with Granibitaluri." - list_reagents = list(/datum/reagent/medicine/C2/libital = 2, /datum/reagent/medicine/granibitaluri = 8) //10 iterations + list_reagents = list(/datum/reagent/medicine/c2/libital = 2, /datum/reagent/medicine/granibitaluri = 8) //10 iterations icon_state = "bandaid_brute" /obj/item/reagent_containers/pill/patch/aiuri name = "aiuri patch (burn)" desc = "Helps with burn injuries. Does minor eye damage. Diluted with Granibitaluri." - list_reagents = list(/datum/reagent/medicine/C2/aiuri = 1, /datum/reagent/medicine/granibitaluri = 9) + list_reagents = list(/datum/reagent/medicine/c2/aiuri = 1, /datum/reagent/medicine/granibitaluri = 9) icon_state = "bandaid_burn" /obj/item/reagent_containers/pill/patch/instabitaluri name = "instabitaluri patch" desc = "Helps with brute and burn injuries. Slightly toxic." - list_reagents = list(/datum/reagent/medicine/C2/instabitaluri = 20) + list_reagents = list(/datum/reagent/medicine/c2/instabitaluri = 20) icon_state = "bandaid_both" diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 9ed32a8785a..656f7aec298 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -116,7 +116,7 @@ name = "multiver pill" desc = "Neutralizes many common toxins and scales with unique medicine in the system. Diluted with granibitaluri." icon_state = "pill17" - list_reagents = list(/datum/reagent/medicine/C2/multiver = 5, /datum/reagent/medicine/granibitaluri = 5) + list_reagents = list(/datum/reagent/medicine/c2/multiver = 5, /datum/reagent/medicine/granibitaluri = 5) rename_with_volume = TRUE /obj/item/reagent_containers/pill/epinephrine @@ -262,11 +262,11 @@ list_reagents = list(/datum/reagent/medicine/potass_iodide = 15) rename_with_volume = TRUE -/obj/item/reagent_containers/pill/C2/probital +/obj/item/reagent_containers/pill/probital name = "Probital pill" desc = "Used to treat brute damage of minor and moderate severity.The carving in the pill says 'Eat before ingesting'. Causes fatigue and diluted with granibitaluri." icon_state = "pill12" - list_reagents = list(/datum/reagent/medicine/C2/probital = 5, /datum/reagent/medicine/granibitaluri = 10) + list_reagents = list(/datum/reagent/medicine/c2/probital = 5, /datum/reagent/medicine/granibitaluri = 10) rename_with_volume = TRUE /obj/item/reagent_containers/pill/iron diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 55e95cb4836..95ce4418463 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -410,4 +410,4 @@ name = "medical spray (hercuri)" desc = "A medical spray bottle.This one contains hercuri, a medicine used to negate the effects of dangerous high-temperature environments. Careful not to freeze the patient!" icon_state = "sprayer_large" - list_reagents = list(/datum/reagent/medicine/C2/hercuri = 100) + list_reagents = list(/datum/reagent/medicine/c2/hercuri = 100) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 9144a456c12..aecb1561eea 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -191,12 +191,12 @@ /obj/item/reagent_containers/syringe/multiver name = "syringe (multiver)" desc = "Contains multiver. Diluted with granibitaluri." - list_reagents = list(/datum/reagent/medicine/C2/multiver = 6, /datum/reagent/medicine/granibitaluri = 9) + list_reagents = list(/datum/reagent/medicine/c2/multiver = 6, /datum/reagent/medicine/granibitaluri = 9) /obj/item/reagent_containers/syringe/convermol name = "syringe (convermol)" desc = "Contains convermol. Diluted with granibitaluri." - list_reagents = list(/datum/reagent/medicine/C2/convermol = 6, /datum/reagent/medicine/granibitaluri = 9) + list_reagents = list(/datum/reagent/medicine/c2/convermol = 6, /datum/reagent/medicine/granibitaluri = 9) /obj/item/reagent_containers/syringe/antiviral name = "syringe (spaceacillin)" @@ -279,7 +279,7 @@ /obj/item/reagent_containers/syringe/syriniver name = "syringe (syriniver)" desc = "Contains syriniver, used to treat toxins and purge chemicals.The tag on the syringe states 'Inject one time per minute'" - list_reagents = list(/datum/reagent/medicine/C2/syriniver = 15) + list_reagents = list(/datum/reagent/medicine/c2/syriniver = 15) /obj/item/reagent_containers/syringe/contraband name = "unlabeled syringe" diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index ec40b24d2fc..38e8571b480 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -197,7 +197,7 @@ flush = FALSE /obj/machinery/disposal/proc/newHolderDestination(obj/structure/disposalholder/H) - for(var/obj/item/smallDelivery/O in src) + for(var/obj/item/small_delivery/O in src) H.tomail = TRUE return @@ -436,25 +436,25 @@ //Delivery Chute -/obj/machinery/disposal/deliveryChute +/obj/machinery/disposal/delivery_chute name = "delivery chute" desc = "A chute for big and small packages alike!" density = TRUE icon_state = "intake" pressure_charging = FALSE // the chute doesn't need charging and always works -/obj/machinery/disposal/deliveryChute/Initialize(mapload, obj/structure/disposalconstruct/make_from) +/obj/machinery/disposal/delivery_chute/Initialize(mapload, obj/structure/disposalconstruct/make_from) . = ..() trunk = locate() in loc if(trunk) trunk.linked = src // link the pipe trunk to self -/obj/machinery/disposal/deliveryChute/place_item_in_disposal(obj/item/I, mob/user) +/obj/machinery/disposal/delivery_chute/place_item_in_disposal(obj/item/I, mob/user) if(I.CanEnterDisposals()) ..() flush() -/obj/machinery/disposal/deliveryChute/Bumped(atom/movable/AM) //Go straight into the chute +/obj/machinery/disposal/delivery_chute/Bumped(atom/movable/AM) //Go straight into the chute if(QDELETED(AM) || !AM.CanEnterDisposals()) return switch(dir) @@ -497,5 +497,5 @@ /obj/machinery/disposal/bin/newHolderDestination(obj/structure/disposalholder/H) H.destinationTag = 1 -/obj/machinery/disposal/deliveryChute/newHolderDestination(obj/structure/disposalholder/H) +/obj/machinery/disposal/delivery_chute/newHolderDestination(obj/structure/disposalholder/H) H.destinationTag = 1 diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm index 257fcc43d2a..bc1c6d549e1 100644 --- a/code/modules/recycling/disposal/holder.dm +++ b/code/modules/recycling/disposal/holder.dm @@ -46,14 +46,14 @@ continue SEND_SIGNAL(AM, COMSIG_MOVABLE_DISPOSING, src, D) AM.forceMove(src) - if(istype(AM, /obj/structure/bigDelivery) && !hasmob) - var/obj/structure/bigDelivery/T = AM + if(istype(AM, /obj/structure/big_delivery) && !hasmob) + var/obj/structure/big_delivery/T = AM src.destinationTag = T.sortTag - else if(istype(AM, /obj/item/smallDelivery) && !hasmob) - var/obj/item/smallDelivery/T = AM + else if(istype(AM, /obj/item/small_delivery) && !hasmob) + var/obj/item/small_delivery/T = AM src.destinationTag = T.sortTag else if(istype(AM, /mob/living/silicon/robot)) - var/obj/item/destTagger/borg/tagger = locate() in AM + var/obj/item/dest_tagger/borg/tagger = locate() in AM if (tagger) src.destinationTag = tagger.currTag diff --git a/code/modules/recycling/disposal/pipe_sorting.dm b/code/modules/recycling/disposal/pipe_sorting.dm index 496c420e933..b785f112e99 100644 --- a/code/modules/recycling/disposal/pipe_sorting.dm +++ b/code/modules/recycling/disposal/pipe_sorting.dm @@ -58,8 +58,8 @@ . += "It has no sorting tags set." /obj/structure/disposalpipe/sorting/mail/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/destTagger)) - var/obj/item/destTagger/O = I + if(istype(I, /obj/item/dest_tagger)) + var/obj/item/dest_tagger/O = I if(O.currTag)// Tagger has a tag set if(O.currTag in sortTypes) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 6775a3cb3d2..e4ecdb85431 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -1,4 +1,4 @@ -/obj/structure/bigDelivery +/obj/structure/big_delivery name = "large parcel" desc = "A large delivery parcel." icon = 'icons/obj/storage.dmi' @@ -10,7 +10,7 @@ var/obj/item/paper/note var/obj/item/barcode/sticker -/obj/structure/bigDelivery/interact(mob/user) +/obj/structure/big_delivery/interact(mob/user) to_chat(user, "You start to unwrap the package...") if(!do_after(user, 15, target = user)) return @@ -19,13 +19,13 @@ unwrap_contents() qdel(src) -/obj/structure/bigDelivery/Destroy() +/obj/structure/big_delivery/Destroy() var/turf/T = get_turf(src) for(var/atom/movable/AM in contents) AM.forceMove(T) return ..() -/obj/structure/bigDelivery/contents_explosion(severity, target) +/obj/structure/big_delivery/contents_explosion(severity, target) for(var/atom/movable/AM in contents) switch(severity) if(EXPLODE_DEVASTATE) @@ -35,7 +35,7 @@ if(EXPLODE_LIGHT) SSexplosions.lowobj += AM -/obj/structure/bigDelivery/examine(mob/user) +/obj/structure/big_delivery/examine(mob/user) . = ..() if(note) if(!in_range(user, src)) @@ -46,9 +46,9 @@ if(sticker) . += "There's a barcode attached to the side." -/obj/structure/bigDelivery/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/destTagger)) - var/obj/item/destTagger/O = W +/obj/structure/big_delivery/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/dest_tagger)) + var/obj/item/dest_tagger/O = W if(sortTag != O.currTag) var/tag = uppertext(GLOB.TAGGERLOCATIONS[O.currTag]) @@ -140,7 +140,7 @@ else return ..() -/obj/structure/bigDelivery/relay_container_resist(mob/living/user, obj/O) +/obj/structure/big_delivery/relay_container_resist(mob/living/user, obj/O) if(ismovable(loc)) var/atom/movable/AM = loc //can't unwrap the wrapped container if it's inside something. AM.relay_container_resist(user, O) @@ -159,13 +159,13 @@ if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded. to_chat(user, "You fail to remove [O]'s wrapping!") -/obj/structure/bigDelivery/proc/unwrap_contents() +/obj/structure/big_delivery/proc/unwrap_contents() if(!sticker) return for(var/obj/I in src.GetAllContents()) SEND_SIGNAL(I, COMSIG_STRUCTURE_UNWRAPPED) -/obj/item/smallDelivery +/obj/item/small_delivery name = "parcel" desc = "A brown paper delivery parcel." icon = 'icons/obj/storage.dmi' @@ -176,7 +176,7 @@ var/obj/item/paper/note var/obj/item/barcode/sticker -/obj/item/smallDelivery/contents_explosion(severity, target) +/obj/item/small_delivery/contents_explosion(severity, target) for(var/atom/movable/AM in contents) switch(severity) if(EXPLODE_DEVASTATE) @@ -186,7 +186,7 @@ if(EXPLODE_LIGHT) SSexplosions.lowobj += AM -/obj/item/smallDelivery/attack_self(mob/user) +/obj/item/small_delivery/attack_self(mob/user) to_chat(user, "You start to unwrap the package...") if(!do_after(user, 15, target = user)) return @@ -199,7 +199,7 @@ new /obj/effect/decal/cleanable/wrapping(get_turf(user)) qdel(src) -/obj/item/smallDelivery/attack_self_tk(mob/user) +/obj/item/small_delivery/attack_self_tk(mob/user) if(ismob(loc)) var/mob/M = loc M.temporarilyRemoveItemFromInventory(src, TRUE) @@ -215,7 +215,7 @@ unwrap_contents() qdel(src) -/obj/item/smallDelivery/examine(mob/user) +/obj/item/small_delivery/examine(mob/user) . = ..() if(note) if(!in_range(user, src)) @@ -226,9 +226,9 @@ if(sticker) . += "There's a barcode attached to the side." -/obj/item/smallDelivery/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/destTagger)) - var/obj/item/destTagger/O = W +/obj/item/small_delivery/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/dest_tagger)) + var/obj/item/dest_tagger/O = W if(sortTag != O.currTag) var/tag = uppertext(GLOB.TAGGERLOCATIONS[O.currTag]) @@ -317,13 +317,13 @@ overlaystring = copytext_char(overlaystring, 5) //5 == length("gift") + 1 add_overlay(overlaystring) -/obj/item/smallDelivery/proc/unwrap_contents() +/obj/item/small_delivery/proc/unwrap_contents() if(!sticker) return for(var/obj/I in src.GetAllContents()) SEND_SIGNAL(I, COMSIG_ITEM_UNWRAPPED) -/obj/item/destTagger +/obj/item/dest_tagger name = "destination tagger" desc = "Used to set the destination of properly wrapped packages." icon = 'icons/obj/device.dmi' @@ -337,11 +337,11 @@ flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT -/obj/item/destTagger/borg +/obj/item/dest_tagger/borg name = "cyborg destination tagger" desc = "Used to fool the disposal mail network into thinking that you're a harmless parcel. Does actually work as a regular destination tagger as well." -/obj/item/destTagger/suicide_act(mob/living/user) +/obj/item/dest_tagger/suicide_act(mob/living/user) user.visible_message("[user] begins tagging [user.p_their()] final destination! It looks like [user.p_theyre()] trying to commit suicide!") if (islizard(user)) to_chat(user, "*HELL*")//lizard nerf @@ -350,7 +350,7 @@ playsound(src, 'sound/machines/twobeep_high.ogg', 100, TRUE) return BRUTELOSS -/obj/item/destTagger/proc/openwindow(mob/user) +/obj/item/dest_tagger/proc/openwindow(mob/user) var/dat = "

TagMaster 2.2

" dat += "
Name:[c.name]
Description:[c.description]
Preferred Role:[c.role]
" @@ -365,12 +365,12 @@ user << browse(dat, "window=destTagScreen;size=450x350") onclose(user, "destTagScreen") -/obj/item/destTagger/attack_self(mob/user) +/obj/item/dest_tagger/attack_self(mob/user) if(!locked_destination) openwindow(user) return -/obj/item/destTagger/Topic(href, href_list) +/obj/item/dest_tagger/Topic(href, href_list) add_fingerprint(usr) if(href_list["nextTag"]) var/n = text2num(href_list["nextTag"]) diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm index 8401d618aa0..52e91dd8b29 100644 --- a/code/modules/research/designs/AI_module_designs.dm +++ b/code/modules/research/designs/AI_module_designs.dm @@ -15,7 +15,7 @@ desc = "Allows for the construction of a Safeguard AI Module." id = "safeguard_module" materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/supplied/safeguard + build_path = /obj/item/ai_module/supplied/safeguard category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -24,7 +24,7 @@ desc = "Allows for the construction of a OneHuman AI Module." id = "onehuman_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 6000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/zeroth/oneHuman + build_path = /obj/item/ai_module/zeroth/onehuman category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -33,7 +33,7 @@ desc = "Allows for the construction of a ProtectStation AI Module." id = "protectstation_module" materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/supplied/protectStation + build_path = /obj/item/ai_module/supplied/protect_station category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -42,7 +42,7 @@ desc = "Allows for the construction of a Quarantine AI Module." id = "quarantine_module" materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/supplied/quarantine + build_path = /obj/item/ai_module/supplied/quarantine category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -51,7 +51,7 @@ desc = "Allows for the construction of a Safeguard AI Module." id = "oxygen_module" materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/supplied/oxygen + build_path = /obj/item/ai_module/supplied/oxygen category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -60,7 +60,7 @@ desc = "Allows for the construction of a Freeform AI Module." id = "freeform_module" materials = list(/datum/material/glass = 1000, /datum/material/gold = 10000, /datum/material/bluespace = 2000)//Custom inputs should be more expensive to get - build_path = /obj/item/aiModule/supplied/freeform + build_path = /obj/item/ai_module/supplied/freeform category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -69,7 +69,7 @@ desc = "Allows for the construction of a Reset AI Module." id = "reset_module" materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000) - build_path = /obj/item/aiModule/reset + build_path = /obj/item/ai_module/reset category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -78,7 +78,7 @@ desc = "Allows for the construction of a Purge AI Module." id = "purge_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/reset/purge + build_path = /obj/item/ai_module/reset/purge category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -87,7 +87,7 @@ desc = "Allows for the construction of a Law Removal AI Core Module." id = "remove_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/remove + build_path = /obj/item/ai_module/remove category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -96,7 +96,7 @@ desc = "Allows for the construction of a Freeform AI Core Module." id = "freeformcore_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 10000, /datum/material/bluespace = 2000)//Ditto - build_path = /obj/item/aiModule/core/freeformcore + build_path = /obj/item/ai_module/core/freeformcore category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -105,7 +105,7 @@ desc = "Allows for the construction of an Asimov AI Core Module." id = "asimov_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/core/full/asimov + build_path = /obj/item/ai_module/core/full/asimov category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -115,7 +115,7 @@ id = "paladin_module" build_type = IMPRINTER materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/core/full/paladin + build_path = /obj/item/ai_module/core/full/paladin category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -124,7 +124,7 @@ desc = "Allows for the construction of a T.Y.R.A.N.T. AI Module." id = "tyrant_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/core/full/tyrant + build_path = /obj/item/ai_module/core/full/tyrant category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -133,7 +133,7 @@ desc = "Allows for the construction of an Overlord AI Module." id = "overlord_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/core/full/overlord + build_path = /obj/item/ai_module/core/full/overlord category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -142,7 +142,7 @@ desc = "Allows for the construction of a Corporate AI Core Module." id = "corporate_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/core/full/corp + build_path = /obj/item/ai_module/core/full/corp category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -151,6 +151,6 @@ desc = "Allows for the construction of a Default AI Core Module." id = "default_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) - build_path = /obj/item/aiModule/core/full/custom + build_path = /obj/item/ai_module/core/full/custom category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 347334a1655..172c93d5012 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -904,7 +904,7 @@ id = "desttagger" build_type = AUTOLATHE | PROTOLATHE materials = list(/datum/material/iron = 250, /datum/material/glass = 125) - build_path = /obj/item/destTagger + build_path = /obj/item/dest_tagger category = list("initial", "Electronics") /datum/design/salestagger @@ -999,12 +999,12 @@ build_path = /obj/item/stock_parts/cell/emergency_light category = list("initial", "Electronics") -/datum/design/packageWrap +/datum/design/package_wrap name = "Package Wrapping" id = "packagewrap" build_type = AUTOLATHE | PROTOLATHE materials = list(/datum/material/iron = 200, /datum/material/glass = 200) - build_path = /obj/item/stack/packageWrap + build_path = /obj/item/stack/package_wrap category = list("initial", "Misc", "Equipment") maxstack = 30 diff --git a/code/modules/research/designs/computer_part_designs.dm b/code/modules/research/designs/computer_part_designs.dm index 683fd8b61ec..2ab49fcc4ee 100644 --- a/code/modules/research/designs/computer_part_designs.dm +++ b/code/modules/research/designs/computer_part_designs.dm @@ -143,12 +143,12 @@ departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING // APC Link -/datum/design/APClink +/datum/design/apc_link name = "Area Power Connector" id = "APClink" build_type = PROTOLATHE materials = list(/datum/material/iron = 2000) - build_path = /obj/item/computer_hardware/recharger/APC + build_path = /obj/item/computer_hardware/recharger/apc_recharger category = list("Computer Parts") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm index 798e934875c..4064592cea2 100644 --- a/code/modules/research/designs/limbgrower_designs.dm +++ b/code/modules/research/designs/limbgrower_designs.dm @@ -6,7 +6,7 @@ name = "Left Arm" id = "leftarm" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 25) + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 25) build_path = /obj/item/bodypart/l_arm category = list("initial","human","lizard","moth","plasmaman","ethereal") @@ -14,7 +14,7 @@ name = "Right Arm" id = "rightarm" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 25) + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 25) build_path = /obj/item/bodypart/r_arm category = list("initial","human","lizard","moth","plasmaman","ethereal") @@ -22,7 +22,7 @@ name = "Left Leg" id = "leftleg" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 25) + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 25) build_path = /obj/item/bodypart/l_leg category = list("initial","human","lizard","moth","plasmaman","ethereal") @@ -30,7 +30,7 @@ name = "Right Leg" id = "rightleg" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 25) + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 25) build_path = /obj/item/bodypart/r_leg category = list("initial","human","lizard","moth","plasmaman","ethereal") @@ -40,7 +40,7 @@ name = "Arm Blade" id = "armblade" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 75) + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 75) build_path = /obj/item/melee/synthetic_arm_blade category = list("other","emagged") @@ -48,7 +48,7 @@ name = "Heart" id = "heart" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 30) + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 30) build_path = /obj/item/organ/heart category = list("other") @@ -56,7 +56,7 @@ name = "Lungs" id = "lungs" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 20) + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 20) build_path = /obj/item/organ/lungs category = list("other") @@ -64,7 +64,7 @@ name = "Liver" id = "liver" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 20) + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 20) build_path = /obj/item/organ/liver category = list("other") @@ -72,7 +72,7 @@ name = "Stomach" id = "stomach" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 15) + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 15) build_path = /obj/item/organ/stomach category = list("other") @@ -80,7 +80,7 @@ name = "Appendix" id = "appendix" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 5) //why would you need this + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 5) //why would you need this build_path = /obj/item/organ/appendix category = list("other") @@ -88,7 +88,7 @@ name = "Eyes" id = "eyes" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 10) + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 10) build_path = /obj/item/organ/eyes category = list("other") @@ -96,7 +96,7 @@ name = "Ears" id = "ears" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 10) + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 10) build_path = /obj/item/organ/ears category = list("other") @@ -104,6 +104,6 @@ name = "Tongue" id = "tongue" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 10) + reagents_list = list(/datum/reagent/medicine/c2/instabitaluri = 10) build_path = /obj/item/organ/tongue category = list("other") diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index eb69e099ced..ad9c51e8b14 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -2,7 +2,7 @@ /////////////Stock Parts//////////////// //////////////////////////////////////// -/datum/design/RPED +/datum/design/rped name = "Rapid Part Exchange Device" desc = "Special mechanical module made to store, sort, and apply standard machine parts." id = "rped" @@ -12,7 +12,7 @@ category = list("Stock Parts") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE -/datum/design/BS_RPED +/datum/design/bs_rped name = "Bluespace RPED" desc = "Powered by bluespace technology, this RPED variant can upgrade buildings from a distance, without needing to remove the panel first." id = "bs_rped" diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 295ad11a26c..e8809ac5ef9 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -72,8 +72,8 @@ /obj/machinery/rnd/experimentor/Initialize() . = ..() - trackedIan = locate(/mob/living/simple_animal/pet/dog/corgi/Ian) in GLOB.mob_living_list - trackedRuntime = locate(/mob/living/simple_animal/pet/cat/Runtime) in GLOB.mob_living_list + trackedIan = locate(/mob/living/simple_animal/pet/dog/corgi/ian) in GLOB.mob_living_list + trackedRuntime = locate(/mob/living/simple_animal/pet/cat/runtime) in GLOB.mob_living_list SetTypeReactions() critical_items_typecache = typecacheof(list( diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 606fbc7eb35..6e1ad816034 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -430,7 +430,7 @@ design_ids = list("s-receiver", "s-bus", "s-broadcaster", "s-processor", "s-hub", "s-server", "s-relay", "comm_monitor", "comm_server", "s-ansible", "s-filter", "s-amplifier", "ntnet_relay", "s-treatment", "s-analyzer", "s-crystal", "s-transmitter", "s-messaging") -/datum/techweb_node/integrated_HUDs +/datum/techweb_node/integrated_hud id = "integrated_HUDs" display_name = "Integrated HUDs" description = "The usefulness of computerized records, projected straight onto your eyepiece!" @@ -439,7 +439,7 @@ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500) export_price = 5000 -/datum/techweb_node/NVGtech +/datum/techweb_node/nvg_tech id = "NVGtech" display_name = "Night Vision Technology" description = "Allows seeing in the dark without actual light!" @@ -1089,7 +1089,7 @@ hidden = TRUE experimental = TRUE -/datum/techweb_node/Mauna_Mug +/datum/techweb_node/mauna_mug id = "mauna_mug" display_name = "Mauna Mug" description = "A bored scientist was thinking to himself for very long...and then realized his coffee got cold! He made this invention to solve this extreme problem." diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index e893c7cc8b5..040ae194108 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -1,16 +1,16 @@ //Xenobio control console -/mob/camera/aiEye/remote/xenobio +/mob/camera/ai_eye/remote/xenobio visible_icon = TRUE icon = 'icons/mob/cameramob.dmi' icon_state = "generic_camera" var/allowed_area = null -/mob/camera/aiEye/remote/xenobio/Initialize() +/mob/camera/ai_eye/remote/xenobio/Initialize() var/area/A = get_area(loc) allowed_area = A.name . = ..() -/mob/camera/aiEye/remote/xenobio/setLoc(var/t) +/mob/camera/ai_eye/remote/xenobio/setLoc(var/t) var/area/new_area = get_area(t) if(new_area && new_area.name == allowed_area || new_area && new_area.xenobiology_compatible) return ..() @@ -75,7 +75,7 @@ return ..() /obj/machinery/computer/camera_advanced/xenobio/CreateEye() - eyeobj = new /mob/camera/aiEye/remote/xenobio(get_turf(src)) + eyeobj = new /mob/camera/ai_eye/remote/xenobio(get_turf(src)) eyeobj.origin = src eyeobj.visible_icon = TRUE eyeobj.icon = 'icons/mob/cameramob.dmi' @@ -210,7 +210,7 @@ if(!target || !isliving(owner)) return var/mob/living/C = owner - var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/xenobio/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = target if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) @@ -230,7 +230,7 @@ if(!target || !isliving(owner)) return var/mob/living/C = owner - var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/xenobio/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = target if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) @@ -256,7 +256,7 @@ if(!target || !isliving(owner)) return var/mob/living/C = owner - var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/xenobio/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = target if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) @@ -282,7 +282,7 @@ if(!target || !isliving(owner)) return var/mob/living/C = owner - var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/xenobio/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = target var/obj/machinery/monkey_recycler/recycler = X.connected_recycler @@ -310,7 +310,7 @@ if(!target || !isliving(owner)) return var/mob/living/C = owner - var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/xenobio/remote_eye = C.remote_control if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) for(var/mob/living/simple_animal/slime/S in remote_eye.loc) @@ -328,7 +328,7 @@ return var/mob/living/C = owner - var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/xenobio/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = target if(QDELETED(X.current_potion)) @@ -395,7 +395,7 @@ to_chat(user, "Target is not near a camera. Cannot proceed.") return var/mob/living/C = user - var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control var/area/mobarea = get_area(S.loc) if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) slime_scan(S, C) @@ -406,7 +406,7 @@ to_chat(user, "Target is not near a camera. Cannot proceed.") return var/mob/living/C = user - var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin var/area/mobarea = get_area(S.loc) if(QDELETED(X.current_potion)) @@ -421,7 +421,7 @@ to_chat(user, "Target is not near a camera. Cannot proceed.") return var/mob/living/C = user - var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin var/area/mobarea = get_area(S.loc) if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) @@ -443,7 +443,7 @@ to_chat(user, "Target is not near a camera. Cannot proceed.") return var/mob/living/C = user - var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin var/area/turfarea = get_area(T) if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible) @@ -458,7 +458,7 @@ to_chat(user, "Target is not near a camera. Cannot proceed.") return var/mob/living/C = user - var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin var/area/turfarea = get_area(T) if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible) @@ -478,7 +478,7 @@ to_chat(user, "Target is not near a camera. Cannot proceed.") return var/mob/living/C = user - var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin var/area/mobarea = get_area(M.loc) if(!X.connected_recycler) diff --git a/code/modules/ruins/spaceruin_code/crashedship.dm b/code/modules/ruins/spaceruin_code/crashedship.dm index e1251091682..bdb853f37f5 100644 --- a/code/modules/ruins/spaceruin_code/crashedship.dm +++ b/code/modules/ruins/spaceruin_code/crashedship.dm @@ -2,22 +2,22 @@ //Areas -/area/awaymission/BMPship +/area/awaymission/bmpship name = "BMP Asteroids" icon_state = "away" -/area/awaymission/BMPship/Aft +/area/awaymission/bmpship/aft name = "Aft Block" icon_state = "away1" requires_power = TRUE -/area/awaymission/BMPship/Midship +/area/awaymission/bmpship/midship name = "Midship Block" icon_state = "away2" requires_power = TRUE -/area/awaymission/BMPship/Fore +/area/awaymission/bmpship/fore name = "Fore Block" icon_state = "away3" requires_power = TRUE diff --git a/code/modules/ruins/spaceruin_code/forgottenship.dm b/code/modules/ruins/spaceruin_code/forgottenship.dm index ab6dfa011b1..2dd4043b244 100644 --- a/code/modules/ruins/spaceruin_code/forgottenship.dm +++ b/code/modules/ruins/spaceruin_code/forgottenship.dm @@ -94,7 +94,7 @@ GLOBAL_VAR_INIT(fscpassword, generate_password()) /////////// AI Laws -/obj/item/aiModule/core/full/cybersun +/obj/item/ai_module/core/full/cybersun name = "'Cybersun' Core AI Module" law_id = "cybersun" diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index f2dbf8478a7..29baeae306f 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -282,22 +282,22 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) to_chat(user, "You peak through the door's bluespace peephole...") user.reset_perspective(parentSphere) user.set_machine(src) - var/datum/action/peepholeCancel/PHC = new + var/datum/action/peephole_cancel/PHC = new user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1) PHC.Grant(user) /turf/closed/indestructible/hoteldoor/check_eye(mob/user) if(get_dist(get_turf(src), get_turf(user)) >= 2) user.unset_machine() - for(var/datum/action/peepholeCancel/PHC in user.actions) + for(var/datum/action/peephole_cancel/PHC in user.actions) PHC.Trigger() -/datum/action/peepholeCancel +/datum/action/peephole_cancel name = "Cancel View" desc = "Stop looking through the bluespace peephole." button_icon_state = "cancel_peephole" -/datum/action/peepholeCancel/Trigger() +/datum/action/peephole_cancel/Trigger() . = ..() to_chat(owner, "You move away from the peephole.") owner.reset_perspective() diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 44e5b8aca56..198a31bade4 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -283,7 +283,7 @@ set waitfor = FALSE if(!SSdbcore.Connect()) return - var/datum/DBQuery/query_round_shuttle_name = SSdbcore.NewQuery({" + var/datum/db_query/query_round_shuttle_name = SSdbcore.NewQuery({" UPDATE [format_table_name("round")] SET shuttle_name = :name WHERE id = :round_id "}, list("name" = name, "round_id" = GLOB.round_id)) query_round_shuttle_name.Execute() diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm index 459c2ea8011..1a46e5be9be 100644 --- a/code/modules/shuttle/navigation_computer.dm +++ b/code/modules/shuttle/navigation_computer.dm @@ -66,8 +66,8 @@ shuttle_port = null return - eyeobj = new /mob/camera/aiEye/remote/shuttle_docker(null, src) - var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj + eyeobj = new /mob/camera/ai_eye/remote/shuttle_docker(null, src) + var/mob/camera/ai_eye/remote/shuttle_docker/the_eye = eyeobj the_eye.setDir(shuttle_port.dir) var/turf/origin = locate(shuttle_port.x + x_offset, shuttle_port.y + y_offset, shuttle_port.z) for(var/V in shuttle_port.shuttle_areas) @@ -87,7 +87,7 @@ /obj/machinery/computer/camera_advanced/shuttle_docker/give_eye_control(mob/user) ..() if(!QDELETED(user) && user.client) - var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj + var/mob/camera/ai_eye/remote/shuttle_docker/the_eye = eyeobj var/list/to_add = list() to_add += the_eye.placement_images to_add += the_eye.placed_images @@ -100,7 +100,7 @@ /obj/machinery/computer/camera_advanced/shuttle_docker/remove_eye_control(mob/living/user) ..() if(!QDELETED(user) && user.client) - var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj + var/mob/camera/ai_eye/remote/shuttle_docker/the_eye = eyeobj var/list/to_remove = list() to_remove += the_eye.placement_images to_remove += the_eye.placed_images @@ -114,7 +114,7 @@ if(designating_target_loc || !current_user) return - var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj + var/mob/camera/ai_eye/remote/shuttle_docker/the_eye = eyeobj var/landing_clear = checkLandingSpot() if(designate_time && (landing_clear != SHUTTLE_DOCKER_BLOCKED)) to_chat(current_user, "Targeting transit location, please wait [DisplayTimeText(designate_time)]...") @@ -180,7 +180,7 @@ return TRUE /obj/machinery/computer/camera_advanced/shuttle_docker/proc/rotateLandingSpot() - var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj + var/mob/camera/ai_eye/remote/shuttle_docker/the_eye = eyeobj var/list/image_cache = the_eye.placement_images the_eye.setDir(turn(the_eye.dir, -90)) for(var/i in 1 to image_cache.len) @@ -196,7 +196,7 @@ checkLandingSpot() /obj/machinery/computer/camera_advanced/shuttle_docker/proc/checkLandingSpot() - var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj + var/mob/camera/ai_eye/remote/shuttle_docker/the_eye = eyeobj var/turf/eyeturf = get_turf(the_eye) if(!eyeturf) return SHUTTLE_DOCKER_BLOCKED @@ -270,22 +270,22 @@ if(dock) jumpto_ports[dock.id] = TRUE -/mob/camera/aiEye/remote/shuttle_docker +/mob/camera/ai_eye/remote/shuttle_docker visible_icon = FALSE use_static = USE_STATIC_NONE var/list/placement_images = list() var/list/placed_images = list() -/mob/camera/aiEye/remote/shuttle_docker/Initialize(mapload, obj/machinery/computer/camera_advanced/origin) +/mob/camera/ai_eye/remote/shuttle_docker/Initialize(mapload, obj/machinery/computer/camera_advanced/origin) src.origin = origin return ..() -/mob/camera/aiEye/remote/shuttle_docker/setLoc(T) +/mob/camera/ai_eye/remote/shuttle_docker/setLoc(T) ..() var/obj/machinery/computer/camera_advanced/shuttle_docker/console = origin console.checkLandingSpot() -/mob/camera/aiEye/remote/shuttle_docker/update_remote_sight(mob/living/user) +/mob/camera/ai_eye/remote/shuttle_docker/update_remote_sight(mob/living/user) user.sight = BLIND|SEE_TURFS user.lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE user.sync_lighting_plane_alpha() @@ -300,7 +300,7 @@ if(QDELETED(target) || !isliving(target)) return var/mob/living/C = target - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/shuttle_docker/origin = remote_eye.origin origin.rotateLandingSpot() @@ -313,7 +313,7 @@ if(QDELETED(target) || !isliving(target)) return var/mob/living/C = target - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/shuttle_docker/origin = remote_eye.origin origin.placeLandingSpot(target) @@ -325,7 +325,7 @@ if(QDELETED(target) || !isliving(target)) return var/mob/living/C = target - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/ai_eye/remote/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/shuttle_docker/console = remote_eye.origin playsound(console, 'sound/machines/terminal_prompt_deny.ogg', 25, FALSE) diff --git a/code/modules/spells/spell_types/conjure.dm b/code/modules/spells/spell_types/conjure.dm index a4bff8fa452..d4391096fc3 100644 --- a/code/modules/spells/spell_types/conjure.dm +++ b/code/modules/spells/spell_types/conjure.dm @@ -47,7 +47,7 @@ /obj/effect/proc_holder/spell/aoe_turf/conjure/proc/post_summon(atom/summoned_object, mob/user) return -/obj/effect/proc_holder/spell/aoe_turf/conjure/summonEdSwarm //test purposes - Also a lot of fun +/obj/effect/proc_holder/spell/aoe_turf/conjure/summon_ed_swarm //test purposes - Also a lot of fun name = "Dispense Wizard Justice" desc = "This spell dispenses wizard justice." summon_type = list(/mob/living/simple_animal/bot/secbot/ed209) @@ -55,7 +55,7 @@ range = 3 newVars = list("emagged" = 2, "remote_disabled" = 1,"shoot_sound" = 'sound/weapons/laser.ogg',"projectile" = /obj/projectile/beam/laser, "declare_arrests" = 0,"name" = "Wizard's Justicebot") -/obj/effect/proc_holder/spell/aoe_turf/conjure/linkWorlds +/obj/effect/proc_holder/spell/aoe_turf/conjure/link_worlds name = "Link Worlds" desc = "A whole new dimension for you to play with! They won't be happy about it, though." invocation = "WTF" diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm index ab2df4a5559..4781247f713 100644 --- a/code/modules/surgery/advanced/brainwashing.dm +++ b/code/modules/surgery/advanced/brainwashing.dm @@ -27,7 +27,7 @@ /datum/surgery_step/brainwash name = "brainwash" - implements = list(TOOL_HEMOSTAT = 85, TOOL_WIRECUTTER = 50, /obj/item/stack/packageWrap = 35, /obj/item/stack/cable_coil = 15) + implements = list(TOOL_HEMOSTAT = 85, TOOL_WIRECUTTER = 50, /obj/item/stack/package_wrap = 35, /obj/item/stack/cable_coil = 15) time = 200 experience_given = MEDICAL_SKILL_ADVANCED var/objective diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm index 492620ad92a..66843c2a3c0 100644 --- a/code/modules/surgery/coronary_bypass.dm +++ b/code/modules/surgery/coronary_bypass.dm @@ -50,7 +50,7 @@ //grafts a coronary bypass onto the individual's heart, success chance is 90% base again /datum/surgery_step/coronary_bypass name = "graft coronary bypass" - implements = list(TOOL_HEMOSTAT = 90, TOOL_WIRECUTTER = 35, /obj/item/stack/packageWrap = 15, /obj/item/stack/cable_coil = 5) + implements = list(TOOL_HEMOSTAT = 90, TOOL_WIRECUTTER = 35, /obj/item/stack/package_wrap = 15, /obj/item/stack/cable_coil = 5) time = 90 experience_given = MEDICAL_SKILL_ORGAN_FIX diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm index 1aa82c36832..783a62ca46d 100644 --- a/code/modules/surgery/organic_steps.dm +++ b/code/modules/surgery/organic_steps.dm @@ -44,7 +44,7 @@ //clamp bleeders /datum/surgery_step/clamp_bleeders name = "clamp bleeders" - implements = list(TOOL_HEMOSTAT = 100, TOOL_WIRECUTTER = 60, /obj/item/stack/packageWrap = 35, /obj/item/stack/cable_coil = 15) + implements = list(TOOL_HEMOSTAT = 100, TOOL_WIRECUTTER = 60, /obj/item/stack/package_wrap = 35, /obj/item/stack/cable_coil = 15) time = 24 /datum/surgery_step/clamp_bleeders/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 1b2cda9376f..479917831b5 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -135,12 +135,12 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) category = "Discounts" //All bundles and telecrystals -/datum/uplink_item/bundles_TC +/datum/uplink_item/bundles_tc category = "Bundles" surplus = 0 cant_discount = TRUE -/datum/uplink_item/bundles_TC/chemical +/datum/uplink_item/bundles_tc/chemical name = "Bioterror bundle" desc = "For the madman: Contains a handheld Bioterror chem sprayer, a Bioterror foam grenade, a box of lethal chemicals, a dart pistol, \ box of syringes, Donksoft assault rifle, and some riot darts. Remember: Seal suit and equip internals before use." @@ -148,7 +148,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 30 // normally 42 include_modes = list(/datum/game_mode/nuclear) -/datum/uplink_item/bundles_TC/bulldog +/datum/uplink_item/bundles_tc/bulldog name = "Bulldog bundle" desc = "Lean and mean: Optimized for people that want to get up close and personal. Contains the popular \ Bulldog shotgun, two 12g buckshot drums, and a pair of Thermal imaging goggles." @@ -156,21 +156,21 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 13 // normally 16 include_modes = list(/datum/game_mode/nuclear) -/datum/uplink_item/bundles_TC/c20r +/datum/uplink_item/bundles_tc/c20r name = "C-20r bundle" desc = "Old Faithful: The classic C-20r, bundled with two magazines and a (surplus) suppressor at discount price." item = /obj/item/storage/backpack/duffelbag/syndie/c20rbundle cost = 14 // normally 16 include_modes = list(/datum/game_mode/nuclear) -/datum/uplink_item/bundles_TC/cyber_implants +/datum/uplink_item/bundles_tc/cyber_implants name = "Cybernetic Implants Bundle" desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. Comes with an autosurgeon." item = /obj/item/storage/box/cyber_implants cost = 40 include_modes = list(/datum/game_mode/nuclear) -/datum/uplink_item/bundles_TC/medical +/datum/uplink_item/bundles_tc/medical name = "Medical bundle" desc = "The support specialist: Aid your fellow operatives with this medical bundle. Contains a tactical medkit, \ a Donksoft LMG, a box of riot darts and a pair of magboots to rescue your friends in no-gravity environments." @@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 15 // normally 20 include_modes = list(/datum/game_mode/nuclear) -/datum/uplink_item/bundles_TC/sniper +/datum/uplink_item/bundles_tc/sniper name = "Sniper bundle" desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, \ two soporific knockout magazines, a free surplus suppressor, and a sharp-looking tactical turtleneck suit. \ @@ -187,7 +187,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 20 // normally 26 include_modes = list(/datum/game_mode/nuclear) -/datum/uplink_item/bundles_TC/firestarter +/datum/uplink_item/bundles_tc/firestarter name = "Spetsnaz Pyro bundle" desc = "For systematic suppression of carbon lifeforms in close quarters: Contains a lethal New Russian backpack spray, Elite hardsuit, \ Stechkin APS machine pistol, two incendiary magazines, a minibomb and a stimulant syringe. \ @@ -196,7 +196,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 30 include_modes = list(/datum/game_mode/nuclear) -/datum/uplink_item/bundles_TC/contract_kit +/datum/uplink_item/bundles_tc/contract_kit name = "Contract Kit" desc = "The Syndicate have offered you the chance to become a contractor, take on kidnapping contracts for TC and cash payouts. Upon purchase, \ you'll be granted your own contract uplink embedded within the supplied tablet computer. Additionally, you'll be granted \ @@ -207,24 +207,24 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) player_minimum = 20 exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) -/datum/uplink_item/bundles_TC/bundle_A +/datum/uplink_item/bundles_tc/bundle_a name = "Syndi-kit Tactical" desc = "Syndicate Bundles, also known as Syndi-Kits, are specialized groups of items that arrive in a plain box. \ These items are collectively worth more than 20 telecrystals, but you do not know which specialization \ you will receive. May contain discontinued and/or exotic items." - item = /obj/item/storage/box/syndicate/bundle_A + item = /obj/item/storage/box/syndicate/bundle_a cost = 20 exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) -/datum/uplink_item/bundles_TC/bundle_B +/datum/uplink_item/bundles_tc/bundle_b name = "Syndi-kit Special" desc = "Syndicate Bundles, also known as Syndi-Kits, are specialized groups of items that arrive in a plain box. \ In Syndi-kit Special, you will receive items used by famous syndicate agents of the past. Collectively worth more than 20 telecrystals, the syndicate loves a good throwback." - item = /obj/item/storage/box/syndicate/bundle_B + item = /obj/item/storage/box/syndicate/bundle_b cost = 20 exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) -/datum/uplink_item/bundles_TC/surplus +/datum/uplink_item/bundles_tc/surplus name = "Syndicate Surplus Crate" desc = "A dusty crate from the back of the Syndicate warehouse. Rumored to contain a valuable assortment of items, \ but you never know. Contents are sorted to always be worth 50 TC." @@ -234,7 +234,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) var/starting_crate_value = 50 -/datum/uplink_item/bundles_TC/surplus/super +/datum/uplink_item/bundles_tc/surplus/super name = "Super Surplus Crate" desc = "A dusty SUPER-SIZED from the back of the Syndicate warehouse. Rumored to contain a valuable assortment of items, \ but you never know. Contents are sorted to always be worth 125 TC." @@ -242,7 +242,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) player_minimum = 40 starting_crate_value = 125 -/datum/uplink_item/bundles_TC/surplus/purchase(mob/user, datum/component/uplink/U) +/datum/uplink_item/bundles_tc/surplus/purchase(mob/user, datum/component/uplink/U) var/list/uplink_items = get_uplink_items(SSticker && SSticker.mode? SSticker.mode : null, FALSE) var/crate_value = starting_crate_value @@ -264,13 +264,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) U.purchase_log.LogPurchase(goods, I, 0) return C -/datum/uplink_item/bundles_TC/random +/datum/uplink_item/bundles_tc/random name = "Random Item" desc = "Picking this will purchase a random item. Useful if you have some TC to spare or if you haven't decided on a strategy yet." item = /obj/effect/gibspawner/generic // non-tangible item because techwebs use this path to determine illegal tech cost = 0 -/datum/uplink_item/bundles_TC/random/purchase(mob/user, datum/component/uplink/U) +/datum/uplink_item/bundles_tc/random/purchase(mob/user, datum/component/uplink/U) var/list/uplink_items = U.uplink_items var/list/possible_items = list() for(var/category in uplink_items) @@ -289,7 +289,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) SSblackbox.record_feedback("tally", "traitor_random_uplink_items_gotten", 1, initial(I.name)) U.MakePurchase(user, I) -/datum/uplink_item/bundles_TC/telecrystal +/datum/uplink_item/bundles_tc/telecrystal name = "1 Raw Telecrystal" desc = "A telecrystal in its rawest and purest form; can be utilized on active uplinks to increase their telecrystal count." item = /obj/item/stack/telecrystal @@ -298,13 +298,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) // it's just used to buy more items (including itself!) purchase_log_vis = FALSE -/datum/uplink_item/bundles_TC/telecrystal/five +/datum/uplink_item/bundles_tc/telecrystal/five name = "5 Raw Telecrystals" desc = "Five telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count." item = /obj/item/stack/telecrystal/five cost = 5 -/datum/uplink_item/bundles_TC/telecrystal/twenty +/datum/uplink_item/bundles_tc/telecrystal/twenty name = "20 Raw Telecrystals" desc = "Twenty telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count." item = /obj/item/stack/telecrystal/twenty @@ -1448,7 +1448,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) name = "Hacked AI Law Upload Module" desc = "When used with an upload console, this module allows you to upload priority laws to an artificial intelligence. \ Be careful with wording, as artificial intelligences may look for loopholes to exploit." - item = /obj/item/aiModule/syndicate + item = /obj/item/ai_module/syndicate cost = 9 /datum/uplink_item/device_tools/hypnotic_flash diff --git a/code/modules/vehicles/cars/car.dm b/code/modules/vehicles/cars/car.dm index 8ad1dbf1fb1..10fec0e1266 100644 --- a/code/modules/vehicles/cars/car.dm +++ b/code/modules/vehicles/cars/car.dm @@ -18,7 +18,7 @@ . = ..() initialize_controller_action_type(/datum/action/vehicle/sealed/remove_key, VEHICLE_CONTROL_DRIVE) if(car_traits & CAN_KIDNAP) - initialize_controller_action_type(/datum/action/vehicle/sealed/DumpKidnappedMobs, VEHICLE_CONTROL_DRIVE) + initialize_controller_action_type(/datum/action/vehicle/sealed/dump_kidnapped_mobs, VEHICLE_CONTROL_DRIVE) /obj/vehicle/sealed/car/driver_move(mob/user, direction) if(key_type && !is_key(inserted_key)) diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 136258fe9c0..ad25600d90e 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -20,7 +20,7 @@ /obj/vehicle/sealed/car/clowncar/generate_actions() . = ..() initialize_controller_action_type(/datum/action/vehicle/sealed/horn/clowncar, VEHICLE_CONTROL_DRIVE) - initialize_controller_action_type(/datum/action/vehicle/sealed/Thank, VEHICLE_CONTROL_KIDNAPPED) + initialize_controller_action_type(/datum/action/vehicle/sealed/thank, VEHICLE_CONTROL_KIDNAPPED) /obj/vehicle/sealed/car/clowncar/auto_assign_occupant_flags(mob/M) if(ishuman(M)) @@ -90,8 +90,8 @@ return obj_flags |= EMAGGED to_chat(user, "You scramble \the [src]'s child safety lock, and a panel with six colorful buttons appears!") - initialize_controller_action_type(/datum/action/vehicle/sealed/RollTheDice, VEHICLE_CONTROL_DRIVE) - initialize_controller_action_type(/datum/action/vehicle/sealed/Cannon, VEHICLE_CONTROL_DRIVE) + initialize_controller_action_type(/datum/action/vehicle/sealed/roll_the_dice, VEHICLE_CONTROL_DRIVE) + initialize_controller_action_type(/datum/action/vehicle/sealed/cannon, VEHICLE_CONTROL_DRIVE) AddElement(/datum/element/waddling) /obj/vehicle/sealed/car/clowncar/Destroy() diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm index 0a921789363..cf6fa70686d 100644 --- a/code/modules/vehicles/vehicle_actions.dm +++ b/code/modules/vehicles/vehicle_actions.dm @@ -145,45 +145,45 @@ else playsound(vehicle_entered_target, hornsound, 75) -/datum/action/vehicle/sealed/DumpKidnappedMobs +/datum/action/vehicle/sealed/dump_kidnapped_mobs name = "Dump Kidnapped Mobs" desc = "Dump all objects and people in your car on the floor." button_icon_state = "car_dump" -/datum/action/vehicle/sealed/DumpKidnappedMobs/Trigger() +/datum/action/vehicle/sealed/dump_kidnapped_mobs/Trigger() vehicle_entered_target.visible_message("[vehicle_entered_target] starts dumping the people inside of it.") vehicle_entered_target.DumpSpecificMobs(VEHICLE_CONTROL_KIDNAPPED) -/datum/action/vehicle/sealed/RollTheDice +/datum/action/vehicle/sealed/roll_the_dice name = "Press Colorful Button" desc = "Press one of those colorful buttons on your display panel!" button_icon_state = "car_rtd" -/datum/action/vehicle/sealed/RollTheDice/Trigger() +/datum/action/vehicle/sealed/roll_the_dice/Trigger() if(istype(vehicle_entered_target, /obj/vehicle/sealed/car/clowncar)) var/obj/vehicle/sealed/car/clowncar/C = vehicle_entered_target C.RollTheDice(owner) -/datum/action/vehicle/sealed/Cannon +/datum/action/vehicle/sealed/cannon name = "Toggle Siege Mode" desc = "Destroy them with their own fodder!" button_icon_state = "car_cannon" -/datum/action/vehicle/sealed/Cannon/Trigger() +/datum/action/vehicle/sealed/cannon/Trigger() if(istype(vehicle_entered_target, /obj/vehicle/sealed/car/clowncar)) var/obj/vehicle/sealed/car/clowncar/C = vehicle_entered_target if(C.cannonbusy) to_chat(owner, "Please wait for the vehicle to finish its current action first.") C.ToggleCannon() -/datum/action/vehicle/sealed/Thank +/datum/action/vehicle/sealed/thank name = "Thank the Clown Car Driver" desc = "They're just doing their job." button_icon_state = "car_thanktheclown" var/last_thank_time -/datum/action/vehicle/sealed/Thank/Trigger() +/datum/action/vehicle/sealed/thank/Trigger() if(istype(vehicle_entered_target, /obj/vehicle/sealed/car/clowncar)) var/obj/vehicle/sealed/car/clowncar/C = vehicle_entered_target if(world.time >= last_thank_time + 60) diff --git a/code/modules/vending/modularpc.dm b/code/modules/vending/modularpc.dm index 89b7065bc88..922681018a1 100644 --- a/code/modules/vending/modularpc.dm +++ b/code/modules/vending/modularpc.dm @@ -19,7 +19,7 @@ premium = list(/obj/item/computer_hardware/card_slot = 2, /obj/item/computer_hardware/ai_slot = 2, /obj/item/computer_hardware/printer/mini = 2, - /obj/item/computer_hardware/recharger/APC = 2, + /obj/item/computer_hardware/recharger/apc_recharger = 2, /obj/item/paicard = 2) refill_canister = /obj/item/vending_refill/modularpc default_price = 150