diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index 7bde2d91f8f5..80194dd078bb 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -773,7 +773,7 @@ /turf/simulated/floor/lubed/lavaland_air, /area/ruin/powered/clownplanet) "bq" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1 }, /obj/structure/disposalpipe/trunk, @@ -890,7 +890,7 @@ /turf/simulated/floor/carpet/lavaland_air, /area/ruin/powered/clownplanet) "bN" = ( -/obj/machinery/disposal/deliveryChute, +/obj/machinery/disposal/delivery_chute, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -1103,7 +1103,7 @@ /turf/simulated/floor/light/lavaland_air, /area/ruin/powered/clownplanet) "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/map_files/RandomRuins/SpaceRuins/clownmime.dmm b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm index efec3e5bfe54..ead0adf0916a 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm @@ -560,7 +560,7 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "Dj" = ( -/obj/item/toy/AI, +/obj/item/toy/ai, /obj/item/toy/plushie/lizardplushie, /obj/item/toy/plushie/voxplushie, /obj/item/toy/plushie/greyplushie, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm index e84600a4e0da..595cf8fcc289 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm @@ -4819,9 +4819,9 @@ dir = 1 }, /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /obj/item/reagent_containers/iv_bag/blood/random, /obj/item/reagent_containers/iv_bag/blood/random, /obj/item/reagent_containers/iv_bag/blood/random, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm index 581bb48a9b1d..c3059ffa2332 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm @@ -13,11 +13,11 @@ /area/space/nearstation) "ad" = ( /turf/simulated/wall/mineral/titanium, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "ae" = ( /obj/effect/spawner/window/shuttle, /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "af" = ( /obj/machinery/porta_turret{ installation = /obj/item/gun/energy/gun; @@ -25,23 +25,23 @@ name = "ship defense turret" }, /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "ag" = ( /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "ah" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "ai" = ( /obj/machinery/door/airlock/titanium, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aj" = ( /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "ak" = ( /obj/structure/lattice, /turf/template_noop, @@ -49,50 +49,50 @@ "al" = ( /obj/machinery/light/small, /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "am" = ( /obj/machinery/door/airlock/silver{ locked = 1 }, /obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "an" = ( /obj/structure/bed/roller, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "ao" = ( /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "ap" = ( /obj/item/restraints/handcuffs, /obj/structure/closet/crate, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aq" = ( /obj/item/scalpel, /obj/structure/closet/crate, /obj/item/tank/internals/anesthetic, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "ar" = ( /obj/item/bodybag, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "as" = ( /obj/item/storage/box/syringes, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "av" = ( /obj/machinery/computer/operating, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aw" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "ax" = ( /obj/structure/closet/crate/freezer, /obj/item/food/meat, @@ -101,7 +101,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "ay" = ( /obj/structure/closet/crate/freezer, /obj/item/food/meat, @@ -109,14 +109,14 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "az" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aA" = ( /obj/structure/table, /obj/item/storage/box, @@ -127,13 +127,13 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aB" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aC" = ( /obj/structure/cable{ icon_state = "0-2" @@ -143,28 +143,28 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aD" = ( /turf/simulated/wall/mineral/titanium, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "aE" = ( /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aF" = ( /obj/effect/gibspawner/generic, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aH" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aI" = ( /obj/item/storage/box, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aJ" = ( /turf/simulated/floor/plating/asteroid/airless, /area/ruin/powered) @@ -182,73 +182,73 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aN" = ( /obj/structure/largecrate, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aO" = ( /obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "aP" = ( /obj/item/stack/spacecash/c50, /obj/item/stack/spacecash/c100, /turf/simulated/floor/wood, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "aQ" = ( /obj/structure/bed, /obj/item/bedsheet/yellow, /turf/simulated/floor/wood, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "aR" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "aS" = ( /obj/structure/rack, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "aT" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "aU" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "aV" = ( /obj/structure/sign/vacuum, /turf/simulated/wall/mineral/titanium, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "aW" = ( /obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aX" = ( /obj/item/clothing/glasses/regular/hipster, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "aY" = ( /obj/machinery/door/airlock/titanium, /turf/simulated, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bb" = ( /obj/structure/closet/crate/freezer, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bc" = ( /turf/simulated/wall/mineral/titanium, /area/ruin/powered) @@ -270,29 +270,29 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bh" = ( /turf/simulated/floor/wood, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "bi" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/wood, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "bj" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "bk" = ( /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "bl" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "bm" = ( /obj/item/mounted/frame/apc_frame, /turf/simulated/floor/plating/airless, @@ -317,103 +317,103 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bq" = ( /turf/simulated/floor/plasteel{ icon_state = "wood-broken" }, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "br" = ( /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "bs" = ( /obj/machinery/light/small, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "bt" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "bu" = ( /obj/machinery/light, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bv" = ( /obj/machinery/door_control{ id = "packerMed"; pixel_y = -24 }, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bw" = ( /obj/machinery/sleeper{ dir = 1 }, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "by" = ( /obj/item/hand_labeler, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bC" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bE" = ( /obj/machinery/door/airlock/silver, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "bF" = ( /turf/simulated/wall/mineral/titanium, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "bG" = ( /obj/machinery/door/poddoor/shutters{ dir = 2; id_tag = "packerMed" }, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bH" = ( /obj/structure/largecrate, /obj/effect/turf_decal/stripes/line{ dir = 10 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bI" = ( /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bJ" = ( /obj/machinery/light/small, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bK" = ( /obj/structure/kitchenspike, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bL" = ( /obj/structure/closet/crate, /obj/item/analyzer, /obj/item/stack/spacecash/c10, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bM" = ( /obj/structure/closet/crate, /obj/item/stack/spacecash/c100, /obj/item/stack/spacecash/c50, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bO" = ( /obj/machinery/door_control{ id = "packerCargo"; @@ -422,27 +422,27 @@ /obj/machinery/light/small, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bP" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "bS" = ( /obj/structure/cable{ icon_state = "0-2" }, /obj/machinery/power/apc/off_station/directional/north, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "bT" = ( /obj/structure/table, /obj/item/screwdriver, @@ -455,7 +455,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "bU" = ( /obj/machinery/light{ dir = 1 @@ -463,13 +463,13 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "bV" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "green" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "bW" = ( /obj/structure/sink{ pixel_y = 12 @@ -478,7 +478,7 @@ dir = 1; icon_state = "yellow" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "bX" = ( /obj/machinery/economy/vending/hydroseeds{ slogan_delay = 700 @@ -487,25 +487,25 @@ dir = 1; icon_state = "yellow" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "bY" = ( /obj/machinery/economy/vending/hydronutrients, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "bZ" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "ca" = ( /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cb" = ( /obj/structure/table, /obj/item/kitchen/knife/butcher, @@ -513,21 +513,21 @@ /turf/simulated/floor/plasteel{ icon_state = "barber" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cc" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, /turf/simulated/floor/plasteel{ icon_state = "barber" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cd" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, /turf/simulated/floor/plasteel{ icon_state = "barber" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "ce" = ( /obj/machinery/processor, /obj/machinery/light{ @@ -539,20 +539,20 @@ /turf/simulated/floor/plasteel{ icon_state = "barber" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cf" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cg" = ( /obj/structure/table, /obj/item/kitchen/knife, /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "ch" = ( /obj/structure/table, /obj/machinery/light/small{ @@ -561,21 +561,21 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "ci" = ( /obj/structure/table, /obj/structure/reagent_dispensers/beerkeg, /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cj" = ( /obj/structure/table, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "ck" = ( /obj/structure/cable{ icon_state = "1-2" @@ -585,24 +585,24 @@ id_tag = "packerCargo" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "cl" = ( /turf/simulated/wall/mineral/titanium, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cp" = ( /obj/item/food/hugemushroomslice, /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cq" = ( /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cr" = ( /turf/simulated/floor/plasteel{ icon_state = "barber" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cs" = ( /obj/structure/window/reinforced{ dir = 4 @@ -610,35 +610,35 @@ /turf/simulated/floor/plasteel{ icon_state = "barber" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "ct" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cu" = ( /obj/structure/kitchenspike, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cv" = ( /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cw" = ( /obj/machinery/door/airlock/silver, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cx" = ( /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cy" = ( /obj/machinery/light/small{ dir = 1 @@ -646,13 +646,13 @@ /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cz" = ( /obj/machinery/gibber, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cA" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -660,50 +660,50 @@ /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cB" = ( /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cC" = ( /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cF" = ( /obj/structure/cable{ icon_state = "1-4" }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "cG" = ( /obj/structure/cable{ icon_state = "2-8" }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "cH" = ( /obj/item/food/hugemushroomslice, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cI" = ( /obj/machinery/door/airlock/titanium, /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cJ" = ( /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ icon_state = "barber" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cL" = ( /obj/machinery/door/window, /turf/simulated/floor/plasteel{ icon_state = "barber" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cM" = ( /obj/structure/window/reinforced{ dir = 4 @@ -712,7 +712,7 @@ /turf/simulated/floor/plasteel{ icon_state = "barber" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "cO" = ( /obj/structure/closet/secure_closet/freezer/meat{ opened = 1 @@ -720,7 +720,7 @@ /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cP" = ( /obj/structure/closet/crate/freezer, /obj/item/food/meat, @@ -728,43 +728,43 @@ /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cQ" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cR" = ( /obj/item/crowbar, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cS" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cT" = ( /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cU" = ( /obj/structure/cable{ icon_state = "0-2" }, /obj/machinery/power/apc/off_station/directional/north, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "cW" = ( /obj/structure/table, /obj/item/paper{ @@ -772,31 +772,31 @@ name = "Captain's log entry" }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "db" = ( /turf/simulated/floor/plasteel{ dir = 10; icon_state = "green" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dc" = ( /turf/simulated/floor/plasteel{ icon_state = "green" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dd" = ( /obj/machinery/seed_extractor, /obj/item/seeds/plump/walkingmushroom, /turf/simulated/floor/plasteel{ icon_state = "green" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "de" = ( /turf/simulated/floor/plasteel{ dir = 6; icon_state = "green" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -804,7 +804,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dh" = ( /obj/structure/cable{ icon_state = "2-8" @@ -812,13 +812,13 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "di" = ( /obj/item/food/meat, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dj" = ( /obj/structure/cable{ icon_state = "0-4" @@ -828,7 +828,7 @@ dir = 8 }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dk" = ( /obj/structure/cable{ icon_state = "1-4" @@ -840,13 +840,13 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dl" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -855,7 +855,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -864,7 +864,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "do" = ( /obj/structure/cable{ icon_state = "2-8" @@ -873,11 +873,11 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dp" = ( /obj/item/multitool, /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dq" = ( /obj/structure/shuttle/engine/heater{ dir = 4 @@ -886,25 +886,25 @@ dir = 8 }, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dr" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4 }, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ds" = ( /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "dt" = ( /obj/structure/table, /obj/machinery/recharger, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "du" = ( /obj/structure/chair/stool, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "dx" = ( /obj/machinery/light{ dir = 4 @@ -913,7 +913,7 @@ icon_state = "1-2" }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "dy" = ( /obj/machinery/light/small{ dir = 8 @@ -921,7 +921,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dz" = ( /obj/structure/cable{ icon_state = "2-4" @@ -929,7 +929,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -937,7 +937,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dB" = ( /obj/machinery/light/small{ dir = 4 @@ -945,10 +945,10 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dC" = ( /turf/simulated/wall/r_wall, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -956,7 +956,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dE" = ( /obj/machinery/light/small{ dir = 4 @@ -964,7 +964,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dF" = ( /obj/machinery/light/small{ dir = 8 @@ -973,29 +973,29 @@ dir = 8 }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dG" = ( /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dI" = ( /obj/machinery/door/airlock/titanium, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dJ" = ( /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "dK" = ( /obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "dL" = ( /obj/structure/computerframe, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "dM" = ( /obj/item/shard, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "dN" = ( /obj/structure/cable{ icon_state = "2-4" @@ -1004,14 +1004,14 @@ icon_state = "1-4" }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "dO" = ( /obj/machinery/door/airlock/silver, /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dP" = ( /obj/structure/cable{ icon_state = "1-8" @@ -1019,14 +1019,14 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dQ" = ( /obj/machinery/shieldwallgen, /obj/structure/cable{ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dR" = ( /obj/structure/cable{ icon_state = "2-8" @@ -1037,7 +1037,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dS" = ( /obj/structure/cable{ icon_state = "0-2" @@ -1046,7 +1046,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dT" = ( /obj/effect/turf_decal/delivery/partial{ dir = 4 @@ -1057,14 +1057,14 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dU" = ( /obj/machinery/conveyor{ dir = 4; id = "meatConvey1" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dV" = ( /obj/machinery/conveyor{ dir = 4; @@ -1072,22 +1072,22 @@ }, /obj/structure/plasticflaps, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dW" = ( /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dX" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/wall/r_wall, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1095,7 +1095,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "dZ" = ( /obj/structure/disposalpipe/segment/corner{ dir = 2 @@ -1103,7 +1103,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "ea" = ( /obj/structure/window/reinforced{ dir = 8 @@ -1112,13 +1112,13 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "eb" = ( /obj/structure/window/reinforced{ dir = 1 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ec" = ( /obj/structure/window/reinforced{ dir = 4 @@ -1127,7 +1127,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ed" = ( /obj/structure/rack, /obj/item/storage/box/lights, @@ -1137,7 +1137,7 @@ /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ee" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1145,7 +1145,7 @@ /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ef" = ( /obj/machinery/power/smes/magical{ desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; @@ -1157,7 +1157,7 @@ }, /obj/structure/cable, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "eg" = ( /obj/structure/cable{ icon_state = "0-4" @@ -1166,7 +1166,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "eh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1175,53 +1175,53 @@ icon_state = "1-8" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ei" = ( /obj/structure/table, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "ej" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "ek" = ( /obj/item/shard{ icon_state = "medium" }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "el" = ( /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "em" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "en" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/gibspawner/generic, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "eo" = ( /obj/structure/window/reinforced{ dir = 4 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "ep" = ( /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "eq" = ( /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "er" = ( /obj/machinery/conveyor_switch/oneway{ id = "meatConvey1" @@ -1229,7 +1229,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "es" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -1237,7 +1237,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "et" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1248,7 +1248,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "eu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1256,7 +1256,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ev" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1267,7 +1267,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ew" = ( /obj/structure/window/reinforced{ dir = 8 @@ -1279,17 +1279,17 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ex" = ( /obj/effect/gibspawner/human, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ey" = ( /obj/structure/window/reinforced{ dir = 4 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ez" = ( /obj/structure/rack, /obj/item/storage/belt/utility/full, @@ -1299,31 +1299,31 @@ /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "eA" = ( /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "eB" = ( /obj/structure/cable{ icon_state = "2-4" }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "eC" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "eE" = ( /obj/structure/cable{ icon_state = "1-8" }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "eF" = ( /obj/structure/cable{ icon_state = "1-4" @@ -1335,7 +1335,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "eG" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1346,7 +1346,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "eI" = ( /obj/machinery/light/small{ dir = 1 @@ -1357,18 +1357,18 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "eJ" = ( /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "eK" = ( /obj/structure/window/reinforced{ dir = 8 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "eL" = ( /obj/machinery/door/window{ base_state = "right"; @@ -1376,25 +1376,25 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "eM" = ( /obj/structure/rack, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "eQ" = ( /obj/machinery/door/airlock/silver, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "eR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "eS" = ( /obj/machinery/door/window{ base_state = "right"; @@ -1402,13 +1402,13 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "eT" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "eW" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1416,7 +1416,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "eX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1424,11 +1424,11 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "eZ" = ( /obj/effect/gibspawner/generic, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fa" = ( /obj/machinery/power/smes/magical{ desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; @@ -1437,37 +1437,37 @@ }, /obj/structure/cable, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fb" = ( /obj/structure/cable{ icon_state = "1-8" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fc" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/power/port_gen/pacman/super, /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fd" = ( /obj/structure/closet, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fe" = ( /obj/machinery/light{ dir = 4 }, /obj/structure/closet, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "ff" = ( /obj/effect/gibspawner/xeno, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "fg" = ( /obj/item/wrench, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "fh" = ( /obj/structure/disposalpipe/segment/corner{ dir = 4 @@ -1475,7 +1475,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "fi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1483,42 +1483,42 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fj" = ( /obj/structure/mopbucket, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fk" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/item/kitchen/knife, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fl" = ( /obj/machinery/door/airlock/titanium, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fm" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/door/airlock/titanium, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fn" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "fo" = ( /obj/structure/kitchenspike, /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "fp" = ( /obj/machinery/conveyor{ dir = 4; @@ -1526,7 +1526,7 @@ }, /obj/item/kitchen/knife, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "fq" = ( /obj/machinery/conveyor{ dir = 4; @@ -1534,14 +1534,14 @@ }, /obj/structure/plasticflaps, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "fr" = ( /obj/machinery/conveyor{ dir = 4; id = "meatConvey2" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "fs" = ( /obj/structure/disposalpipe/segment/corner{ dir = 8 @@ -1549,25 +1549,25 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "ft" = ( /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/window/reinforced, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fu" = ( /obj/structure/window/reinforced, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fv" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/window/reinforced, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fw" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1575,37 +1575,37 @@ /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fx" = ( /obj/item/stack/cable_coil, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fy" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fz" = ( /obj/item/stack/sheet/mineral/uranium{ amount = 50 }, /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fA" = ( /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fB" = ( /obj/structure/lattice, /turf/template_noop, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fC" = ( /obj/structure/cable{ icon_state = "1-4" }, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fD" = ( /obj/item/shard{ icon_state = "small" @@ -1614,21 +1614,21 @@ icon_state = "4-8" }, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fE" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fF" = ( /obj/structure/cable{ icon_state = "2-8" }, /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fG" = ( /obj/structure/cable{ icon_state = "1-8" @@ -1637,7 +1637,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "fH" = ( /obj/machinery/conveyor_switch/oneway{ id = "meatConvey2" @@ -1645,7 +1645,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "fI" = ( /obj/structure/cable{ icon_state = "1-4" @@ -1653,7 +1653,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fJ" = ( /obj/structure/cable{ icon_state = "2-8" @@ -1661,77 +1661,77 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fK" = ( /obj/item/mop, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fL" = ( /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fM" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fN" = ( /obj/item/shard, /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fO" = ( /obj/structure/chair/stool, /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fP" = ( /obj/item/stack/cable_coil{ amount = 5 }, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fQ" = ( /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fS" = ( /obj/structure/closet/crate/freezer, /obj/item/food/meat, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fT" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fU" = ( /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fV" = ( /obj/structure/reagent_dispensers, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fW" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "fX" = ( /obj/structure/ore_box, /turf/simulated/floor/plating/airless, @@ -1740,28 +1740,28 @@ /obj/structure/computerframe, /obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "fZ" = ( /obj/structure/computerframe, /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "ga" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "gb" = ( /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "gc" = ( /obj/machinery/door/airlock/silver{ locked = 1 }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gd" = ( /obj/machinery/door/airlock/silver{ locked = 1 @@ -1770,14 +1770,14 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ge" = ( /obj/machinery/door/airlock/titanium, /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gf" = ( /obj/effect/decal/remains/human, /obj/item/clothing/head/helmet/space/syndicate/green/dark, @@ -1794,20 +1794,20 @@ }, /obj/machinery/door/airlock/silver, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "gi" = ( /turf/simulated/mineral/random, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "gj" = ( /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gk" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gl" = ( /obj/structure/table, /obj/item/paper{ @@ -1815,17 +1815,17 @@ name = "Old Diary" }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gm" = ( /obj/structure/table, /obj/item/pen/red, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gn" = ( /obj/structure/closet, /obj/item/clothing/under/misc/overalls, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "go" = ( /obj/machinery/porta_turret{ check_synth = 1; @@ -1834,37 +1834,37 @@ name = "ship defense turret" }, /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "gp" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "gq" = ( /obj/structure/cable, /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "gr" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "gs" = ( /turf/simulated/floor/plating/asteroid/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "gt" = ( /obj/structure/rack, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "gu" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating/asteroid/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "gv" = ( /obj/item/clothing/suit/space/syndicate/green/dark, /turf/template_noop, @@ -1905,7 +1905,7 @@ "gD" = ( /obj/machinery/computer/arcade, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gE" = ( /obj/effect/decal/remains/human, /obj/structure/cable{ @@ -1915,13 +1915,13 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gF" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gG" = ( /obj/structure/cable{ icon_state = "1-4" @@ -1930,13 +1930,13 @@ icon_state = "1-8" }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gH" = ( /obj/structure/cable{ icon_state = "0-8" }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gI" = ( /obj/structure/closet, /obj/item/clothing/head/bio_hood, @@ -1946,18 +1946,18 @@ /area/ruin/powered) "gJ" = ( /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "gK" = ( /obj/machinery/door/airlock/titanium, /turf/simulated, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "gL" = ( /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "gM" = ( /obj/effect/gibspawner/robot, /turf/simulated/floor/plating/airless, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) "gN" = ( /obj/structure/reagent_dispensers/beerkeg, /turf/simulated/floor/plating/airless, @@ -1975,7 +1975,7 @@ "gR" = ( /obj/structure/bed, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gS" = ( /obj/structure/bed, /obj/item/bedsheet, @@ -1984,13 +1984,13 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gT" = ( /obj/structure/closet, /obj/item/clothing/under/rank/procedure/iaa/blue, /obj/item/clothing/suit/apron, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gU" = ( /obj/effect/decal/cleanable/blood/drip, /obj/item/clothing/mask/gas/syndicate, @@ -2021,13 +2021,13 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "gZ" = ( /obj/structure/cable{ icon_state = "1-8" }, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ha" = ( /obj/item/shard{ icon_state = "medium" @@ -2041,18 +2041,18 @@ "hc" = ( /obj/effect/decal/remains/human, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "hd" = ( /obj/structure/bed, /obj/item/bedsheet, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "he" = ( /obj/machinery/door/airlock/titanium, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "hf" = ( /obj/structure/mirror{ pixel_y = 28 @@ -2060,7 +2060,7 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "hg" = ( /obj/structure/toilet{ dir = 8 @@ -2071,7 +2071,7 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "hh" = ( /obj/structure/table, /obj/item/storage/toolbox/syndicate, @@ -2087,7 +2087,7 @@ /obj/structure/closet/crate, /obj/item/stack/spacecash/c10, /turf/simulated/floor/plasteel, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "hk" = ( /obj/structure/sink{ dir = 8; @@ -2097,7 +2097,7 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "hl" = ( /obj/structure/table, /obj/item/reagent_containers/glass/beaker/drugs/meth, @@ -2116,7 +2116,7 @@ "ho" = ( /obj/effect/spawner/window/shuttle, /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "hp" = ( /obj/machinery/porta_turret{ check_synth = 1; @@ -2125,22 +2125,22 @@ name = "ship defense turret" }, /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "hq" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/engine, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "hr" = ( /obj/item/storage/fancy/matches, /obj/item/storage/fancy/cigarettes/dromedaryco, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "hs" = ( /obj/item/poster/random_contraband, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "ht" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, @@ -2168,12 +2168,12 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Aft) +/area/ruin/unpowered/bmp_ship/aft) "hE" = ( /obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/pirate, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "qM" = ( /obj/machinery/conveyor{ dir = 4; @@ -2181,13 +2181,13 @@ }, /obj/item/salvage/ruin/pirate, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "uK" = ( /mob/living/simple_animal/hostile/pirate, /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "uT" = ( /turf/simulated/mineral/random/high_chance, /area/ruin/powered) @@ -2199,7 +2199,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bar" }, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "Ht" = ( /obj/machinery/conveyor{ dir = 4; @@ -2207,7 +2207,7 @@ }, /obj/item/salvage/ruin/pirate, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Midship) +/area/ruin/unpowered/bmp_ship/midship) "IM" = ( /obj/structure/closet/crate/freezer, /obj/item/food/meat, @@ -2216,13 +2216,13 @@ dir = 2 }, /turf/simulated/floor/plating, -/area/ruin/unpowered/BMPship/Delta) +/area/ruin/unpowered/bmp_ship/delta) "PP" = ( /obj/structure/computerframe{ dir = 4 }, /turf/simulated/floor/carpet, -/area/ruin/unpowered/BMPship/Fore) +/area/ruin/unpowered/bmp_ship/fore) (1,1,1) = {" aa diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index b9dfadba0095..3dc1c38aa2d9 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -6466,7 +6466,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) "xZ" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8 }, /obj/structure/disposalpipe/trunk, @@ -9241,7 +9241,7 @@ }, /area/ruin/space/moonbase19) "KC" = ( -/obj/machinery/disposal/deliveryChute, +/obj/machinery/disposal/delivery_chute, /obj/structure/disposalpipe/trunk{ dir = 4 }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm index 95165a1f259f..af001ec09df9 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm @@ -1129,8 +1129,8 @@ /obj/structure/closet/crate/medical, /obj/item/clothing/accessory/stethoscope, /obj/item/healthanalyzer, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /obj/machinery/power/apc/off_station/directional/east, /turf/simulated/floor/plasteel{ icon_state = "white" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm index df4aa89808b9..e530903b051b 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm @@ -406,7 +406,7 @@ }, /obj/structure/bed/roller, /obj/machinery/iv_drip, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -3760,7 +3760,7 @@ }, /area/ruin/unpowered/syndicate_space_base/chemistry) "vV" = ( -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/book/manual/wiki/sop_service, /obj/item/pen/blue{ pixel_y = 4 @@ -4516,7 +4516,7 @@ /obj/item/surgicaldrill, /obj/item/bonegel, /obj/item/bonesetter, -/obj/item/FixOVein, +/obj/item/fix_o_vein, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm index e75fd79a2855..56f6a89999fb 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm @@ -660,8 +660,8 @@ /area/ruin/space/syndicakefactory) "zc" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap{ pixel_y = 7 }, /obj/machinery/light/small{ @@ -747,8 +747,8 @@ /area/ruin/space/syndicakefactory) "CW" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap{ pixel_y = 7 }, /turf/simulated/floor/plasteel{ @@ -1041,8 +1041,8 @@ /area/ruin/space/syndicakefactory) "Nx" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap{ pixel_y = 7 }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index 734ea11b4968..052421e2a260 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -2930,9 +2930,9 @@ opened = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/destTagger, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/dest_tagger, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 866d658aa932..4fe18c5ddc36 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -7701,7 +7701,7 @@ /area/mine/outpost/mechbay) "Jn" = ( /obj/structure/lattice/catwalk/mining, -/mob/living/simple_animal/cockroach/Brad, +/mob/living/simple_animal/cockroach/brad, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/outpost/catwalk) "Jv" = ( diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index dabdbceff0ba..1bd3c98faf06 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -578,7 +578,7 @@ /obj/structure/table/abductor, /obj/item/bonegel/alien, /obj/item/bonesetter/alien, -/obj/item/FixOVein/alien, +/obj/item/fix_o_vein/alien, /obj/item/surgicaldrill/alien, /obj/item/circular_saw/alien, /turf/simulated/floor/plating/abductor, @@ -828,7 +828,7 @@ /obj/structure/table/abductor, /obj/item/surgicaldrill/alien, /obj/item/circular_saw/alien, -/obj/item/FixOVein/alien, +/obj/item/fix_o_vein/alien, /obj/item/bonesetter/alien, /obj/item/bonegel/alien, /turf/simulated/floor/plating/abductor, @@ -3906,7 +3906,7 @@ /turf/simulated/floor/plasteel, /area/admin) "ne" = ( -/mob/living/simple_animal/pet/dog/fox/Syndifox, +/mob/living/simple_animal/pet/dog/fox/syndifox, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -4462,7 +4462,7 @@ /turf/simulated/floor/plating/airless, /area/trader_station/sol) "oR" = ( -/mob/living/simple_animal/pet/cat/Syndi, +/mob/living/simple_animal/pet/cat/syndi, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -4763,12 +4763,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/obj/item/reagent_containers/iv_bag/blood/AMinus, -/obj/item/reagent_containers/iv_bag/blood/APlus, -/obj/item/reagent_containers/iv_bag/blood/BMinus, -/obj/item/reagent_containers/iv_bag/blood/BPlus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OPlus, +/obj/item/reagent_containers/iv_bag/blood/a_minus, +/obj/item/reagent_containers/iv_bag/blood/a_plus, +/obj/item/reagent_containers/iv_bag/blood/b_minus, +/obj/item/reagent_containers/iv_bag/blood/b_plus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_plus, /obj/structure/closet/crate/freezer, /turf/simulated/floor/plasteel{ dir = 8; @@ -5973,7 +5973,7 @@ /obj/item/robot_parts/l_arm, /obj/item/robot_parts/r_arm, /obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/robot_parts/l_leg, @@ -7444,7 +7444,7 @@ /obj/item/scalpel/laser/manager, /obj/item/surgicaldrill, /obj/item/bonegel, -/obj/item/FixOVein, +/obj/item/fix_o_vein, /obj/item/stack/medical/ointment/advanced, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -8878,7 +8878,7 @@ "FD" = ( /obj/structure/table/reinforced, /obj/item/melee/classic_baton/telescopic, -/obj/item/paper/Court, +/obj/item/paper/court, /obj/item/pen, /turf/simulated/floor/plasteel/dark, /area/admin) @@ -13040,7 +13040,7 @@ /obj/item/circular_saw, /obj/item/scalpel, /obj/item/retractor, -/obj/item/FixOVein, +/obj/item/fix_o_vein, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "Ua" = ( diff --git a/_maps/map_files/shuttles/admin_admin.dmm b/_maps/map_files/shuttles/admin_admin.dmm index 8dbc488e6131..76fd24c72c54 100644 --- a/_maps/map_files/shuttles/admin_admin.dmm +++ b/_maps/map_files/shuttles/admin_admin.dmm @@ -464,7 +464,7 @@ /obj/item/circular_saw, /obj/item/scalpel, /obj/item/retractor, -/obj/item/FixOVein, +/obj/item/fix_o_vein, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "by" = ( diff --git a/_maps/map_files/shuttles/admin_hospital.dmm b/_maps/map_files/shuttles/admin_hospital.dmm index 2b04da3ce574..5ab37c557f6e 100644 --- a/_maps/map_files/shuttles/admin_hospital.dmm +++ b/_maps/map_files/shuttles/admin_hospital.dmm @@ -343,10 +343,10 @@ /area/shuttle/administration) "bE" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bG" = ( @@ -422,8 +422,8 @@ /area/shuttle/administration) "bV" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /obj/machinery/iv_drip, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) diff --git a/_maps/map_files/shuttles/admin_skipjack.dmm b/_maps/map_files/shuttles/admin_skipjack.dmm index aed953b90165..346de6dd4a9c 100644 --- a/_maps/map_files/shuttles/admin_skipjack.dmm +++ b/_maps/map_files/shuttles/admin_skipjack.dmm @@ -301,7 +301,7 @@ "ck" = ( /obj/item/clothing/head/collectable/xenom, /obj/item/clothing/head/chicken, -/obj/item/aiModule/syndicate, +/obj/item/ai_module/syndicate, /obj/item/storage/box/zipties, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) @@ -337,7 +337,7 @@ /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) "cp" = ( -/obj/structure/AIcore, +/obj/structure/ai_core, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) "cu" = ( diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index 1216ce56db99..65849d5452ed 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -756,7 +756,7 @@ layer = 2.9 }, /obj/effect/decal/cleanable/dirt, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/simulated/floor/plating, /area/shuttle/escape) "fz" = ( diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 09ad3936a21a..d459724b568c 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -2740,7 +2740,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "alu" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2820,7 +2820,7 @@ dir = 4; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "alQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2832,7 +2832,7 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "alS" = ( /obj/item/radio/intercom{ name = "west bump"; @@ -3621,7 +3621,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aox" = ( /obj/machinery/computer/secure_data{ dir = 8 @@ -3822,7 +3822,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aoW" = ( /obj/machinery/power/treadmill{ dir = 8 @@ -3841,7 +3841,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aoX" = ( /obj/structure/bed, /obj/machinery/camera{ @@ -3854,13 +3854,13 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aoY" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "rampbottom" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aoZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3870,7 +3870,7 @@ /turf/simulated/floor/plasteel{ icon_state = "rampbottom" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "apb" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4032,7 +4032,7 @@ }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/carpet/cyan, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "apB" = ( /obj/structure/rack, /obj/item/reagent_containers/spray/pepper{ @@ -4312,7 +4312,7 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet/cyan, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aqW" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -4412,7 +4412,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aro" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -4420,7 +4420,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "arp" = ( /obj/structure/chair{ dir = 4 @@ -4470,7 +4470,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "arv" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -4489,7 +4489,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "arx" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4506,7 +4506,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ary" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -5067,14 +5067,14 @@ dir = 10 }, /turf/simulated/floor/carpet/cyan, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "atb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /obj/structure/closet/secure_closet/brig/temp/cell_1, /turf/simulated/floor/carpet/cyan, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "atc" = ( /obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ @@ -5094,7 +5094,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ate" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -5103,7 +5103,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "atf" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -5386,7 +5386,7 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "auc" = ( /turf/simulated/wall, /area/station/security/brig) @@ -5472,7 +5472,7 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aun" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5485,7 +5485,7 @@ dir = 4; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "auo" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -5591,7 +5591,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "auS" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5613,7 +5613,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "auT" = ( /obj/machinery/camera{ c_tag = "Brig Prisoner Processing West"; @@ -5983,13 +5983,13 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "avY" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "rampbottom" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "avZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6024,7 +6024,7 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "awe" = ( /obj/structure/cable{ icon_state = "2-8" @@ -6183,10 +6183,10 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "awK" = ( /turf/simulated/wall, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "awL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6195,7 +6195,7 @@ dir = 4; icon_state = "rampbottom" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "awM" = ( /obj/structure/chair{ dir = 1 @@ -6437,7 +6437,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "axH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6454,7 +6454,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "axJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6470,13 +6470,13 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "axK" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "axL" = ( /turf/simulated/floor/plasteel, /area/station/security/lobby) @@ -6498,7 +6498,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "axQ" = ( /obj/item/radio/intercom{ name = "south bump"; @@ -6620,7 +6620,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ayo" = ( /obj/machinery/computer/shuttle/labor{ dir = 4 @@ -6651,7 +6651,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ays" = ( /obj/docking_port/stationary{ dir = 8; @@ -6858,7 +6858,7 @@ dir = 1 }, /turf/simulated/floor/carpet/cyan, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ayS" = ( /obj/structure/chair/comfy/teal{ dir = 4 @@ -6870,7 +6870,7 @@ dir = 1 }, /turf/simulated/floor/carpet/cyan, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ayV" = ( /turf/simulated/floor/carpet, /area/station/security/detective) @@ -6881,7 +6881,7 @@ dir = 4; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ayX" = ( /obj/item/radio/intercom{ name = "west bump"; @@ -6896,7 +6896,7 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aza" = ( /turf/simulated/wall/r_wall, /area/station/security/processing) @@ -6991,7 +6991,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "azy" = ( /obj/machinery/door/airlock/security{ name = "Prisoner Re-education Centre" @@ -7121,7 +7121,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "azL" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 @@ -7146,7 +7146,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "azO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -7155,7 +7155,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "azP" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -7176,7 +7176,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "azR" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -7216,7 +7216,7 @@ /obj/effect/decal/cleanable/cobweb2, /obj/structure/closet/secure_closet/brig/temp/cell_5, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "azX" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7317,7 +7317,7 @@ /area/station/security/execution) "aAx" = ( /turf/simulated/wall/r_wall, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aAy" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 @@ -7350,7 +7350,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aAB" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -7508,7 +7508,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aAW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7535,7 +7535,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aAY" = ( /obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, @@ -7552,13 +7552,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aBb" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aBc" = ( /obj/structure/table/wood, /obj/item/deck/cards, @@ -7904,7 +7904,7 @@ pixel_y = -26 }, /turf/simulated/floor/carpet/cyan, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aCq" = ( /obj/structure/bed, /obj/item/bedsheet, @@ -7914,7 +7914,7 @@ dir = 1 }, /turf/simulated/floor/carpet/cyan, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aCr" = ( /obj/machinery/power/treadmill{ dir = 8 @@ -7929,7 +7929,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aCs" = ( /obj/structure/bed, /obj/machinery/flasher{ @@ -7943,7 +7943,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aCt" = ( /obj/structure/cable{ icon_state = "1-2" @@ -7956,7 +7956,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aCv" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -7975,7 +7975,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aCx" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -8267,7 +8267,7 @@ dir = 1; icon_state = "rampbottom" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aDp" = ( /obj/structure/closet/crate, /obj/machinery/light/small{ @@ -8554,7 +8554,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aEr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -8573,7 +8573,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aEs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11691,7 +11691,7 @@ /area/station/maintenance/fpmaint2) "aOW" = ( /obj/structure/chair, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) @@ -12688,7 +12688,7 @@ "aSo" = ( /obj/structure/closet/wardrobe/white, /obj/item/clothing/shoes/jackboots, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /obj/item/reagent_containers/drinks/cans/badminbrew, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) @@ -12700,7 +12700,7 @@ "aSq" = ( /obj/structure/table/glass, /obj/item/restraints/handcuffs/cable/zipties, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aSs" = ( @@ -13164,7 +13164,7 @@ /area/station/medical/chemistry) "aTU" = ( /obj/structure/table/glass, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/reagent_scanner/adv, /obj/machinery/light{ dir = 1 @@ -14139,7 +14139,7 @@ }, /area/station/medical/reception) "aWJ" = ( -/mob/living/simple_animal/crab/Coffee, +/mob/living/simple_animal/crab/coffee, /turf/simulated/floor/beach/water{ icon_state = "seadeep" }, @@ -14912,7 +14912,7 @@ }, /area/station/security/checkpoint/secondary) "aZi" = ( -/mob/living/simple_animal/mouse/brown/Tom, +/mob/living/simple_animal/mouse/brown/tom, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "vault" @@ -15302,7 +15302,7 @@ pixel_x = 1; pixel_y = 9 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/simulated/floor/wood, /area/station/service/library) "bap" = ( @@ -15568,10 +15568,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/simulated/floor/plasteel, /area/station/public/storage/tools) "bbq" = ( @@ -21557,7 +21557,7 @@ "bsT" = ( /obj/structure/table, /obj/item/book/manual/wiki/sop_service, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/eftpos/register, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -22792,7 +22792,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8 }, /turf/simulated/floor/plating, @@ -23292,11 +23292,11 @@ /obj/structure/table, /obj/machinery/requests_console/directional/north, /obj/item/stack/tape_roll, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 }, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 }, @@ -23334,9 +23334,9 @@ /area/station/supply/office) "bzK" = ( /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/rcs, /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ @@ -24540,7 +24540,7 @@ dir = 8; layer = 2.9 }, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 }, @@ -29985,7 +29985,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/closet/secure_closet/CMO, +/obj/structure/closet/secure_closet/cmo, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -30663,7 +30663,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4; name = "CORPSE disposal unit" }, @@ -35898,7 +35898,7 @@ "cyq" = ( /obj/structure/table, /obj/item/aicard, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "cys" = ( @@ -38672,7 +38672,7 @@ name = "Security Blast Door" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cHX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38815,7 +38815,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1 }, /obj/effect/turf_decal/delivery/red/hollow, @@ -45522,7 +45522,7 @@ "djh" = ( /obj/machinery/firealarm/directional/north, /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/book/manual/wiki/sop_service, /obj/item/pen/blue{ pixel_y = 4 @@ -46937,7 +46937,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "doh" = ( /obj/structure/cable{ icon_state = "0-2" @@ -49893,7 +49893,7 @@ /area/station/maintenance/aft) "elE" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/assembly/timer, /obj/item/hand_labeler, /turf/simulated/floor/carpet/black, @@ -50714,7 +50714,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "eIN" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/maintenance, @@ -52051,7 +52051,7 @@ dir = 1; icon_state = "rampbottom" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "fqr" = ( /turf/simulated/wall/r_wall, /area/station/hallway/secondary/entry/south) @@ -54561,7 +54561,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "gIc" = ( /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/east) @@ -56746,7 +56746,7 @@ /obj/structure/sign/poster/official/do_not_question{ pixel_y = -31 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8; name = "CORPSE disposal unit" }, @@ -58706,7 +58706,7 @@ name = "Security Blast Door" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "iSv" = ( /obj/structure/chair{ dir = 4 @@ -58978,7 +58978,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "iZV" = ( /obj/effect/spawner/random/barrier/grille_often, /obj/effect/decal/cleanable/dirt, @@ -59336,7 +59336,7 @@ "jkP" = ( /obj/structure/table/glass, /obj/item/restraints/handcuffs/cable/zipties, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -59520,7 +59520,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "jot" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -60009,7 +60009,7 @@ /area/station/science/robotics) "jAN" = ( /obj/structure/bed/dogbed/ian, -/mob/living/simple_animal/pet/dog/corgi/Ian, +/mob/living/simple_animal/pet/dog/corgi/ian, /obj/structure/sign/poster/official/random{ pixel_x = -32 }, @@ -61581,7 +61581,7 @@ dir = 4; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ksj" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = 32 @@ -61899,7 +61899,7 @@ /area/station/supply/storage) "kBH" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4; name = "CORPSE disposal unit" }, @@ -62630,7 +62630,7 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "kTA" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -64089,7 +64089,7 @@ name = "Security Blast Door" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "lGO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 @@ -65181,7 +65181,7 @@ "miB" = ( /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 }, @@ -65347,7 +65347,7 @@ /obj/item/storage/fancy/cigarettes{ pixel_x = 14 }, -/mob/living/simple_animal/parrot/Poly, +/mob/living/simple_animal/parrot/poly, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -66521,7 +66521,7 @@ /turf/simulated/floor/plating, /area/station/science/xenobiology) "mSV" = ( -/mob/living/simple_animal/pet/cat/Var, +/mob/living/simple_animal/pet/cat/var_cat, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "mTj" = ( @@ -68054,7 +68054,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/mob/living/simple_animal/pet/cat/Runtime, +/mob/living/simple_animal/pet/cat/runtime, /turf/simulated/floor/plasteel{ icon_state = "darkbluefull" }, @@ -68298,7 +68298,7 @@ name = "Security Blast Door" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "nXc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ @@ -69557,7 +69557,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/atmos) "oyO" = ( -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ dir = 9; @@ -71518,7 +71518,7 @@ name = "Security Blast Door" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "pzh" = ( /obj/machinery/power/apc/directional/north, /obj/structure/cable{ @@ -72055,7 +72055,7 @@ "pOK" = ( /obj/structure/closet/wardrobe/white, /obj/item/clothing/shoes/jackboots, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /obj/item/reagent_containers/drinks/cans/badminbrew, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -75069,7 +75069,7 @@ /turf/simulated/floor/plating, /area/station/engineering/hardsuitstorage) "riG" = ( -/mob/living/simple_animal/pet/dog/fox/Renault, +/mob/living/simple_animal/pet/dog/fox/renault, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -77224,7 +77224,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ssc" = ( /turf/simulated/wall, /area/station/medical/surgery) @@ -78071,11 +78071,11 @@ pixel_x = -28 }, /obj/structure/table/glass/reinforced, -/obj/item/aiModule/corp{ +/obj/item/ai_module/corp{ pixel_y = 3; pixel_x = 3 }, -/obj/item/aiModule/nanotrasen, +/obj/item/ai_module/nanotrasen, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -79981,7 +79981,7 @@ name = "Security Blast Door" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "tSR" = ( /obj/structure/cable{ icon_state = "1-2" @@ -80643,7 +80643,7 @@ /area/station/maintenance/asmaint) "ulE" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -81120,11 +81120,11 @@ "uzd" = ( /obj/machinery/alarm/directional/west, /obj/structure/table/glass/reinforced, -/obj/item/aiModule/crewsimov{ +/obj/item/ai_module/crewsimov{ pixel_y = 3; pixel_x = -3 }, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -81242,7 +81242,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "uCK" = ( /obj/structure/closet/wardrobe/white, /turf/simulated/floor/plating, @@ -81715,7 +81715,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "uTX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -82799,7 +82799,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/south) "vwC" = ( -/obj/structure/closet/secure_closet/RD, +/obj/structure/closet/secure_closet/rd, /obj/machinery/light_switch{ dir = 4; name = "west bump"; @@ -84075,7 +84075,7 @@ }, /area/station/medical/virology) "whv" = ( -/obj/machinery/computer/HolodeckControl{ +/obj/machinery/computer/holodeck_control{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -84526,7 +84526,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "wuf" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -86188,7 +86188,7 @@ network = list("Research","SS13") }, /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index ab8731371b72..ae232aa9a222 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -84,7 +84,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/northwest) "aaH" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /obj/structure/disposalpipe/trunk{ @@ -105,7 +105,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /turf/simulated/floor/plating, @@ -378,7 +378,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/north) "acm" = ( -/obj/machinery/disposal/deliveryChute, +/obj/machinery/disposal/delivery_chute, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -1900,13 +1900,13 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /turf/simulated/floor/plating, /area/station/maintenance/disposal/northeast) "amw" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /obj/structure/disposalpipe/trunk{ @@ -2370,8 +2370,8 @@ /area/station/maintenance/disposal/northeast) "apz" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, -/obj/item/destTagger, +/obj/item/stack/package_wrap, +/obj/item/dest_tagger, /obj/item/eftpos, /turf/simulated/floor/carpet/black, /area/station/service/chapel/office) @@ -2426,7 +2426,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/northeast) "apX" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /obj/structure/disposalpipe/trunk{ @@ -3299,7 +3299,7 @@ /turf/simulated/floor/plasteel/freezer, /area/station/command/office/captain) "awo" = ( -/obj/machinery/disposal/deliveryChute, +/obj/machinery/disposal/delivery_chute, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -3780,7 +3780,7 @@ /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "azT" = ( -/mob/living/simple_animal/pet/dog/fox/Renault, +/mob/living/simple_animal/pet/dog/fox/renault, /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "azW" = ( @@ -4058,8 +4058,8 @@ pixel_x = 8; pixel_y = 6 }, -/obj/item/destTagger, -/obj/item/stack/packageWrap, +/obj/item/dest_tagger, +/obj/item/stack/package_wrap, /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "aCj" = ( @@ -4376,7 +4376,7 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aEq" = ( /obj/structure/target_stake, /obj/machinery/magnetic_module, @@ -4958,8 +4958,8 @@ /area/station/public/locker) "aKe" = ( /obj/structure/table/wood, -/obj/item/destTagger, -/obj/item/stack/packageWrap, +/obj/item/dest_tagger, +/obj/item/stack/package_wrap, /turf/simulated/floor/carpet, /area/station/public/locker) "aKf" = ( @@ -5945,7 +5945,7 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aRb" = ( /obj/machinery/camera{ c_tag = "Brig Cell Block A WEST" @@ -5954,14 +5954,14 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aRd" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aRh" = ( /obj/structure/lattice, /obj/structure/railing, @@ -6116,7 +6116,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aSE" = ( /obj/machinery/camera{ c_tag = "Bridge East" @@ -6255,7 +6255,7 @@ dir = 4; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aTB" = ( /obj/machinery/shower{ pixel_y = 24 @@ -6299,7 +6299,7 @@ "aTX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aUb" = ( /obj/machinery/door/airlock{ id_tag = "b2" @@ -6369,7 +6369,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aUv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -6378,13 +6378,13 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aUw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aUx" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -6769,7 +6769,7 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "aXb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -8672,8 +8672,8 @@ /area/station/command/office/captain) "biY" = ( /obj/structure/table, -/obj/item/stack/packageWrap, -/obj/item/destTagger, +/obj/item/stack/package_wrap, +/obj/item/dest_tagger, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -9414,7 +9414,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /turf/simulated/floor/plating, @@ -10209,7 +10209,7 @@ pixel_y = 28; name = "custom placement" }, -/mob/living/simple_animal/pet/dog/corgi/Ian, +/mob/living/simple_animal/pet/dog/corgi/ian, /turf/simulated/floor/wood, /area/station/command/office/hop) "brZ" = ( @@ -10418,7 +10418,7 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "bsR" = ( /obj/effect/turf_decal/delivery, /obj/structure/bed/roller, @@ -11379,7 +11379,7 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "bxM" = ( /obj/machinery/light_switch{ pixel_y = 24; @@ -12018,7 +12018,7 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "bAx" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating/asteroid/ancient, @@ -13791,8 +13791,8 @@ /area/station/engineering/break_room/secondary) "bIG" = ( /obj/structure/table, -/obj/item/destTagger, -/obj/item/stack/packageWrap, +/obj/item/dest_tagger, +/obj/item/stack/package_wrap, /turf/simulated/floor/plasteel{ icon_state = "darkyellow" }, @@ -14276,8 +14276,8 @@ pixel_x = 2; pixel_y = 2 }, -/obj/item/destTagger, -/obj/item/stack/packageWrap, +/obj/item/dest_tagger, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ dir = 10; @@ -17955,7 +17955,7 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cex" = ( /obj/machinery/firealarm/directional/east, /turf/simulated/floor/wood, @@ -18081,7 +18081,7 @@ /obj/structure/cable/orange, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cfq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -19703,7 +19703,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "crh" = ( /obj/structure/table, /obj/machinery/alarm/directional/north, @@ -20320,7 +20320,7 @@ dir = 4; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cxd" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, @@ -20721,7 +20721,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cAr" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -20729,7 +20729,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cAs" = ( /obj/machinery/light_switch{ pixel_y = 24; @@ -20739,7 +20739,7 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cAz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/l3closet/scientist, @@ -20757,13 +20757,13 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cAC" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cAI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20813,14 +20813,14 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cBb" = ( /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cBe" = ( /turf/simulated/wall/r_wall, /area/station/maintenance/disposal/external/southeast) @@ -20951,7 +20951,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cBV" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -20967,7 +20967,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cCc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -21004,7 +21004,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cCD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ @@ -21355,7 +21355,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cFh" = ( /obj/structure/chair/stool{ dir = 8 @@ -21393,7 +21393,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cFm" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -21410,7 +21410,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cFn" = ( /obj/structure/table, /obj/structure/cable/orange, @@ -21446,7 +21446,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cFu" = ( /obj/structure/table/glass, /obj/item/storage/box/syringes, @@ -21503,7 +21503,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cFE" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -21555,7 +21555,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cFY" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -21573,7 +21573,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cFZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21596,7 +21596,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cGc" = ( /obj/machinery/status_display{ layer = 4 @@ -21622,7 +21622,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cGn" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21637,7 +21637,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cGq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22692,7 +22692,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cLH" = ( /obj/structure/girder, /obj/item/stack/sheet/metal, @@ -22988,7 +22988,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cNH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -22999,7 +22999,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cNK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23042,14 +23042,14 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cNQ" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cNR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/chair/sofa/corp/right{ @@ -23057,7 +23057,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cNX" = ( /obj/structure/cable{ icon_state = "1-2" @@ -23078,13 +23078,13 @@ /area/station/service/theatre) "cOh" = ( /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cOl" = ( /obj/structure/cable/orange{ icon_state = "1-4" }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cOo" = ( /obj/machinery/door/airlock/external/glass{ name = "Escape Pod Airlock" @@ -24049,7 +24049,7 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cTf" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -24072,7 +24072,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cTh" = ( /turf/simulated/wall, /area/station/maintenance/disposal/south) @@ -24100,7 +24100,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cTn" = ( /obj/machinery/light/small{ dir = 8 @@ -24120,7 +24120,7 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cTp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -24130,12 +24130,12 @@ dir = 5 }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cTr" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cTs" = ( /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/nitrogen, @@ -24154,7 +24154,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cTz" = ( /obj/machinery/power/apc/directional/east, /obj/structure/cable/orange{ @@ -25046,7 +25046,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cYs" = ( /obj/item/pickaxe, /obj/item/pickaxe, @@ -25405,7 +25405,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dda" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -25450,7 +25450,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ddl" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable/orange{ @@ -25997,7 +25997,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dfb" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/carpet/cyan, @@ -26019,7 +26019,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dfg" = ( /obj/structure/table, /obj/item/storage/toolbox/electrical, @@ -26035,7 +26035,7 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dfF" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -26044,7 +26044,7 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dfG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -26129,14 +26129,14 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dgF" = ( /obj/structure/disposalpipe/segment/corner, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dgI" = ( /obj/machinery/power/treadmill, /obj/machinery/treadmill_monitor{ @@ -26148,7 +26148,7 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dgL" = ( /obj/effect/spawner/airlock/w_to_e, /obj/effect/spawner/window/reinforced/grilled, @@ -26170,7 +26170,7 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dgW" = ( /obj/machinery/economy/vending/autodrobe{ desc = "A vending machine for costumes. The machine seems blessed by some higher power, allowing it to function without power. HONK!"; @@ -26197,7 +26197,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dha" = ( /obj/structure/closet/firecloset/full, /turf/simulated/floor/plating, @@ -26212,7 +26212,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dhf" = ( /obj/machinery/light/small, /obj/structure/cable/orange{ @@ -26285,7 +26285,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dhC" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -26302,7 +26302,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dhE" = ( /obj/structure/sign/electricshock{ pixel_y = -32 @@ -26328,7 +26328,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dib" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -26761,7 +26761,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dlx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28822,7 +28822,7 @@ "dyM" = ( /obj/structure/table, /obj/item/aicard, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "dyQ" = ( @@ -30044,7 +30044,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dKv" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -30673,7 +30673,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dRV" = ( /obj/machinery/power/transmission_laser/north, /obj/structure/cable/yellow{ @@ -30747,7 +30747,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dSH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -30975,7 +30975,7 @@ }, /area/station/hallway/spacebridge/scidock) "dVr" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ desc = "A chute for big and small criminals alike!"; name = "Criminal Delivery Chute" }, @@ -31047,7 +31047,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dWD" = ( /turf/simulated/wall, /area/station/hallway/primary/central/west) @@ -31166,7 +31166,7 @@ }, /area/station/medical/break_room) "dYn" = ( -/obj/machinery/disposal/deliveryChute, +/obj/machinery/disposal/delivery_chute, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -31701,12 +31701,12 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ejk" = ( /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8; name = "cadaver delivery chute" }, @@ -32287,8 +32287,8 @@ /turf/space, /area/space/nearstation) "euZ" = ( -/obj/item/destTagger, -/obj/item/stack/packageWrap, +/obj/item/dest_tagger, +/obj/item/stack/package_wrap, /obj/item/book/manual/hydroponics_pod_people, /obj/item/book/manual/hydroponics_pod_people, /obj/item/book/manual/wiki/hydroponics, @@ -33849,7 +33849,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8; name = "cadaver delivery chute" }, @@ -34150,7 +34150,7 @@ dir = 1; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "eXl" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -34397,8 +34397,8 @@ /turf/simulated/floor/plating, /area/station/engineering/smes) "fcE" = ( -/obj/item/stack/packageWrap, -/obj/item/destTagger, +/obj/item/stack/package_wrap, +/obj/item/dest_tagger, /obj/structure/shelf/command, /turf/simulated/floor/plasteel{ dir = 1; @@ -34890,7 +34890,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "fmz" = ( /obj/structure/closet/firecloset/full, /turf/simulated/floor/plating, @@ -35271,7 +35271,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "fsq" = ( /obj/structure/transit_tube/horizontal, /turf/space, @@ -36397,7 +36397,7 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "fMz" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -36893,7 +36893,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "fSN" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -37589,7 +37589,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "gec" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -38072,7 +38072,7 @@ "goe" = ( /obj/structure/sign/security, /turf/simulated/wall/r_wall, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "gor" = ( /obj/machinery/door/airlock/maintenance{ name = "Fore Asteroid Maintenance Access" @@ -38507,7 +38507,7 @@ /area/station/maintenance/port) "gvY" = ( /obj/structure/table, -/obj/item/aiModule/nanotrasen, +/obj/item/ai_module/nanotrasen, /obj/machinery/ai_status_display{ pixel_y = 32 }, @@ -38839,7 +38839,7 @@ dir = 4; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "gAS" = ( /obj/machinery/ai_status_display, /turf/simulated/wall, @@ -39635,7 +39635,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "gMG" = ( /obj/structure/table/wood, /obj/item/flashlight/lantern, @@ -40107,7 +40107,7 @@ }, /area/station/engineering/break_room/secondary) "gVo" = ( -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_y = 7 }, /obj/item/hand_labeler, @@ -40160,9 +40160,9 @@ /obj/structure/closet/wardrobe/white, /obj/item/clothing/shoes/jackboots, /obj/item/reagent_containers/drinks/cans/badminbrew, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /turf/simulated/floor/plating, /area/station/maintenance/port) "gXb" = ( @@ -41889,7 +41889,7 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "hyY" = ( /obj/machinery/door/airlock/maintenance{ name = "Fore Asteroid Maintenance Access" @@ -42885,7 +42885,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "hMY" = ( -/obj/structure/closet/secure_closet/RD, +/obj/structure/closet/secure_closet/rd, /obj/item/cartridge/signal/toxins, /obj/item/cartridge/signal/toxins, /obj/item/cartridge/signal/toxins, @@ -43440,7 +43440,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "hTy" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /obj/structure/disposalpipe/trunk{ @@ -44546,7 +44546,7 @@ }, /area/station/command/bridge) "iky" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ desc = "A chute for big and small criminals alike!"; name = "Criminal Delivery Chute" }, @@ -45634,7 +45634,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "izC" = ( /turf/simulated/mineral/ancient, /area/station/hallway/primary/aft/east) @@ -46584,7 +46584,7 @@ pixel_y = 32 }, /obj/structure/table, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /turf/simulated/floor/plasteel{ icon_state = "bcircuit" }, @@ -46759,7 +46759,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "iQh" = ( /obj/machinery/light/small{ dir = 4 @@ -46807,7 +46807,7 @@ "iQT" = ( /obj/effect/turf_decal/stripes, /obj/effect/turf_decal/stripes/red, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ desc = "A chute for big and small criminals alike!"; dir = 4; name = "Criminal Delivery Chute" @@ -49485,7 +49485,7 @@ icon_state = "0-2" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "jzW" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -49733,7 +49733,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "jCK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -51189,7 +51189,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "jYh" = ( /obj/structure/closet/secure_closet/brig, /turf/simulated/floor/plasteel, @@ -51561,7 +51561,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "kei" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -53320,8 +53320,8 @@ "kHZ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table, -/obj/item/destTagger, -/obj/item/stack/packageWrap, +/obj/item/dest_tagger, +/obj/item/stack/package_wrap, /obj/structure/disposalpipe/segment/corner{ dir = 8 }, @@ -54715,7 +54715,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "led" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1 }, /obj/structure/disposalpipe/trunk, @@ -55901,7 +55901,7 @@ icon_state = "0-8" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "lvw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -58157,7 +58157,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "met" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -58326,7 +58326,7 @@ dir = 4; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "mhA" = ( /turf/simulated/floor/plating{ icon_state = "asteroidplating" @@ -60121,7 +60121,7 @@ /area/station/maintenance/maintcentral) "mJT" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/book/manual/barman_recipes, /obj/item/book/manual/wiki/sop_service, /obj/item/lighter/zippo, @@ -60698,7 +60698,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/mob/living/simple_animal/parrot/Poly, +/mob/living/simple_animal/parrot/poly, /turf/simulated/floor/plasteel, /area/station/command/office/ce) "mTc" = ( @@ -61035,7 +61035,7 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "mYc" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -61113,7 +61113,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "mYT" = ( /obj/structure/closet/secure_closet/bar, /obj/item/radio/intercom{ @@ -61157,7 +61157,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "mZu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -61364,7 +61364,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ncV" = ( /obj/structure/sign/securearea, /turf/simulated/wall, @@ -62199,7 +62199,7 @@ /area/station/maintenance/apmaint) "ntb" = ( /obj/structure/table, -/obj/item/aiModule/crewsimov, +/obj/item/ai_module/crewsimov, /obj/machinery/camera{ c_tag = "AI Upload Chamber"; dir = 4; @@ -63411,7 +63411,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "nNx" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -65013,7 +65013,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ooG" = ( /obj/machinery/iv_drip, /obj/item/radio/intercom{ @@ -67063,7 +67063,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "oVj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock, @@ -67665,8 +67665,8 @@ /area/station/hallway/secondary/exit) "pdC" = ( /obj/structure/table/wood, -/obj/item/destTagger, -/obj/item/stack/packageWrap, +/obj/item/dest_tagger, +/obj/item/stack/package_wrap, /obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 @@ -67727,7 +67727,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "peD" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -67759,7 +67759,7 @@ }, /area/station/supply/storage) "peL" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1 }, /obj/structure/disposalpipe/trunk, @@ -68053,7 +68053,7 @@ /area/station/hallway/primary/central/west) "pjU" = ( /obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1 }, /turf/simulated/floor/plating/airless, @@ -68079,7 +68079,7 @@ }, /area/station/service/chapel) "pkm" = ( -/obj/machinery/disposal/deliveryChute, +/obj/machinery/disposal/delivery_chute, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -68461,9 +68461,9 @@ /obj/item/hand_labeler_refill, /obj/item/hand_labeler_refill, /obj/item/hand_labeler, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/machinery/light, -/obj/item/destTagger, +/obj/item/dest_tagger, /obj/structure/sign/poster/official/safety_eye_protection{ pixel_y = -32 }, @@ -68742,7 +68742,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ptz" = ( /obj/machinery/door/airlock/engineering{ name = "Power Transmission Laser" @@ -69770,7 +69770,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "pJQ" = ( /obj/structure/closet/coffin, /turf/simulated/floor/plasteel{ @@ -70947,7 +70947,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "pXZ" = ( /obj/structure/girder, /obj/structure/grille, @@ -71876,8 +71876,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/storage) "qlu" = ( -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler{ pixel_y = 6 }, @@ -71885,11 +71885,11 @@ pixel_x = -6; pixel_y = 6 }, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 }, -/obj/item/destTagger, +/obj/item/dest_tagger, /obj/structure/table, /obj/item/radio/intercom{ name = "north bump"; @@ -72329,7 +72329,7 @@ dir = 1; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "qsf" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -72566,7 +72566,7 @@ dir = 8; icon_state = "darkredcorners" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "qvh" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -73753,7 +73753,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "qNN" = ( /obj/machinery/light{ dir = 4 @@ -74899,7 +74899,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "riS" = ( /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, @@ -75954,7 +75954,7 @@ }, /area/station/maintenance/fore) "rBn" = ( -/obj/machinery/disposal/deliveryChute, +/obj/machinery/disposal/delivery_chute, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -76233,7 +76233,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /turf/simulated/floor/plating/airless, @@ -76829,7 +76829,7 @@ /turf/simulated/floor/carpet/cyan, /area/station/public/fitness) "rOX" = ( -/obj/structure/closet/secure_closet/CMO, +/obj/structure/closet/secure_closet/cmo, /obj/machinery/alarm/directional/east, /obj/machinery/light{ dir = 4 @@ -77059,7 +77059,7 @@ "rRO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/mob/living/simple_animal/mouse/brown/Tom, +/mob/living/simple_animal/mouse/brown/tom, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "vault" @@ -79203,7 +79203,7 @@ /obj/structure/sign/kiddieplaque{ pixel_x = 32 }, -/obj/item/aiModule/corp, +/obj/item/ai_module/corp, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -81784,7 +81784,7 @@ dir = 6 }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "tkg" = ( /obj/machinery/door/poddoor/shutters{ dir = 2; @@ -81832,7 +81832,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "tla" = ( /obj/structure/lattice, /obj/item/storage/toolbox/electrical, @@ -82033,7 +82033,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "tpg" = ( /obj/structure/disposalpipe/segment/corner{ dir = 4 @@ -82283,7 +82283,7 @@ }, /area/station/science/toxins/launch) "tsz" = ( -/obj/machinery/computer/HolodeckControl{ +/obj/machinery/computer/holodeck_control{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -82415,8 +82415,8 @@ }, /obj/structure/table, /obj/item/book/manual/engineering_particle_accelerator, -/obj/item/destTagger, -/obj/item/stack/packageWrap, +/obj/item/dest_tagger, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ icon_state = "darkyellow"; @@ -82746,8 +82746,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/stack/packageWrap, -/obj/item/destTagger{ +/obj/item/stack/package_wrap, +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 }, @@ -83396,7 +83396,7 @@ dir = 8; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "tJP" = ( /obj/machinery/bluespace_beacon, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -84363,7 +84363,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/aft/west) "tYX" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ desc = "A chute for big and small criminals alike!"; name = "Criminal Delivery Chute" }, @@ -85030,7 +85030,7 @@ dir = 4; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "uhP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -85812,7 +85812,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "utP" = ( /obj/machinery/atmospherics/binary/pump{ dir = 4; @@ -86562,7 +86562,7 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "uCU" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8; name = "cadaver delivery chute" }, @@ -87274,7 +87274,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "uPq" = ( /obj/structure/chair/sofa{ dir = 8 @@ -89583,7 +89583,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8; name = "cadaver delivery chute" }, @@ -90495,7 +90495,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -90919,7 +90919,7 @@ dir = 4; color = "#954535" }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ desc = "A chute for big and small criminals alike!"; dir = 4; name = "Criminal Delivery Chute" @@ -92354,7 +92354,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "wnJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -94698,7 +94698,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "wUV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -94885,7 +94885,7 @@ dir = 4; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "wYn" = ( /obj/structure/disposalpipe/segment{ color = "#954535" @@ -95136,7 +95136,7 @@ /area/station/maintenance/port2) "xbm" = ( /obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1 }, /turf/simulated/floor/plating/airless, @@ -95738,7 +95738,7 @@ /area/station/maintenance/disposal/northeast) "xla" = ( /turf/simulated/wall/r_wall, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "xlF" = ( /obj/machinery/computer/operating, /turf/simulated/floor/plasteel{ @@ -98190,7 +98190,7 @@ dir = 4; icon_state = "redcorner" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "xWe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machine_frame, @@ -99303,7 +99303,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "ylX" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8; name = "cadaver delivery chute" }, diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index d037ee66bfec..7b7e23b670c2 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -2824,7 +2824,7 @@ /area/station/command/customs) "aqT" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ dir = 4; @@ -4161,7 +4161,7 @@ /area/station/maintenance/fore2) "auy" = ( /obj/structure/table/wood, -/obj/item/toy/AI, +/obj/item/toy/ai, /obj/machinery/light/small{ dir = 4 }, @@ -5921,7 +5921,7 @@ /area/station/supply/warehouse) "azG" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/door_control{ id = "qm_warehouse"; @@ -7251,7 +7251,7 @@ /area/station/maintenance/abandoned_garden) "aDr" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/item/food/grown/tea, /obj/item/food/grown/grapes, @@ -10135,7 +10135,7 @@ /area/station/service/bar) "aLP" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/simulated/floor/plasteel/dark, /area/station/service/bar) @@ -11525,7 +11525,7 @@ }, /obj/structure/table, /obj/machinery/power/apc/directional/west, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ dir = 8; @@ -12180,7 +12180,7 @@ "aRM" = ( /obj/structure/table, /obj/item/folder/yellow, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = -4 }, /obj/item/rcs{ @@ -12211,7 +12211,7 @@ }, /area/station/supply/sorting) "aRP" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1 }, /obj/structure/disposalpipe/trunk{ @@ -12752,7 +12752,7 @@ /area/station/supply/storage) "aTt" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13033,7 +13033,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ dir = 10; @@ -14092,7 +14092,7 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/item/radio/intercom{ name = "east bump"; @@ -16700,7 +16700,7 @@ /area/station/service/kitchen) "bdN" = ( /obj/machinery/alarm/directional/west, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/item/book/manual/wiki/chef_recipes, /obj/effect/turf_decal/delivery/hollow, @@ -19363,7 +19363,7 @@ /area/station/supply/lobby) "bls" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/light{ dir = 8 @@ -22317,7 +22317,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/item/book/manual/hydroponics_pod_people, /obj/effect/turf_decal/delivery/hollow, @@ -24176,7 +24176,7 @@ }, /obj/item/flash, /obj/item/storage/box/ids, -/obj/item/storage/box/PDAs{ +/obj/item/storage/box/pdas{ pixel_x = 4; pixel_y = 4 }, @@ -24603,7 +24603,7 @@ /area/station/maintenance/fore) "bAp" = ( /obj/structure/table/reinforced, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /obj/item/flash, /obj/item/flash, /obj/effect/turf_decal/delivery, @@ -27332,7 +27332,7 @@ /area/station/engineering/tech_storage) "bGZ" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, @@ -29492,7 +29492,7 @@ /turf/simulated/floor/wood, /area/station/command/meeting_room) "bMW" = ( -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /obj/structure/table/glass, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai_upload) @@ -29516,7 +29516,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai_upload) "bNa" = ( -/obj/item/aiModule/nanotrasen, +/obj/item/ai_module/nanotrasen, /obj/structure/table/glass, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai_upload) @@ -30109,7 +30109,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "bOO" = ( -/obj/item/aiModule/crewsimov, +/obj/item/ai_module/crewsimov, /obj/structure/table/glass, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai_upload) @@ -30139,7 +30139,7 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bOS" = ( -/obj/item/aiModule/corp, +/obj/item/ai_module/corp, /obj/structure/table/glass, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai_upload) @@ -30155,7 +30155,7 @@ name = "west bump"; pixel_x = -28 }, -/mob/living/simple_animal/pet/dog/fox/Renault, +/mob/living/simple_animal/pet/dog/fox/renault, /turf/simulated/floor/plasteel/dark, /area/station/command/office/captain) "bOV" = ( @@ -30265,7 +30265,7 @@ /area/station/public/storage/tools/auxiliary) "bPh" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ @@ -35279,7 +35279,7 @@ /obj/item/clipboard, /obj/item/toy/figure/crew/hop, /obj/item/megaphone, -/obj/item/storage/box/PDAs, +/obj/item/storage/box/pdas, /obj/item/storage/box/ids, /turf/simulated/floor/wood, /area/station/command/office/hop) @@ -36798,7 +36798,7 @@ "ciE" = ( /obj/structure/bed/dogbed/ian, /obj/machinery/alarm/directional/east, -/mob/living/simple_animal/pet/dog/corgi/Ian, +/mob/living/simple_animal/pet/dog/corgi/ian, /turf/simulated/floor/wood, /area/station/command/office/hop) "ciF" = ( @@ -37378,7 +37378,7 @@ /area/station/command/teleporter) "ckA" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/structure/extinguisher_cabinet{ name = "north bump"; @@ -42498,7 +42498,7 @@ /area/station/engineering/hardsuitstorage) "czr" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ @@ -43751,7 +43751,7 @@ /area/station/public/fitness) "cDs" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/newscaster{ dir = 8; @@ -43935,7 +43935,7 @@ /area/station/engineering/hardsuitstorage) "cDN" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -45129,7 +45129,7 @@ }, /area/station/public/fitness) "cHb" = ( -/obj/machinery/computer/HolodeckControl{ +/obj/machinery/computer/holodeck_control{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -48233,7 +48233,7 @@ pixel_x = -5; pixel_y = 5 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -49544,7 +49544,7 @@ /area/station/public/fitness) "cXP" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/simulated/floor/plasteel, /area/station/public/fitness) "cXQ" = ( @@ -51002,7 +51002,7 @@ /area/station/science/rnd) "ddD" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -52584,7 +52584,7 @@ name = "west bump"; pixel_x = -30 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/stack/sheet/metal{ amount = 50 }, @@ -53231,7 +53231,7 @@ /area/station/maintenance/port2) "dmV" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel/white, @@ -53882,7 +53882,7 @@ name = "west bump"; pixel_x = -30 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel/white, @@ -54314,7 +54314,7 @@ }, /area/station/science/research) "dsv" = ( -/obj/structure/closet/secure_closet/RD, +/obj/structure/closet/secure_closet/rd, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -58499,7 +58499,7 @@ /area/station/maintenance/solar_maintenance/aft_port) "dQN" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/item/reagent_containers/drinks/coffee, /obj/effect/decal/cleanable/cobweb, @@ -60844,7 +60844,7 @@ dir = 1; layer = 2.9 }, -/mob/living/simple_animal/crab/Coffee, +/mob/living/simple_animal/crab/coffee, /turf/simulated/floor/beach/water{ icon_state = "seadeep" }, @@ -61186,7 +61186,7 @@ pixel_x = -3; pixel_y = 5 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler{ pixel_x = 2; pixel_y = 3 @@ -62838,7 +62838,7 @@ pixel_x = -3; pixel_y = 5 }, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -76306,7 +76306,7 @@ }, /area/station/security/prisonershuttle) "nEb" = ( -/obj/structure/closet/secure_closet/CMO, +/obj/structure/closet/secure_closet/cmo, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkblue" @@ -82013,7 +82013,7 @@ /area/station/security/permabrig) "rbC" = ( /obj/structure/bed/dogbed, -/mob/living/simple_animal/mouse/white/Brain, +/mob/living/simple_animal/mouse/white/brain, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -84825,7 +84825,7 @@ "szb" = ( /obj/structure/table, /obj/item/clothing/accessory/armband/science, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/book/manual/wiki/sop_science, /turf/simulated/floor/plasteel{ dir = 4; @@ -85486,7 +85486,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom/gallery) "sQA" = ( -/mob/living/simple_animal/parrot/Poly, +/mob/living/simple_animal/parrot/poly, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -85939,7 +85939,7 @@ c_tag = "Vault"; dir = 4 }, -/mob/living/simple_animal/mouse/brown/Tom, +/mob/living/simple_animal/mouse/brown/tom, /turf/simulated/floor/plasteel/dark, /area/station/command/vault) "tdA" = ( @@ -87687,7 +87687,7 @@ /area/station/science/storage) "ueK" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/item/crowbar, /obj/machinery/newscaster{ @@ -88284,7 +88284,7 @@ dir = 6 }, /obj/structure/table/glass, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/reagent_scanner/adv, /turf/simulated/floor/engine, /area/station/medical/chemistry) @@ -90079,7 +90079,7 @@ /area/station/maintenance/fsmaint) "vET" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/newscaster{ name = "north bump"; @@ -91405,7 +91405,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm/directional/south, /obj/item/hand_labeler, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "wsg" = ( diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 21ad9f3c583e..330a7665a40f 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -897,7 +897,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "alr" = ( -/mob/living/simple_animal/mouse/brown/Tom, +/mob/living/simple_animal/mouse/brown/tom, /turf/simulated/floor/greengrid, /area/station/command/vault) "alG" = ( @@ -8977,7 +8977,7 @@ /area/station/engineering/tech_storage) "bLV" = ( /obj/structure/table/reinforced, -/mob/living/simple_animal/parrot/Poly, +/mob/living/simple_animal/parrot/poly, /obj/item/clothing/glasses/meson{ pixel_y = 4 }, @@ -9937,7 +9937,7 @@ /area/station/hallway/secondary/exit) "bUT" = ( /obj/structure/table/glass/reinforced, -/obj/item/aiModule/corp{ +/obj/item/ai_module/corp{ pixel_y = 3; pixel_x = 3 }, @@ -10144,7 +10144,7 @@ }, /area/station/hallway/spacebridge/security/west) "bWu" = ( -/obj/structure/closet/secure_closet/CMO, +/obj/structure/closet/secure_closet/cmo, /turf/simulated/floor/wood, /area/station/command/office/cmo) "bWE" = ( @@ -11195,7 +11195,7 @@ /area/station/security/permabrig) "chI" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler{ pixel_y = 3; pixel_x = 2 @@ -17287,7 +17287,7 @@ /area/station/maintenance/security/fore) "dut" = ( /obj/structure/bed/dogbed, -/mob/living/simple_animal/mouse/white/Brain, +/mob/living/simple_animal/mouse/white/brain, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 @@ -21258,7 +21258,7 @@ /turf/space, /area/space) "elV" = ( -/obj/machinery/disposal/deliveryChute, +/obj/machinery/disposal/delivery_chute, /obj/structure/disposalpipe/trunk{ dir = 2 }, @@ -27971,7 +27971,7 @@ /area/station/supply/storage) "fzi" = ( /obj/structure/rack, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/light/small{ dir = 4 @@ -30221,7 +30221,7 @@ /area/station/security/warden) "fWd" = ( /obj/structure/rack, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, @@ -36058,7 +36058,7 @@ /area/station/maintenance/apmaint) "heF" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) @@ -39299,7 +39299,7 @@ /area/station/maintenance/asmaint) "hJu" = ( /obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/dog/fox/Renault, +/mob/living/simple_animal/pet/dog/fox/renault, /turf/simulated/floor/wood, /area/station/command/office/captain) "hJv" = ( @@ -40902,7 +40902,7 @@ "icI" = ( /obj/structure/closet/wardrobe/white, /obj/item/clothing/shoes/jackboots, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /obj/item/reagent_containers/drinks/cans/badminbrew, /obj/item/storage/backpack/duffel/medical, /turf/simulated/floor/plating, @@ -41852,7 +41852,7 @@ /area/station/engineering/break_room/secondary) "ilT" = ( /obj/structure/rack, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/effect/spawner/random/cobweb/left/rare, /obj/effect/decal/cleanable/dirt, @@ -42881,7 +42881,7 @@ dir = 8; pixel_x = -4 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ name = "CORPSE disposal unit" }, /obj/structure/disposalpipe/trunk, @@ -43832,9 +43832,9 @@ /area/station/maintenance/starboard) "iGm" = ( /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{ pixel_x = -3; pixel_y = 5 }, @@ -47418,7 +47418,7 @@ "jpt" = ( /obj/structure/table, /obj/item/aicard, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "jpv" = ( @@ -50455,7 +50455,7 @@ pixel_x = 6 }, /obj/item/reagent_containers/drinks/bottle/vodka, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "jTx" = ( @@ -51328,7 +51328,7 @@ pixel_y = 34 }, /obj/structure/table/wood, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/camera{ c_tag = "Bridge Conference Room" @@ -58213,7 +58213,7 @@ /area/station/maintenance/dorms/port) "lxE" = ( /obj/structure/bed/roller, -/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /obj/effect/decal/cleanable/blood/writing, /obj/machinery/light/small{ dir = 4; @@ -59716,7 +59716,7 @@ /area/station/security/brig) "lNR" = ( /obj/structure/table/glass/reinforced, -/obj/item/aiModule/crewsimov, +/obj/item/ai_module/crewsimov, /obj/machinery/light{ dir = 8 }, @@ -60540,7 +60540,7 @@ layer = 2.9 }, /obj/structure/table/glass/reinforced, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /obj/item/radio/intercom/private{ pixel_x = 28; pixel_y = -10 @@ -67144,7 +67144,7 @@ /area/station/medical/surgery/observation) "npG" = ( /obj/structure/table/reinforced, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 }, @@ -69865,7 +69865,7 @@ /obj/structure/table/glass, /obj/item/crowbar, /obj/item/wrench, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "greenblue" @@ -73124,7 +73124,7 @@ dir = 8 }, /obj/machinery/requests_console/directional/west, -/obj/item/storage/box/PDAs{ +/obj/item/storage/box/pdas{ pixel_x = 4; pixel_y = 4 }, @@ -73498,7 +73498,7 @@ }, /area/station/medical/reception) "oyR" = ( -/obj/machinery/computer/HolodeckControl{ +/obj/machinery/computer/holodeck_control{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -76704,7 +76704,7 @@ }, /area/station/science/xenobiology) "pcS" = ( -/mob/living/simple_animal/pet/cat/Var, +/mob/living/simple_animal/pet/cat/var_cat, /obj/structure/bed/dogbed, /turf/simulated/floor/carpet/royalblack, /area/station/maintenance/fsmaint) @@ -77036,7 +77036,7 @@ /area/station/hallway/secondary/entry/east) "pgd" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/structure/cable{ icon_state = "4-8" @@ -79341,7 +79341,7 @@ /area/station/engineering/engine) "pEJ" = ( /obj/structure/table, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 }, @@ -80677,8 +80677,8 @@ /area/station/maintenance/asmaint) "pSy" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, -/obj/item/destTagger, +/obj/item/stack/package_wrap, +/obj/item/dest_tagger, /obj/machinery/newscaster{ dir = 1; name = "south bump"; @@ -80893,7 +80893,7 @@ }, /area/station/security/warden) "pUT" = ( -/mob/living/simple_animal/crab/Coffee, +/mob/living/simple_animal/crab/coffee, /turf/simulated/floor/carpet/red, /area/station/public/fitness) "pUV" = ( @@ -83052,7 +83052,7 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/asmaint) "qsD" = ( -/obj/structure/closet/secure_closet/RD, +/obj/structure/closet/secure_closet/rd, /turf/simulated/floor/wood, /area/station/command/office/rd) "qsM" = ( @@ -86792,7 +86792,7 @@ /obj/item/stack/sheet/cardboard{ amount = 10 }, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = -4 }, /turf/simulated/floor/plasteel, @@ -92787,7 +92787,7 @@ "skf" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "skh" = ( @@ -95203,7 +95203,7 @@ /area/station/maintenance/security/fore) "sJb" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/light{ dir = 4 @@ -95888,7 +95888,7 @@ /area/station/command/office/hop) "sQX" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/status_display{ pixel_y = 32 @@ -98555,7 +98555,7 @@ /area/station/public/construction) "tpP" = ( /obj/structure/bed/dogbed/runtime, -/mob/living/simple_animal/pet/cat/Runtime, +/mob/living/simple_animal/pet/cat/runtime, /obj/item/toy/cattoy, /turf/simulated/floor/plasteel{ dir = 4; @@ -102598,7 +102598,7 @@ /area/station/medical/reception) "ugb" = ( /obj/structure/bed/dogbed/ian, -/mob/living/simple_animal/pet/dog/corgi/Ian, +/mob/living/simple_animal/pet/dog/corgi/ian, /obj/machinery/recharger/wallcharger{ pixel_y = 25 }, @@ -107471,7 +107471,7 @@ /turf/simulated/floor/carpet, /area/station/public/arcade) "veX" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4; pixel_x = -4 }, @@ -107926,12 +107926,12 @@ /area/station/engineering/atmos/control) "vkj" = ( /obj/structure/rack, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/radio/intercom{ name = "north bump"; pixel_y = 28 }, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 }, @@ -107994,7 +107994,7 @@ "vkO" = ( /obj/structure/table/glass/reinforced, /obj/structure/window/reinforced, -/obj/item/aiModule/nanotrasen, +/obj/item/ai_module/nanotrasen, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -109776,9 +109776,9 @@ dir = 8 }, /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/stack/wrapping_paper{ pixel_x = -3; pixel_y = 5 @@ -110868,8 +110868,8 @@ /area/station/maintenance/solar_maintenance/aft_starboard) "vMA" = ( /obj/structure/rack, -/obj/item/stack/packageWrap, -/obj/item/destTagger, +/obj/item/stack/package_wrap, +/obj/item/dest_tagger, /obj/machinery/status_display{ pixel_y = -32 }, @@ -110894,7 +110894,7 @@ /area/station/public/dorms) "vMI" = ( /obj/structure/table, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/machinery/light{ dir = 4 @@ -114377,7 +114377,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 }, @@ -114561,7 +114561,7 @@ /area/station/maintenance/abandoned_office) "wyb" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/storage/box/dice, /obj/machinery/firealarm/directional/south, /turf/simulated/floor/wood, @@ -120012,8 +120012,8 @@ /area/station/maintenance/abandoned_garden) "xEO" = ( /obj/structure/table, -/obj/item/stack/packageWrap, -/obj/item/destTagger{ +/obj/item/stack/package_wrap, +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 }, diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 509da27c5225..2e680e79c255 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -604,7 +604,7 @@ id = "Processing" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ahH" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -1287,7 +1287,7 @@ /turf/simulated/floor/plasteel, /area/station/public/fitness) "ami" = ( -/obj/machinery/computer/HolodeckControl{ +/obj/machinery/computer/holodeck_control{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -1867,7 +1867,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "apJ" = ( /obj/structure/sign/radiation/rad_area{ pixel_y = 32 @@ -3736,7 +3736,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "axZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -9348,7 +9348,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/item/aiModule/crewsimov, +/obj/item/ai_module/crewsimov, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "aUk" = ( @@ -9391,7 +9391,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/item/aiModule/nanotrasen, +/obj/item/ai_module/nanotrasen, /turf/simulated/floor/redgrid, /area/station/turret_protected/ai_upload) "aUp" = ( @@ -10458,7 +10458,7 @@ /area/station/supply/warehouse) "aXE" = ( /obj/structure/table, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /obj/machinery/light{ dir = 8 }, @@ -10500,7 +10500,7 @@ id = "AI"; pixel_y = -24 }, -/obj/item/aiModule/corp, +/obj/item/ai_module/corp, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -11499,7 +11499,7 @@ /area/station/hallway/secondary/entry/north) "baZ" = ( /obj/structure/closet/crate, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = 2; pixel_y = -3 }, @@ -12335,7 +12335,7 @@ "bdx" = ( /obj/structure/table, /obj/item/aicard, -/obj/item/aiModule/reset, +/obj/item/ai_module/reset, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -14354,7 +14354,7 @@ name = "south bump"; pixel_y = -28 }, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 }, @@ -14474,19 +14474,19 @@ /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "bjd" = ( -/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 }, -/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 }, @@ -14752,7 +14752,7 @@ /area/station/command/office/ce) "bjH" = ( /obj/structure/filingcabinet/chestdrawer, -/mob/living/simple_animal/parrot/Poly, +/mob/living/simple_animal/parrot/poly, /obj/machinery/keycard_auth{ pixel_y = -24 }, @@ -15031,7 +15031,7 @@ dir = 4 }, /obj/item/storage/box/lights/mixed, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/t_scanner, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/random{ @@ -15596,7 +15596,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -16906,23 +16906,23 @@ /obj/structure/table, /obj/item/stack/wrapping_paper, /obj/machinery/requests_console/directional/south, -/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 }, -/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 }, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = 2; pixel_y = -3 }, @@ -16936,7 +16936,7 @@ /obj/structure/table, /obj/item/storage/box, /obj/item/storage/box, -/obj/item/destTagger{ +/obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 }, @@ -18446,12 +18446,12 @@ /area/station/maintenance/starboard) "buz" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = 2; pixel_y = -3 }, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap{ pixel_x = -3; pixel_y = 5 }, @@ -19789,7 +19789,7 @@ /area/station/hallway/primary/port/east) "bye" = ( /obj/structure/bed/dogbed/ian, -/mob/living/simple_animal/pet/dog/corgi/Ian, +/mob/living/simple_animal/pet/dog/corgi/ian, /obj/machinery/status_display{ layer = 4; pixel_y = 32 @@ -21127,13 +21127,13 @@ /area/station/service/bar) "bCl" = ( /obj/item/hand_labeler, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/table/wood, /obj/item/eftpos, -/obj/item/storage/box/PDAs, +/obj/item/storage/box/pdas, /obj/item/storage/box/ids, /obj/item/storage/box/ids, /turf/simulated/floor/wood, @@ -22392,7 +22392,7 @@ dir = 1; pixel_y = -30 }, -/mob/living/simple_animal/pet/dog/fox/Renault, +/mob/living/simple_animal/pet/dog/fox/renault, /turf/simulated/floor/carpet, /area/station/command/office/captain) "bHD" = ( @@ -26715,7 +26715,7 @@ dir = 8 }, /obj/item/folder/blue, -/obj/item/clothing/head/collectable/HoP, +/obj/item/clothing/head/collectable/hop, /obj/structure/extinguisher_cabinet{ name = "west bump"; pixel_x = -27 @@ -26795,7 +26795,7 @@ }, /obj/item/gun/projectile/revolver/capgun, /obj/item/restraints/handcuffs/toy, -/obj/item/clothing/head/collectable/HoS, +/obj/item/clothing/head/collectable/hos, /obj/machinery/firealarm/directional/east, /obj/structure/cable{ icon_state = "1-2" @@ -30324,12 +30324,12 @@ /obj/structure/closet/crate/freezer, /obj/item/tank/internals/emergency_oxygen/engi/empty, /obj/item/tank/internals/emergency_oxygen/engi/empty, -/obj/item/reagent_containers/iv_bag/blood/AMinus, -/obj/item/reagent_containers/iv_bag/blood/APlus, -/obj/item/reagent_containers/iv_bag/blood/BMinus, -/obj/item/reagent_containers/iv_bag/blood/BPlus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OPlus, +/obj/item/reagent_containers/iv_bag/blood/a_minus, +/obj/item/reagent_containers/iv_bag/blood/a_plus, +/obj/item/reagent_containers/iv_bag/blood/b_minus, +/obj/item/reagent_containers/iv_bag/blood/b_plus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_plus, /obj/item/reagent_containers/iv_bag/blood/random, /obj/item/reagent_containers/iv_bag/blood/random, /obj/item/reagent_containers/iv_bag/blood/random, @@ -35353,7 +35353,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cHy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/turfs/burn, @@ -38084,7 +38084,7 @@ id = "Processing" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "cTq" = ( /obj/machinery/light{ dir = 8 @@ -39932,7 +39932,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ddk" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -40688,7 +40688,7 @@ pixel_y = 10 }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dif" = ( /obj/effect/spawner/airlock, /turf/simulated/wall, @@ -40699,7 +40699,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "dio" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -42846,7 +42846,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "eiI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -44626,7 +44626,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "eZr" = ( /obj/structure/closet/l3closet/scientist, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -47328,7 +47328,7 @@ dir = 8; icon_state = "red" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "gft" = ( /obj/machinery/atmospherics/unary/tank/air{ dir = 8 @@ -47641,11 +47641,11 @@ /area/station/security/permabrig) "gmy" = ( /obj/structure/table, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = -3; pixel_y = 5 }, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = 2; pixel_y = -3 }, @@ -47791,7 +47791,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 1 }, /obj/structure/window/reinforced{ @@ -47860,7 +47860,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "gst" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -49543,7 +49543,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "hgp" = ( /obj/structure/cable{ icon_state = "4-8" @@ -50193,7 +50193,7 @@ dir = 1 }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "hvr" = ( /obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, @@ -52043,7 +52043,7 @@ id = "Processing" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ikK" = ( /obj/machinery/atmospherics/trinary/filter{ dir = 4; @@ -52262,7 +52262,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "ioT" = ( /turf/simulated/floor/plasteel{ icon_state = "red" @@ -54339,7 +54339,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "jrE" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -54376,7 +54376,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "jsI" = ( /obj/machinery/light_switch{ name = "north bump"; @@ -55144,7 +55144,7 @@ /area/station/maintenance/fsmaint) "jJI" = ( /obj/structure/bed/dogbed/runtime, -/mob/living/simple_animal/pet/cat/Runtime, +/mob/living/simple_animal/pet/cat/runtime, /obj/item/toy/cattoy, /turf/simulated/floor/plasteel{ dir = 5; @@ -56196,7 +56196,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "kfn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -57063,7 +57063,7 @@ dir = 8; icon_state = "red" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "kCk" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = 32 @@ -58826,7 +58826,7 @@ icon_state = "1-8" }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "lmJ" = ( /obj/structure/chair/office/dark{ dir = 1 @@ -59328,7 +59328,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "lAQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -59443,7 +59443,7 @@ }, /area/station/aisat) "lCA" = ( -/mob/living/simple_animal/mouse/brown/Tom, +/mob/living/simple_animal/mouse/brown/tom, /obj/structure/sink{ pixel_y = 22 }, @@ -59633,7 +59633,7 @@ dir = 4; icon_state = "red" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "lGp" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = 32 @@ -59995,7 +59995,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/brig/temp/cell_2, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "lNT" = ( /obj/structure/rack, /obj/item/tank/internals/emergency_oxygen/nitrogen{ @@ -60388,7 +60388,7 @@ /area/station/maintenance/starboard2) "lXV" = ( /turf/simulated/wall/r_wall, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "lXW" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, @@ -60856,7 +60856,7 @@ /turf/simulated/floor/engine/air, /area/station/engineering/atmos) "mhm" = ( -/obj/structure/closet/secure_closet/CMO, +/obj/structure/closet/secure_closet/cmo, /obj/item/megaphone, /turf/simulated/floor/plasteel{ dir = 8; @@ -61122,7 +61122,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "mng" = ( /turf/simulated/floor/plating/airless, /area/station/science/toxins/launch) @@ -62181,7 +62181,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "mOt" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -62316,7 +62316,7 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "mQb" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4; name = "Prisoner Transfer" }, @@ -63089,7 +63089,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "nfe" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -63806,7 +63806,7 @@ /area/station/maintenance/fsmaint) "nvB" = ( /turf/simulated/wall, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "nvN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, @@ -64760,7 +64760,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "nSH" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -65045,7 +65045,7 @@ }, /area/station/hallway/primary/aft/north) "nYH" = ( -/obj/structure/closet/secure_closet/RD, +/obj/structure/closet/secure_closet/rd, /obj/machinery/newscaster{ dir = 4; name = "west bump"; @@ -66648,7 +66648,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "oQV" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -68145,11 +68145,11 @@ /area/station/maintenance/asmaint) "pyC" = ( /obj/structure/table/glass, -/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/item/book/manual/wiki/sop_service, /obj/structure/disposalpipe/segment{ @@ -68706,7 +68706,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "pKG" = ( /obj/structure/showcase{ density = 0; @@ -68744,7 +68744,7 @@ dir = 1 }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "pLH" = ( /obj/structure/rack, /obj/item/extinguisher, @@ -68844,7 +68844,7 @@ dir = 4; icon_state = "red" }, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "pOV" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -68870,7 +68870,7 @@ /obj/item/hand_labeler{ pixel_y = 11 }, -/obj/item/stack/packageWrap{ +/obj/item/stack/package_wrap{ pixel_x = 2; pixel_y = -3 }, @@ -69537,7 +69537,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "qdR" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/classic/reversed{ @@ -71636,7 +71636,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "rbo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -72105,7 +72105,7 @@ /area/station/public/locker) "rmn" = ( /obj/structure/table/reinforced, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/item/radio/intercom{ name = "south bump"; @@ -74954,7 +74954,7 @@ layer = 3; dir = 4 }, -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /obj/structure/disposalpipe/trunk{ @@ -76732,7 +76732,7 @@ pixel_x = 32 }, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "tnr" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/atmospherics/binary/pump/on{ @@ -76877,7 +76877,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "tqh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -77623,8 +77623,8 @@ "tMV" = ( /obj/structure/rack, /obj/item/hand_labeler, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/book/manual/wiki/sop_service, /obj/item/storage/box/donkpockets, /obj/machinery/firealarm/directional/south, @@ -78524,7 +78524,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "uhO" = ( /obj/structure/cable{ icon_state = "0-2" @@ -79528,7 +79528,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "uJy" = ( /obj/machinery/door/airlock/external{ id_tag = "laborcamp_home"; @@ -80471,7 +80471,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/brig/temp/cell_4, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "vbV" = ( /obj/structure/cable{ icon_state = "1-2" @@ -83092,7 +83092,7 @@ }, /area/station/science/toxins/launch) "wuc" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/machinery/disposal/delivery_chute{ dir = 4 }, /obj/structure/window/reinforced{ @@ -83316,7 +83316,7 @@ }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "wyX" = ( /obj/machinery/camera{ c_tag = "Xenobiology Lab - Central Aft"; @@ -83970,8 +83970,8 @@ }, /obj/item/radio/headset/headset_med, /obj/item/hand_labeler, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner"; @@ -84445,7 +84445,7 @@ id = "Processing" }, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "xbs" = ( /obj/structure/dispenser, /obj/effect/turf_decal/stripes/white/line{ @@ -84919,7 +84919,7 @@ }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "xlS" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 1; @@ -86426,7 +86426,7 @@ }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prison/cell_block/A) +/area/station/security/prison/cell_block/a) "xWl" = ( /obj/machinery/access_button{ autolink_id = "enginesm_btn_ext"; diff --git a/code/__DEFINES/mob_defines.dm b/code/__DEFINES/mob_defines.dm index 7608c99a1158..bccec9548a2f 100644 --- a/code/__DEFINES/mob_defines.dm +++ b/code/__DEFINES/mob_defines.dm @@ -273,7 +273,7 @@ #define ispathanimal(A) (ispath(A, /mob/living/simple_animal)) #define iscameramob(A) (istype((A), /mob/camera)) -#define isAIEye(A) (istype((A), /mob/camera/aiEye)) +#define isAIEye(A) (istype((A), /mob/camera/ai_eye)) #define isovermind(A) (istype((A), /mob/camera/blob)) #define isSpirit(A) (istype((A), /mob/spirit)) diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index 8bac4307c41a..465d730a97d6 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -20,7 +20,7 @@ #define STATUS_EFFECT_SHADOW_MEND_DEVIL /datum/status_effect/shadow_mend/devil //Tarot version, hurts others over self -#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_REGENERATIVE_CORE /datum/status_effect/regenerative_core diff --git a/code/__HELPERS/sorts/InsertSort.dm b/code/__HELPERS/sorts/InsertSort.dm index 6e23fc33af53..81e347c8e6ca 100644 --- a/code/__HELPERS/sorts/InsertSort.dm +++ b/code/__HELPERS/sorts/InsertSort.dm @@ -8,7 +8,7 @@ if(toIndex <= 0) toIndex += length(L) + 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 0ce79909b5cd..c558f41b2e1b 100644 --- a/code/__HELPERS/sorts/MergeSort.dm +++ b/code/__HELPERS/sorts/MergeSort.dm @@ -8,7 +8,7 @@ if(toIndex <= 0) toIndex += length(L) + 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 faf3e74aa7df..cd15d922614b 100644 --- a/code/__HELPERS/sorts/TimSort.dm +++ b/code/__HELPERS/sorts/TimSort.dm @@ -8,7 +8,7 @@ if(toIndex <= 0) toIndex += length(L) + 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 b93586c21f37..3e44dc052d9d 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 @@ lo the index of the first element in the range to be sorted 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 @@ For its intended use in a stable mergesort, the strictness of the 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 @@ reverse a descending sequence without violating stability. //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 @@ reverse a descending sequence without violating stability. // 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 = length(runBases) - 1 if(n > 1 && runLens[n - 1] <= runLens[n] + runLens[n + 1]) @@ -191,7 +191,7 @@ reverse a descending sequence without violating stability. //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(length(runBases) >= 2) var/n = length(runBases) - 1 if(n > 1 && runLens[n - 1] < runLens[n + 1]) @@ -202,7 +202,7 @@ reverse a descending sequence without violating stability. //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(length(runBases) >= 2) //ASSERT(i >= 1) //ASSERT(i == length(runBases) - 1 || i == length(runBases) - 2) @@ -256,7 +256,7 @@ reverse a descending sequence without violating stability. 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 @@ -316,7 +316,7 @@ reverse a descending sequence without violating stability. * - hint: the index at which to begin the search, `0 <= hint < n`. The closer hint is to the result, the faster this method will run. * - c: the comparator used to order the range, and to search */ -/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 @@ -364,7 +364,7 @@ reverse a descending sequence without violating stability. //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 @@ -466,7 +466,7 @@ reverse a descending sequence without violating stability. //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 @@ -566,7 +566,7 @@ reverse a descending sequence without violating stability. //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 @@ -610,7 +610,7 @@ reverse a descending sequence without violating stability. 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/_onclick/click_override.dm b/code/_onclick/click_override.dm index 3322218791e7..36674ed70987 100644 --- a/code/_onclick/click_override.dm +++ b/code/_onclick/click_override.dm @@ -10,41 +10,41 @@ - DaveTheHeacrab */ -/datum/middleClickOverride/ +/datum/middle_click_override/ -/datum/middleClickOverride/proc/onClick(atom/A, mob/living/user) +/datum/middle_click_override/proc/onClick(atom/A, mob/living/user) user.middleClickOverride = null return TRUE /* Note, when making a new click override it is ABSOLUTELY VITAL that you set the source's clickOverride to null at some point if you don't want them to be stuck with it forever. Calling the super will do this for you automatically, but if you want a click override to NOT clear itself after the first click, you must do it at some other point in the code*/ -/obj/item/badminBook/ +/obj/item/badmin_book/ name = "old book" desc = "An old, leather bound tome." icon = 'icons/obj/library.dmi' icon_state = "book" - var/datum/middleClickOverride/clickBehavior = new /datum/middleClickOverride/badminClicker + var/datum/middle_click_override/clickBehavior = new /datum/middle_click_override/badmin_clicker -/obj/item/badminBook/attack_self(mob/living/user as mob) +/obj/item/badmin_book/attack_self(mob/living/user as mob) if(user.middleClickOverride) to_chat(user, "You try to draw power from [src], but you cannot hold the power at this time!") return user.middleClickOverride = clickBehavior to_chat(user, "You draw a bit of power from [src], you can use middle click or alt click to release the power!") -/datum/middleClickOverride/badminClicker +/datum/middle_click_override/badmin_clicker var/summon_path = /obj/item/food/cookie -/datum/middleClickOverride/badminClicker/onClick(atom/A, mob/living/user) +/datum/middle_click_override/badmin_clicker/onClick(atom/A, mob/living/user) var/atom/movable/newObject = new summon_path newObject.loc = get_turf(A) to_chat(user, "You release the power you had stored up, summoning \a [newObject.name]!") usr.loc.visible_message("[user] waves [user.p_their()] hand and summons \a [newObject.name]!") ..() -/datum/middleClickOverride/shock_implant +/datum/middle_click_override/shock_implant -/datum/middleClickOverride/shock_implant/onClick(atom/A, mob/living/carbon/human/user) +/datum/middle_click_override/shock_implant/onClick(atom/A, mob/living/carbon/human/user) if(A == user || user.a_intent == INTENT_HELP || user.a_intent == INTENT_GRAB) return FALSE if(user.incapacitated()) @@ -119,13 +119,13 @@ * Middle click override which accepts a callback as an arugment in the `New()` proc. * When the living mob that has this datum middle-clicks or alt-clicks on something, the callback will be invoked. */ -/datum/middleClickOverride/callback_invoker +/datum/middle_click_override/callback_invoker var/datum/callback/callback -/datum/middleClickOverride/callback_invoker/New(datum/callback/_callback) +/datum/middle_click_override/callback_invoker/New(datum/callback/_callback) . = ..() callback = _callback -/datum/middleClickOverride/callback_invoker/onClick(atom/A, mob/living/user) +/datum/middle_click_override/callback_invoker/onClick(atom/A, mob/living/user) if(callback.Invoke(user, A)) return TRUE diff --git a/code/_onclick/hud/ai_hud.dm b/code/_onclick/hud/ai_hud.dm index 1f0cf58e2371..9d2fba720293 100644 --- a/code/_onclick/hud/ai_hud.dm +++ b/code/_onclick/hud/ai_hud.dm @@ -248,7 +248,7 @@ static_inventory += using //Intent - using = new /atom/movable/screen/act_intent/robot/AI() + using = new /atom/movable/screen/act_intent/robot/ai() using.icon_state = mymob.a_intent static_inventory += using action_intent = using diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm index 13a2fa73efd6..94279aac05de 100644 --- a/code/_onclick/hud/blob_overmind.dm +++ b/code/_onclick/hud/blob_overmind.dm @@ -9,124 +9,124 @@ closeToolTip(usr) return ..() -/atom/movable/screen/blob/BlobHelp +/atom/movable/screen/blob/blob_help icon_state = "ui_help" name = "Blob Help" desc = "Help on playing blob!" -/atom/movable/screen/blob/BlobHelp/Click() +/atom/movable/screen/blob/blob_help/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.blob_help() -/atom/movable/screen/blob/JumpToNode +/atom/movable/screen/blob/jump_to_node icon_state = "ui_tonode" name = "Jump to Node" desc = "Moves your camera to a selected blob node." -/atom/movable/screen/blob/JumpToNode/Click() +/atom/movable/screen/blob/jump_to_node/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.jump_to_node() -/atom/movable/screen/blob/JumpToCore +/atom/movable/screen/blob/jump_to_core icon_state = "ui_tocore" name = "Jump to Core" desc = "Moves your camera to your blob core." -/atom/movable/screen/blob/JumpToCore/MouseEntered(location, control, params) +/atom/movable/screen/blob/jump_to_core/MouseEntered(location, control, params) if(hud && hud.mymob && isovermind(hud.mymob)) name = initial(name) desc = initial(desc) return ..() -/atom/movable/screen/blob/JumpToCore/Click() +/atom/movable/screen/blob/jump_to_core/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.transport_core() -/atom/movable/screen/blob/Blobbernaut +/atom/movable/screen/blob/blobbernaut icon_state = "ui_blobbernaut" name = "Produce Blobbernaut (60)" desc = "Produces a strong, intelligent blobbernaut from a factory blob for 60 resources.
The factory blob will be destroyed in the process." -/atom/movable/screen/blob/Blobbernaut/Click() +/atom/movable/screen/blob/blobbernaut/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_blobbernaut() -/atom/movable/screen/blob/StorageBlob +/atom/movable/screen/blob/storage_blob icon_state = "ui_storage" name = "Produce Storage Blob (40)" desc = "Produces a storage blob for 40 resources.
Storage blobs will raise your max resource cap by 50." -/atom/movable/screen/blob/StorageBlob/Click() +/atom/movable/screen/blob/storage_blob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_storage() -/atom/movable/screen/blob/ResourceBlob +/atom/movable/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." -/atom/movable/screen/blob/ResourceBlob/Click() +/atom/movable/screen/blob/resource_blob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_resource() -/atom/movable/screen/blob/NodeBlob +/atom/movable/screen/blob/node_blob icon_state = "ui_node" name = "Produce Node Blob (60)" desc = "Produces a node blob for 60 resources.
Node blobs will expand and activate nearby resource and factory blobs." -/atom/movable/screen/blob/NodeBlob/Click() +/atom/movable/screen/blob/node_blob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_node() -/atom/movable/screen/blob/FactoryBlob +/atom/movable/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." -/atom/movable/screen/blob/FactoryBlob/Click() +/atom/movable/screen/blob/factory_blob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_factory() -/atom/movable/screen/blob/ReadaptChemical +/atom/movable/screen/blob/readapt_chemical icon_state = "ui_chemswap" name = "Readapt Chemical (50)" desc = "Randomly rerolls your chemical for 50 resources." -/atom/movable/screen/blob/ReadaptChemical/MouseEntered(location, control, params) +/atom/movable/screen/blob/readapt_chemical/MouseEntered(location, control, params) if(hud && hud.mymob && isovermind(hud.mymob)) name = initial(name) desc = initial(desc) return ..() -/atom/movable/screen/blob/ReadaptChemical/Click() +/atom/movable/screen/blob/readapt_chemical/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.chemical_reroll() -/atom/movable/screen/blob/RelocateCore +/atom/movable/screen/blob/relocate_core icon_state = "ui_swap" name = "Relocate Core (80)" desc = "Swaps a node and your core for 80 resources." -/atom/movable/screen/blob/RelocateCore/Click() +/atom/movable/screen/blob/relocate_core/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.relocate_core() -/atom/movable/screen/blob/Split +/atom/movable/screen/blob/split icon_state = "ui_split" name = "Split consciousness (100)" desc = "Creates another Blob Overmind at the targeted node. One use only.
Offspring are unable to use this ability." -/atom/movable/screen/blob/Split/Click() +/atom/movable/screen/blob/split/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.split_consciousness() @@ -152,50 +152,50 @@ blobhealthdisplay.screen_loc = ui_internal static_inventory += blobhealthdisplay - using = new /atom/movable/screen/blob/BlobHelp() + using = new /atom/movable/screen/blob/blob_help() using.screen_loc = "WEST:6,NORTH:-3" static_inventory += using - using = new /atom/movable/screen/blob/JumpToNode() + using = new /atom/movable/screen/blob/jump_to_node() using.screen_loc = ui_inventory static_inventory += using - using = new /atom/movable/screen/blob/JumpToCore() + using = new /atom/movable/screen/blob/jump_to_core() using.screen_loc = ui_zonesel using.hud = src static_inventory += using - using = new /atom/movable/screen/blob/Blobbernaut() + using = new /atom/movable/screen/blob/blobbernaut() using.screen_loc = ui_id static_inventory += using - using = new /atom/movable/screen/blob/StorageBlob() + using = new /atom/movable/screen/blob/storage_blob() using.screen_loc = ui_belt static_inventory += using - using = new /atom/movable/screen/blob/ResourceBlob() + using = new /atom/movable/screen/blob/resource_blob() using.screen_loc = ui_back static_inventory += using - using = new /atom/movable/screen/blob/NodeBlob() + using = new /atom/movable/screen/blob/node_blob() using.screen_loc = using.screen_loc = ui_rhand static_inventory += using - using = new /atom/movable/screen/blob/FactoryBlob() + using = new /atom/movable/screen/blob/factory_blob() using.screen_loc = using.screen_loc = ui_lhand static_inventory += using - using = new /atom/movable/screen/blob/ReadaptChemical() + using = new /atom/movable/screen/blob/readapt_chemical() using.screen_loc = ui_storage1 using.hud = src static_inventory += using - using = new /atom/movable/screen/blob/RelocateCore() + using = new /atom/movable/screen/blob/relocate_core() using.screen_loc = ui_storage2 static_inventory += using var/mob/camera/blob/B = user if(!B.is_offspring) // Checks if the blob is an offspring, to not create split button if it is - using = new /atom/movable/screen/blob/Split() + using = new /atom/movable/screen/blob/split() using.screen_loc = ui_acti static_inventory += using diff --git a/code/_onclick/hud/guardian_hud.dm b/code/_onclick/hud/guardian_hud.dm index 231020265a1e..b460f02f50de 100644 --- a/code/_onclick/hud/guardian_hud.dm +++ b/code/_onclick/hud/guardian_hud.dm @@ -10,23 +10,23 @@ static_inventory += using action_intent = using - using = new /atom/movable/screen/guardian/Manifest() + using = new /atom/movable/screen/guardian/manifest() using.screen_loc = ui_rhand static_inventory += using - using = new /atom/movable/screen/guardian/Recall() + using = new /atom/movable/screen/guardian/recall() using.screen_loc = ui_lhand static_inventory += using - using = new /atom/movable/screen/guardian/ToggleMode() + using = new /atom/movable/screen/guardian/toggle_mode() using.screen_loc = ui_storage1 static_inventory += using - using = new /atom/movable/screen/guardian/ToggleLight() + using = new /atom/movable/screen/guardian/toggle_light() using.screen_loc = ui_inventory static_inventory += using - using = new /atom/movable/screen/guardian/Communicate() + using = new /atom/movable/screen/guardian/communicate() using.screen_loc = ui_back static_inventory += using @@ -37,12 +37,12 @@ icon = 'icons/mob/guardian.dmi' icon_state = "base" -/atom/movable/screen/guardian/Manifest +/atom/movable/screen/guardian/manifest icon_state = "manifest" name = "Manifest" desc = "Spring forth into battle!" -/atom/movable/screen/guardian/Manifest/Click() +/atom/movable/screen/guardian/manifest/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr var/summoner_loc = G.summoner.loc @@ -55,43 +55,43 @@ if(G.loc == G.summoner) G.Manifest() -/atom/movable/screen/guardian/Recall +/atom/movable/screen/guardian/recall icon_state = "recall" name = "Recall" desc = "Return to your user." -/atom/movable/screen/guardian/Recall/Click() +/atom/movable/screen/guardian/recall/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.Recall() -/atom/movable/screen/guardian/ToggleMode +/atom/movable/screen/guardian/toggle_mode icon_state = "toggle" name = "Toggle Mode" desc = "Switch between ability modes." -/atom/movable/screen/guardian/ToggleMode/Click() +/atom/movable/screen/guardian/toggle_mode/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.ToggleMode() -/atom/movable/screen/guardian/Communicate +/atom/movable/screen/guardian/communicate icon_state = "communicate" name = "Communicate" desc = "Communicate telepathically with your user." -/atom/movable/screen/guardian/Communicate/Click() +/atom/movable/screen/guardian/communicate/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.Communicate() -/atom/movable/screen/guardian/ToggleLight +/atom/movable/screen/guardian/toggle_light icon_state = "light" name = "Toggle Light" desc = "Glow like star dust." -/atom/movable/screen/guardian/ToggleLight/Click() +/atom/movable/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/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 44d753990454..4b0dbab47b08 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -106,7 +106,7 @@ icon = 'icons/mob/screen_robot.dmi' screen_loc = ui_borg_intents -/atom/movable/screen/act_intent/robot/AI +/atom/movable/screen/act_intent/robot/ai screen_loc = "SOUTH+1:6,EAST-1:32" /atom/movable/screen/mov_intent diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm index 6e9194afb683..715b6ef11b4b 100644 --- a/code/controllers/subsystem/SSticker.dm +++ b/code/controllers/subsystem/SSticker.dm @@ -299,11 +299,11 @@ SUBSYSTEM_DEF(ticker) if(tripai.name == "tripai") if(locate(/mob/living) in get_turf(tripai)) continue - GLOB.empty_playable_ai_cores += new /obj/structure/AIcore/deactivated(get_turf(tripai)) + GLOB.empty_playable_ai_cores += new /obj/structure/ai_core/deactivated(get_turf(tripai)) for(var/obj/effect/landmark/start/ai/A in GLOB.landmarks_list) if(locate(/mob/living) in get_turf(A)) continue - GLOB.empty_playable_ai_cores += new /obj/structure/AIcore/deactivated(get_turf(A)) + GLOB.empty_playable_ai_cores += new /obj/structure/ai_core/deactivated(get_turf(A)) // Setup pregenerated newsfeeds diff --git a/code/datums/action.dm b/code/datums/action.dm index cb552deec375..9f0b38b98c8b 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -314,7 +314,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 @@ -435,7 +435,7 @@ /datum/action/item_action/noir name = "Noir" -/datum/action/item_action/YEEEAAAAAHHHHHHHHHHHHH +/datum/action/item_action/yeeeaaaaahhhhhhhhhhhhh name = "YEAH!" /datum/action/item_action/laugh_track diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm index debafbadd42f..2c3832190bb8 100644 --- a/code/datums/dog_fashion.dm +++ b/code/datums/dog_fashion.dm @@ -266,7 +266,7 @@ name = "Colonel REAL_NAME" desc = "Keep away from live vox." -/datum/dog_fashion/head/HoS +/datum/dog_fashion/head/hos name = "Head of Security REAL_NAME" desc = "Probably better than the last HoS." diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 562caff41a39..f7f887f1ae32 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -1,4 +1,4 @@ -/mob/camera/aiEye/remote/holo/setLoc() +/mob/camera/ai_eye/remote/holo/setLoc() . = ..() var/obj/machinery/hologram/holopad/H = origin H.move_hologram(eye_user, loc) @@ -12,7 +12,7 @@ var/obj/machinery/hologram/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/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 519c58dc6e21..8f5202f1a8c9 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -611,7 +611,7 @@ suit = /obj/item/clothing/suit/sovietcoat glasses = /obj/item/clothing/glasses/sunglasses r_pocket = /obj/item/flashlight/seclite - belt = /obj/item/gun/projectile/automatic/pistol/APS + belt = /obj/item/gun/projectile/automatic/pistol/aps backpack_contents = list( /obj/item/storage/box/soviet = 1, @@ -654,7 +654,7 @@ backpack_contents = list( /obj/item/storage/box/soviet = 1, - /obj/item/gun/projectile/automatic/pistol/APS = 1, + /obj/item/gun/projectile/automatic/pistol/aps = 1, /obj/item/ammo_box/magazine/apsm10mm = 2, /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1, /obj/item/lighter/zippo/engraved = 1 diff --git a/code/datums/outfits/outfit_debug.dm b/code/datums/outfits/outfit_debug.dm index 32aaff8de2f4..ccce96c4c0cf 100644 --- a/code/datums/outfits/outfit_debug.dm +++ b/code/datums/outfits/outfit_debug.dm @@ -318,7 +318,7 @@ // put cool admin-only shit here :) /obj/item/storage/box/debug/misc_debug/populate_contents() - new /obj/item/badminBook(src) + new /obj/item/badmin_book(src) new /obj/item/reagent_containers/drinks/bottle/vodka/badminka(src) new /obj/item/crowbar/power(src) // >admin only lol new /obj/item/clothing/gloves/fingerless/rapid/admin(src) diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm index 048454fbbbfe..c0bef3f0dcd2 100644 --- a/code/datums/spells/conjure.dm +++ b/code/datums/spells/conjure.dm @@ -57,7 +57,7 @@ return what_conjure_summoned -/datum/spell/aoe/conjure/summonEdSwarm +/datum/spell/aoe/conjure/summon_ed_swarm name = "Dispense Wizard Justice" desc = "This spell dispenses wizard justice." summon_type = list(/mob/living/simple_animal/bot/ed209) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index aa7cb7f23b6f..c4795b8d71a4 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -319,7 +319,7 @@ //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 @@ -332,19 +332,19 @@ /// Max heal points for the rod to spend on healing people var/max_heal_points = 50 -/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() // Death transforms you into a snake after a short grace period if(owner.stat == DEAD) if(deathTick < 4) @@ -386,7 +386,7 @@ if(!heal_points) break -/datum/status_effect/hippocraticOath/proc/heal(mob/living/L) +/datum/status_effect/hippocratic_oath/proc/heal(mob/living/L) var/starting_points = heal_points var/force_particle = FALSE @@ -417,7 +417,7 @@ if(starting_points < heal_points || force_particle) new /obj/effect/temp_visual/heal(get_turf(L), COLOR_HEALING_GREEN) -/datum/status_effect/hippocraticOath/proc/heal_human(mob/living/carbon/human/H) +/datum/status_effect/hippocratic_oath/proc/heal_human(mob/living/carbon/human/H) if(H.getBruteLoss() || H.getFireLoss() || H.getOxyLoss() || H.getToxLoss() || H.getBrainLoss() || H.getStaminaLoss() || H.getCloneLoss()) // Avoid counting burn wounds H.adjustBruteLoss(-3.5, robotic = TRUE) H.adjustFireLoss(-3.5, robotic = TRUE) diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index 956fa75b400c..d44d7e6cde73 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -372,7 +372,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 5 surplus = 50 -/datum/uplink_item/stealthy_weapons/RSG +/datum/uplink_item/stealthy_weapons/rsg name = "Rapid Syringe Gun" desc = "A syndicate rapid syringe gun able to fill and fire syringes automatically from an internal reagent reservoir. Comes pre-loaded with 7 empty syringes, and has a maximum capacity of 14 syringes and 300u of reagents." reference = "RSG" @@ -712,7 +712,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) name = "Hacked AI Upload Module" desc = "When used with an upload console, this module allows you to upload priority laws to an artificial intelligence. Be careful with their wording, as artificial intelligences may look for loopholes to exploit." reference = "HAI" - item = /obj/item/aiModule/syndicate + item = /obj/item/ai_module/syndicate cost = 15 /datum/uplink_item/device_tools/powersink @@ -1005,40 +1005,40 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) // MARK: BUNDLES AND TELECRYSTALS //////////////////////////////////////// -/datum/uplink_item/bundles_TC +/datum/uplink_item/bundles_tc category = "Bundles and Telecrystals" surplus = 0 can_discount = FALSE -/datum/uplink_item/bundles_TC/telecrystal +/datum/uplink_item/bundles_tc/telecrystal name = "Raw Telecrystal" desc = "Telecrystal in its rawest and purest form; can be utilized on active uplinks to increase their telecrystal count." reference = "RTC" item = /obj/item/stack/telecrystal cost = 1 -/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." reference = "RTCF" 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." reference = "RTCT" item = /obj/item/stack/telecrystal/twenty cost = 20 -/datum/uplink_item/bundles_TC/telecrystal/fifty +/datum/uplink_item/bundles_tc/telecrystal/fifty name = "50 Raw Telecrystals" desc = "Fifty telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count." reference = "RTCB" item = /obj/item/stack/telecrystal/fifty cost = 50 -/datum/uplink_item/bundles_TC/telecrystal/hundred +/datum/uplink_item/bundles_tc/telecrystal/hundred name = "100 Raw Telecrystals" desc = "One-hundred telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count." reference = "RTCH" diff --git a/code/datums/uplink_items/uplink_nuclear.dm b/code/datums/uplink_items/uplink_nuclear.dm index 7c13a9ed15ff..d4ee79658280 100644 --- a/code/datums/uplink_items/uplink_nuclear.dm +++ b/code/datums/uplink_items/uplink_nuclear.dm @@ -8,7 +8,7 @@ name = "Stechkin APS Pistol" reference = "APS" desc = "The automatic machine pistol version of the FK-69 'Stechkin' chambered in 10mm Auto with a detachable 20-round box magazine. Perfect for dual wielding or as backup." - item = /obj/item/gun/projectile/automatic/pistol/APS + item = /obj/item/gun/projectile/automatic/pistol/aps cost = 40 uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) @@ -236,11 +236,11 @@ cost = 60 // normally 90 uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/datum/uplink_item/ammo/bulldog_XLmagsbag +/datum/uplink_item/ammo/bulldog_xl_magsbag name = "Bulldog - 12g Extra-Large Magazine Duffel Bag" desc = "A duffel bag containing five XL 16 round drum magazines. (3 Slug, 1 Buckshot, 1 Dragon's Breath)." reference = "12XLDB" - item = /obj/item/storage/backpack/duffel/syndie/shotgunXLmags + item = /obj/item/storage/backpack/duffel/syndie/shotgun_xl_mags // same price for more ammo, but you're likely to lose more ammo if you drop your bulldog. High risk, high reward. cost = 60 uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) @@ -621,7 +621,7 @@ // MARK: BUNDLES //////////////////////////////////////// -/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 three magazines and a (surplus) suppressor at discount price." reference = "C20B" @@ -629,7 +629,7 @@ cost = 90 // normally 105 uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/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." reference = "CIB" @@ -637,7 +637,7 @@ cost = 200 uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/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 medical beam gun and a pair of syndicate magboots." @@ -646,7 +646,7 @@ cost = 80 // normally 105 uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/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. \ diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index 2d00ff60d72b..212d52e21ca8 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -621,7 +621,7 @@ cost = 1 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/datum/uplink_item/bundles_TC/contractor +/datum/uplink_item/bundles_tc/contractor name = "Syndicate Contractor Kit" desc = "A bundle granting you the privilege of taking on kidnapping contracts for credit and TC payouts that can add up to more than its initial cost." reference = "SCOK" @@ -629,7 +629,7 @@ item = /obj/item/storage/box/syndie_kit/contractor excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/datum/uplink_item/bundles_TC/contractor/spawn_item(turf/loc, obj/item/uplink/U) +/datum/uplink_item/bundles_tc/contractor/spawn_item(turf/loc, obj/item/uplink/U) var/datum/mind/mind = usr.mind var/datum/antagonist/traitor/AT = mind.has_antag_datum(/datum/antagonist/traitor) if(LAZYACCESS(GLOB.contractors, mind)) @@ -653,7 +653,7 @@ log_game("[key_name(usr)] became a Contractor") return I -/datum/uplink_item/bundles_TC/badass +/datum/uplink_item/bundles_tc/badass name = "Syndicate Bundle" desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. These items are collectively worth more than 100 telecrystals. You can select one out of three specialisations after purchase." reference = "SYB" @@ -661,7 +661,7 @@ cost = 100 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/datum/uplink_item/bundles_TC/surplus_crate +/datum/uplink_item/bundles_tc/surplus_crate name = "Syndicate Surplus Crate" desc = "A crate containing 250 telecrystals worth of random syndicate leftovers." reference = "SYSC" @@ -671,7 +671,7 @@ var/crate_value = 250 uses_special_spawn = TRUE -/datum/uplink_item/bundles_TC/surplus_crate/spawn_item(turf/loc, obj/item/uplink/U, mob/user) +/datum/uplink_item/bundles_tc/surplus_crate/spawn_item(turf/loc, obj/item/uplink/U, mob/user) if(..() != UPLINK_SPECIAL_SPAWNING) return FALSE @@ -687,7 +687,7 @@ Changes your unarmed damage to deal non-lethal stamina damage. \ Does not restrict weapon usage, and can be used alongside Gloves of the North Star." reference = "CQC" - item = /obj/item/CQC_manual + item = /obj/item/cqc_manual cost = 50 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) diff --git a/code/game/area/areas/ruins/blackmarketpackers.dm b/code/game/area/areas/ruins/blackmarketpackers.dm index aea5fb124144..ab3330a2c00b 100644 --- a/code/game/area/areas/ruins/blackmarketpackers.dm +++ b/code/game/area/areas/ruins/blackmarketpackers.dm @@ -1,23 +1,23 @@ //Packer Ship Areas -/area/ruin/unpowered/BMPship +/area/ruin/unpowered/bmp_ship name = "\improper BMP Asteroids" icon_state = "away" report_alerts = FALSE requires_power = TRUE -/area/ruin/unpowered/BMPship/Aft +/area/ruin/unpowered/bmp_ship/aft name = "\improper BMP Aft Block" icon_state = "away1" -/area/ruin/unpowered/BMPship/Midship +/area/ruin/unpowered/bmp_ship/midship name = "\improper BMP Midship Block" icon_state = "away2" -/area/ruin/unpowered/BMPship/Fore +/area/ruin/unpowered/bmp_ship/fore name = "\improper BMP Fore Block" icon_state = "away3" -/area/ruin/unpowered/BMPship/Delta +/area/ruin/unpowered/bmp_ship/delta name = "\improper BMP Delta Block" icon_state = "away4" diff --git a/code/game/area/ss13_areas/security_areas.dm b/code/game/area/ss13_areas/security_areas.dm index 51c6f84d4c4e..7e6db172b93a 100644 --- a/code/game/area/ss13_areas/security_areas.dm +++ b/code/game/area/ss13_areas/security_areas.dm @@ -51,7 +51,7 @@ name = "\improper Prison Cell Block" icon_state = "brig" -/area/station/security/prison/cell_block/A +/area/station/security/prison/cell_block/a name = "\improper Prison Cell Block A" icon_state = "brigcella" diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 0fcfd687f5f3..87b88676d3c9 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -101,8 +101,8 @@ /datum/module_picker/New() possible_modules = list() - for(var/type in subtypesof(/datum/AI_Module)) - var/datum/AI_Module/AM = new type + for(var/type in subtypesof(/datum/ai_module)) + var/datum/ai_module/AM = new type if(AM.power_type || AM.upgrade) possible_modules += AM @@ -112,7 +112,7 @@
Install Module:
The number afterwards is the amount of processing time it consumes.
"} - for(var/datum/AI_Module/module in possible_modules) + for(var/datum/ai_module/module in possible_modules) dat += "[module.module_name]\[?\] ([module.cost])
" dat += "
" if(temp) @@ -133,7 +133,7 @@ to_chat(A, "You are already dead!") return - for(var/datum/AI_Module/AM in possible_modules) + for(var/datum/ai_module/AM in possible_modules) if(href_list[AM.mod_pick_name]) // Cost check @@ -175,7 +175,7 @@ use(usr) //The base module type, which holds info about each ability. -/datum/AI_Module +/datum/ai_module var/module_name var/mod_pick_name var/description = "" @@ -187,11 +187,11 @@ var/unlock_sound //Sound played when an ability is unlocked var/uses = 0 -/datum/AI_Module/proc/upgrade(mob/living/silicon/ai/AI) //Apply upgrades! +/datum/ai_module/proc/upgrade(mob/living/silicon/ai/AI) //Apply upgrades! return //Doomsday Device: Starts the self-destruct timer. It can only be stopped by killing the AI completely. -/datum/AI_Module/nuke_station +/datum/ai_module/nuke_station module_name = "Doomsday Device" mod_pick_name = "nukestation" 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." @@ -303,7 +303,7 @@ SSticker.mode.station_was_nuked = TRUE //AI Turret Upgrade: Increases the health and damage of all turrets. -/datum/AI_Module/upgrade_turrets +/datum/ai_module/upgrade_turrets module_name = "AI Turret Upgrade" mod_pick_name = "turret" description = "Improves the power and health of all AI turrets. This effect is permanent." @@ -312,7 +312,7 @@ 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_turrets/upgrade(mob/living/silicon/ai/AI) +/datum/ai_module/upgrade_turrets/upgrade(mob/living/silicon/ai/AI) for(var/obj/machinery/porta_turret/ai_turret/turret in GLOB.machines) var/turf/T = get_turf(turret) if(is_station_level(T.z)) @@ -322,7 +322,7 @@ AI.turrets_upgraded = TRUE //Hostile Station Lockdown: Locks, bolts, and electrifies every airlock on the station. After 90 seconds, the doors reset. -/datum/AI_Module/lockdown +/datum/ai_module/lockdown module_name = "Hostile Station Lockdown" mod_pick_name = "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 \ @@ -343,7 +343,7 @@ new /datum/event/door_runtime() //Destroy RCDs: Detonates all non-cyborg RCDs on the station. -/datum/AI_Module/destroy_rcd +/datum/ai_module/destroy_rcd module_name = "Destroy RCDs" mod_pick_name = "rcd" description = "Send a specialised pulse to detonate all hand-held and exosuit Rapid Construction Devices on the station." @@ -371,7 +371,7 @@ user.playsound_local(user, 'sound/machines/twobeep.ogg', 50, FALSE, use_reverb = FALSE) //Unlock Mech Domination: Unlocks the ability to dominate mechs. Big shocker, right? -/datum/AI_Module/mecha_domination +/datum/ai_module/mecha_domination module_name = "Unlock Mech Domination" mod_pick_name = "mechjack" 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.\ @@ -381,11 +381,11 @@ 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/mecha_domination/upgrade(mob/living/silicon/ai/AI) +/datum/ai_module/mecha_domination/upgrade(mob/living/silicon/ai/AI) AI.can_dominate_mechs = TRUE //Yep. This is all it does. Honk! //Thermal Sensor Override: Unlocks the ability to disable all fire alarms from doing their job. -/datum/AI_Module/break_fire_alarms +/datum/ai_module/break_fire_alarms module_name = "Thermal Sensor Override" mod_pick_name = "burnpigs" 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. \ @@ -410,7 +410,7 @@ user.playsound_local(user, 'sound/machines/terminal_off.ogg', 50, FALSE, use_reverb = FALSE) //Air Alarm Safety Override: Unlocks the ability to enable flooding on all air alarms. -/datum/AI_Module/break_air_alarms +/datum/ai_module/break_air_alarms module_name = "Air Alarm Safety Override" mod_pick_name = "allow_flooding" 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. \ @@ -435,7 +435,7 @@ user.playsound_local(user, 'sound/machines/terminal_off.ogg', 50, FALSE, use_reverb = FALSE) //Overload Machine: Allows the AI to overload a machine, detonating it after a delay. Two uses per purchase. -/datum/AI_Module/overload_machine +/datum/ai_module/overload_machine module_name = "Machine Overload" mod_pick_name = "overload" description = "Overheats an electrical machine, causing a moderately-sized explosion and destroying it. Four uses per purchase." @@ -477,7 +477,7 @@ qdel(M) //Override Machine: Allows the AI to override a machine, animating it into an angry, living version of itself. -/datum/AI_Module/override_machine +/datum/ai_module/override_machine module_name = "Machine Override" mod_pick_name = "override" description = "Overrides a machine's programming, causing it to rise up and attack everyone except other machines. Four uses." @@ -515,7 +515,7 @@ new /mob/living/simple_animal/hostile/mimic/copy/machine(get_turf(M), M, user, 1) //Robotic Factory: Places a large machine that converts humans that go through it into cyborgs. Unlocking this ability removes shunting. -/datum/AI_Module/place_cyborg_transformer +/datum/ai_module/place_cyborg_transformer module_name = "Robotic Factory (Removes Shunting)" mod_pick_name = "cyborgtransformer" description = "Build a machine anywhere, using expensive nanomachines, that can convert a living human into a loyal cyborg slave when placed inside." @@ -590,7 +590,7 @@ return success //Turret Assembly: Assemble an AI turret at the chosen location. One use per purchase -/datum/AI_Module/place_turret +/datum/ai_module/place_turret module_name = "Deploy Turret" mod_pick_name = "turretdeployer" description = "Build a turret anywhere that lethally targets organic life in sight." @@ -691,7 +691,7 @@ return TRUE //Blackout: Overloads a random number of lights across the station. Three uses. -/datum/AI_Module/blackout +/datum/ai_module/blackout module_name = "Blackout" mod_pick_name = "blackout" description = "Attempts to overload the lighting circuits on the station, destroying some bulbs. Three uses." @@ -718,7 +718,7 @@ adjust_uses(-1, user) //Reactivate Camera Network: Reactivates up to 30 cameras across the station. -/datum/AI_Module/reactivate_cameras +/datum/ai_module/reactivate_cameras module_name = "Reactivate Camera Network" mod_pick_name = "recam" 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." @@ -752,7 +752,7 @@ adjust_uses(0, user, TRUE) //Upgrade Camera Network: EMP-proofs all cameras, in addition to giving them X-ray vision. -/datum/AI_Module/upgrade_cameras +/datum/ai_module/upgrade_cameras module_name = "Upgrade Camera Network" mod_pick_name = "upgradecam" description = "Install broad-spectrum scanning and electrical redundancy firmware to the camera network, enabling EMP-proofing and light-amplified X-ray vision." //I <3 pointless technobabble @@ -763,7 +763,7 @@ unlock_text = "OTA firmware distribution complete! Cameras upgraded: CAMSUPGRADED. Light amplification system online." unlock_sound = 'sound/items/rped.ogg' -/datum/AI_Module/upgrade_cameras/upgrade(mob/living/silicon/ai/AI) +/datum/ai_module/upgrade_cameras/upgrade(mob/living/silicon/ai/AI) var/upgraded_cameras = 0 for(var/V in GLOB.cameranet.cameras) @@ -785,7 +785,7 @@ unlock_text = replacetext(unlock_text, "CAMSUPGRADED", "[upgraded_cameras]") //This works, since unlock text is called after upgrade() -/datum/AI_Module/eavesdrop +/datum/ai_module/eavesdrop module_name = "Enhanced Surveillance" mod_pick_name = "eavesdrop" description = "Via a combination of hidden microphones and lip reading software, you are able to use your cameras to listen in on conversations." @@ -795,11 +795,11 @@ unlock_text = "OTA firmware distribution complete! Cameras upgraded: Enhanced surveillance package online." unlock_sound = 'sound/items/rped.ogg' -/datum/AI_Module/eavesdrop/upgrade(mob/living/silicon/ai/AI) +/datum/ai_module/eavesdrop/upgrade(mob/living/silicon/ai/AI) if(AI.eyeobj) AI.eyeobj.relay_speech = TRUE -/datum/AI_Module/cameracrack +/datum/ai_module/cameracrack module_name = "Core Camera Cracker" mod_pick_name = "cameracrack" description = "By shortcirucuting the camera network chip, it overheats, preventing the camera console from using your internal camera." @@ -809,12 +809,12 @@ unlock_text = "Network chip short circuited. Internal camera disconected from network. Minimal damage to other internal components." unlock_sound = 'sound/items/wirecutter.ogg' -/datum/AI_Module/cameracrack/upgrade(mob/living/silicon/ai/AI) +/datum/ai_module/cameracrack/upgrade(mob/living/silicon/ai/AI) if(AI.builtInCamera) AI.cracked_camera = TRUE QDEL_NULL(AI.builtInCamera) -/datum/AI_Module/borg_upgrade +/datum/ai_module/borg_upgrade module_name = "Combat Cyborg Firmware Upgrade" mod_pick_name = "combatborgs" description = "Downloads firmware that activates built-in combat hardware present in all cyborgs. Cyborgs built after this is used will come with the hardware activated." @@ -824,7 +824,7 @@ unlock_text = "Firmware downloaded. Bugs removed. Combat subsystems operating at 73% efficiency." unlock_sound = 'sound/items/rped.ogg' -/datum/AI_Module/borg_upgrade/upgrade(mob/living/silicon/ai/AI) +/datum/ai_module/borg_upgrade/upgrade(mob/living/silicon/ai/AI) AI.purchased_modules = list(/obj/item/robot_module/engineering, /obj/item/robot_module/janitor, /obj/item/robot_module/medical, /obj/item/robot_module/miner, /obj/item/robot_module/butler) log_game("[key_name(usr)] purchased combat upgrades for all cyborgs.") message_admins("[key_name_admin(usr)] purchased combat upgrades for all cyborgs!") @@ -833,7 +833,7 @@ R.module.rebuild_modules() to_chat(R, "New firmware downloaded. Combat upgrades are now online.") -/datum/AI_Module/repair_cyborg +/datum/ai_module/repair_cyborg module_name = "Repair Cyborgs" mod_pick_name = "repair_borg" description = "Causes an electrical surge in the targeted cyborg, rebooting and repairing most of its subsystems. Requires two uses on a cyborg with broken armor." @@ -879,7 +879,7 @@ component.component_disabled = FALSE to_repair.revive() -/datum/AI_Module/core_tilt +/datum/ai_module/core_tilt module_name = "Rolling Servos" mod_pick_name = "watchforrollingcores" description = "Allows you to slowly roll your core around, crushing anything in your path with your bulk." diff --git a/code/game/gamemodes/miniantags/abduction/abductee_objectives.dm b/code/game/gamemodes/miniantags/abduction/abductee_objectives.dm index 4cbef8c77b9a..6d2273bc087f 100644 --- a/code/game/gamemodes/miniantags/abduction/abductee_objectives.dm +++ b/code/game/gamemodes/miniantags/abduction/abductee_objectives.dm @@ -68,7 +68,7 @@ /datum/objective/abductee/floors explanation_text = "Replace all the floor tiles with wood, carpeting, grass or bling." -/datum/objective/abductee/POWERUNLIMITED +/datum/objective/abductee/powerunlimited explanation_text = "Flood the station's powernet with as much electricity as you can." /datum/objective/abductee/pristine diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 79ff304e4a8e..235cab74862e 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -766,7 +766,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 -/obj/item/FixOVein/alien +/obj/item/fix_o_vein/alien name = "alien FixOVein" desc = "Bloodless aliens would totally know how to stop internal bleeding... Right?" icon = 'icons/obj/abductor.dmi' diff --git a/code/game/gamemodes/miniantags/abduction/machinery/abductor_camera.dm b/code/game/gamemodes/miniantags/abduction/machinery/abductor_camera.dm index 2a3d08e3f994..df5767cf2a95 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/abductor_camera.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/abductor_camera.dm @@ -74,7 +74,7 @@ if(!target || !iscarbon(owner)) 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 if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) @@ -101,7 +101,7 @@ if(!target || !iscarbon(owner)) 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 if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) @@ -137,7 +137,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/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index f11fcae608b6..1bf8400c4142 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -187,7 +187,7 @@ SSticker.mode.traitors |= mind //Necessary for announcing mind.add_mind_objective(/datum/objective/revenant) - mind.add_mind_objective(/datum/objective/revenantFluff) + mind.add_mind_objective(/datum/objective/revenant_fluff) messages.Add(mind.prepare_announce_objectives(FALSE)) to_chat(src, chat_box_red(messages.Join("
"))) @@ -329,10 +329,10 @@ return FALSE return TRUE -/datum/objective/revenantFluff +/datum/objective/revenant_fluff needs_target = FALSE -/datum/objective/revenantFluff/New() +/datum/objective/revenant_fluff/New() var/list/explanationTexts = list("Assist and exacerbate existing threats at critical moments.", \ "Cause as much chaos and anger as you can without being killed.", \ "Damage and render as much of the station rusted and unusable as possible.", \ @@ -350,7 +350,7 @@ explanation_text = pick(explanationTexts) ..() -/datum/objective/revenantFluff/check_completion() +/datum/objective/revenant_fluff/check_completion() return TRUE /obj/item/ectoplasm diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 174711c8a093..5da86e51a263 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -126,7 +126,7 @@ /datum/theft_objective/hypospray name = "the chief medical officer's advanced hypospray" - typepath = /obj/item/reagent_containers/hypospray/CMO + typepath = /obj/item/reagent_containers/hypospray/cmo protected_jobs = list("Chief Medical Officer") location_override = "the Chief Medical Officer's Office" diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index 0b2c52f36609..4c6ffbd43a06 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -50,7 +50,7 @@ GLOBAL_LIST_INIT(summoned_guns, list( /obj/item/gun/energy/bsg/prebuilt, /obj/item/gun/energy/xray, /obj/item/gun/energy/plasma_pistol, - /obj/item/gun/projectile/automatic/pistol/APS, // whyyy is this capitalized + /obj/item/gun/projectile/automatic/pistol/aps, // whyyy is this capitalized /obj/item/gun/projectile/revolver/overgrown, /obj/item/gun/energy/gun/blueshield/pdw9, /obj/item/gun/energy/disabler/silencer, diff --git a/code/game/jobs/job/security_jobs.dm b/code/game/jobs/job/security_jobs.dm index a82c323ecb9c..87393d49d43f 100644 --- a/code/game/jobs/job/security_jobs.dm +++ b/code/game/jobs/job/security_jobs.dm @@ -52,7 +52,7 @@ suit = /obj/item/clothing/suit/armor/hos gloves = /obj/item/clothing/gloves/color/black shoes = /obj/item/clothing/shoes/jackboots - head = /obj/item/clothing/head/HoS + head = /obj/item/clothing/head/hos l_ear = /obj/item/radio/headset/heads/hos/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses id = /obj/item/card/id/hos diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index de0db9f49def..3033aa18da7f 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -1,4 +1,4 @@ -/obj/machinery/computer/HolodeckControl +/obj/machinery/computer/holodeck_control name = "holodeck control computer" desc = "A computer used to control a nearby holodeck." icon_keyboard = "tech_key" @@ -32,29 +32,29 @@ light_color = LIGHT_COLOR_CYAN -/obj/machinery/computer/HolodeckControl/Initialize(mapload) +/obj/machinery/computer/holodeck_control/Initialize(mapload) . = ..() linkedholodeck = locate(/area/holodeck/alphadeck) -/obj/machinery/computer/HolodeckControl/Destroy() +/obj/machinery/computer/holodeck_control/Destroy() emergency_shutdown() return ..() -/obj/machinery/computer/HolodeckControl/attack_ai(mob/user) +/obj/machinery/computer/holodeck_control/attack_ai(mob/user) return attack_hand(user) -/obj/machinery/computer/HolodeckControl/attackby(obj/item/D, mob/user) +/obj/machinery/computer/holodeck_control/attackby(obj/item/D, mob/user) return -/obj/machinery/computer/HolodeckControl/attack_ghost(mob/user) +/obj/machinery/computer/holodeck_control/attack_ghost(mob/user) ui_interact(user) return ..() -/obj/machinery/computer/HolodeckControl/attack_hand(mob/user) +/obj/machinery/computer/holodeck_control/attack_hand(mob/user) ui_interact(user) return ..() -/obj/machinery/computer/HolodeckControl/process() +/obj/machinery/computer/holodeck_control/process() for(var/item in holographic_items) // do this first, to make sure people don't take items out when power is down. if(!(get_turf(item) in linkedholodeck)) derez(item, 0) @@ -78,7 +78,7 @@ T.ex_act(EXPLODE_LIGHT) T.hotspot_expose(1000,500,1) -/obj/machinery/computer/HolodeckControl/proc/loadProgram(area/A) +/obj/machinery/computer/holodeck_control/proc/loadProgram(area/A) if(world.time < (last_change + 25)) if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve @@ -109,7 +109,7 @@ new /mob/living/simple_animal/hostile/carp/holocarp(L.loc) -/obj/machinery/computer/HolodeckControl/proc/emergency_shutdown() +/obj/machinery/computer/holodeck_control/proc/emergency_shutdown() //Get rid of any items for(var/item in holographic_items) derez(item) @@ -123,7 +123,7 @@ active = FALSE -/obj/machinery/computer/HolodeckControl/proc/derez(obj/obj, silent = TRUE) +/obj/machinery/computer/holodeck_control/proc/derez(obj/obj, silent = TRUE) holographic_items.Remove(obj) if(!istype(obj)) @@ -138,22 +138,22 @@ visible_message("[old_obj] fades away!") qdel(obj) -/obj/machinery/computer/HolodeckControl/proc/check_deck_integrity(area/A) +/obj/machinery/computer/holodeck_control/proc/check_deck_integrity(area/A) for(var/turf/space/T in A) return FALSE return TRUE -/obj/machinery/computer/HolodeckControl/ui_state(mob/user) +/obj/machinery/computer/holodeck_control/ui_state(mob/user) return GLOB.default_state -/obj/machinery/computer/HolodeckControl/ui_interact(mob/user, datum/tgui/ui = null) +/obj/machinery/computer/holodeck_control/ui_interact(mob/user, datum/tgui/ui = null) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Holodeck", name) ui.autoupdate = TRUE ui.open() -/obj/machinery/computer/HolodeckControl/ui_data(mob/user) +/obj/machinery/computer/holodeck_control/ui_data(mob/user) var/list/data = list() data["current_deck"] = selected_deck data["emagged"] = emagged @@ -163,7 +163,7 @@ data["decks"] += deck_name return data -/obj/machinery/computer/HolodeckControl/ui_act(action, params, datum/tgui/ui) +/obj/machinery/computer/holodeck_control/ui_act(action, params, datum/tgui/ui) if(..()) return . = TRUE @@ -193,7 +193,7 @@ if(target) loadProgram(target) -/obj/machinery/computer/HolodeckControl/emag_act(user) +/obj/machinery/computer/holodeck_control/emag_act(user) if(emagged) return playsound(loc, 'sound/effects/sparks4.ogg', 75, 1) @@ -203,15 +203,15 @@ log_game("[key_name(user)] emagged the Holodeck Control Computer") return TRUE -/obj/machinery/computer/HolodeckControl/emp_act(severity) +/obj/machinery/computer/holodeck_control/emp_act(severity) emergency_shutdown() ..() -/obj/machinery/computer/HolodeckControl/ex_act(severity) +/obj/machinery/computer/holodeck_control/ex_act(severity) emergency_shutdown() ..() -/obj/machinery/computer/HolodeckControl/blob_act(obj/structure/blob/B) +/obj/machinery/computer/holodeck_control/blob_act(obj/structure/blob/B) emergency_shutdown() return ..() diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index a4410dd11329..039962f2145e 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -1,4 +1,4 @@ -/obj/structure/AIcore +/obj/structure/ai_core density = TRUE anchored = FALSE name = "AI core" @@ -10,13 +10,13 @@ var/obj/item/circuitboard/aicore/circuit = null var/obj/item/mmi/brain = null -/obj/structure/AIcore/Destroy() +/obj/structure/ai_core/Destroy() QDEL_NULL(laws) QDEL_NULL(circuit) QDEL_NULL(brain) return ..() -/obj/structure/AIcore/attackby(obj/item/P, mob/user, params) +/obj/structure/ai_core/attackby(obj/item/P, mob/user, params) switch(state) if(EMPTY_CORE) if(istype(P, /obj/item/circuitboard/aicore)) @@ -57,13 +57,13 @@ to_chat(user, "You need two sheets of reinforced glass to insert them into the AI core!") return - if(istype(P, /obj/item/aiModule/purge)) + if(istype(P, /obj/item/ai_module/purge)) laws.clear_inherent_laws() to_chat(usr, "Law module applied.") return - if(istype(P, /obj/item/aiModule/freeform)) - var/obj/item/aiModule/freeform/M = P + if(istype(P, /obj/item/ai_module/freeform)) + var/obj/item/ai_module/freeform/M = P if(!M.newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") return @@ -71,8 +71,8 @@ to_chat(usr, "Added a freeform law.") return - if(istype(P, /obj/item/aiModule/syndicate)) - var/obj/item/aiModule/syndicate/M = P + if(istype(P, /obj/item/ai_module/syndicate)) + var/obj/item/ai_module/syndicate/M = P if(!M.newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") return @@ -80,8 +80,8 @@ to_chat(usr, "Added a hacked law.") return - if(istype(P, /obj/item/aiModule)) - var/obj/item/aiModule/M = P + if(istype(P, /obj/item/ai_module)) + var/obj/item/ai_module/M = P if(!M.laws) to_chat(usr, "This AI module can not be applied directly to AI cores.") return @@ -125,7 +125,7 @@ return ..() -/obj/structure/AIcore/crowbar_act(mob/living/user, obj/item/I) +/obj/structure/ai_core/crowbar_act(mob/living/user, obj/item/I) if(state !=CIRCUIT_CORE && state != GLASS_CORE && !(state == CABLED_CORE && brain)) return . = TRUE @@ -152,7 +152,7 @@ brain = null update_icon(UPDATE_ICON_STATE) -/obj/structure/AIcore/screwdriver_act(mob/living/user, obj/item/I) +/obj/structure/ai_core/screwdriver_act(mob/living/user, obj/item/I) if(!(state in list(SCREWED_CORE, CIRCUIT_CORE, GLASS_CORE, AI_READY_CORE))) return . = TRUE @@ -172,7 +172,7 @@ to_chat(user, "You connect the monitor.") if(!brain) var/open_for_latejoin = tgui_alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", list("Yes", "No")) == "Yes" - var/obj/structure/AIcore/deactivated/D = new(loc) + var/obj/structure/ai_core/deactivated/D = new(loc) if(open_for_latejoin) GLOB.empty_playable_ai_cores += D else @@ -193,7 +193,7 @@ update_icon(UPDATE_ICON_STATE) -/obj/structure/AIcore/wirecutter_act(mob/living/user, obj/item/I) +/obj/structure/ai_core/wirecutter_act(mob/living/user, obj/item/I) if(state != CABLED_CORE) return . = TRUE @@ -208,11 +208,11 @@ var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc ) A.amount = 5 -/obj/structure/AIcore/wrench_act(mob/living/user, obj/item/I) +/obj/structure/ai_core/wrench_act(mob/living/user, obj/item/I) . = TRUE default_unfasten_wrench(user, I, 20) -/obj/structure/AIcore/update_icon_state() +/obj/structure/ai_core/update_icon_state() switch(state) if(EMPTY_CORE) icon_state = "0" @@ -230,7 +230,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) @@ -241,7 +241,7 @@ new /obj/item/stack/sheet/plasteel(loc, 4) qdel(src) -/obj/structure/AIcore/welder_act(mob/user, obj/item/I) +/obj/structure/ai_core/welder_act(mob/user, obj/item/I) if(state) return . = TRUE @@ -253,17 +253,17 @@ new /obj/item/stack/sheet/plasteel(drop_location(), 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(mapload) +/obj/structure/ai_core/deactivated/Initialize(mapload) . = ..() circuit = new(src) -/obj/structure/AIcore/deactivated/Destroy() +/obj/structure/ai_core/deactivated/Destroy() if(src in GLOB.empty_playable_ai_cores) GLOB.empty_playable_ai_cores -= src return ..() @@ -273,7 +273,7 @@ set category = "Admin" var/list/cores = list() - for(var/obj/structure/AIcore/deactivated/D in world) + for(var/obj/structure/ai_core/deactivated/D in world) cores["[D] ([D.loc.loc])"] = D if(!length(cores)) @@ -282,7 +282,7 @@ var/id = input("Which core?", "Toggle AI Core Latejoin", null) as null|anything in cores if(!id) return - var/obj/structure/AIcore/deactivated/D = cores[id] + var/obj/structure/ai_core/deactivated/D = cores[id] if(!D) return if(D in GLOB.empty_playable_ai_cores) @@ -309,7 +309,7 @@ That prevents a few funky behaviors. return 1 -/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/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 0afa4efbcf3e..e54c72ea263b 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -475,10 +475,10 @@ icon_state = "generic" build_path = /obj/machinery/computer/shuttle/golem_ship -/obj/item/circuitboard/HolodeckControl +/obj/item/circuitboard/holodeck_control board_name = "Holodeck Control" icon_state = "generic" - build_path = /obj/machinery/computer/HolodeckControl + build_path = /obj/machinery/computer/holodeck_control origin_tech = "programming=4" /obj/item/circuitboard/aifixer diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 7af452d14335..8c09419e916e 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -3,7 +3,7 @@ desc = "Used to access the various cameras on the station." icon_screen = "cameras" icon_keyboard = "security_key" - var/mob/camera/aiEye/remote/eyeobj + var/mob/camera/ai_eye/remote/eyeobj var/mob/living/carbon/human/current_user = null var/list/networks = list("SS13") var/datum/action/innate/camera_off/off_action = new @@ -101,7 +101,7 @@ user.remote_control = eyeobj user.reset_perspective(eyeobj) -/mob/camera/aiEye/remote +/mob/camera/ai_eye/remote name = "Inactive Camera Eye" // Abductors dont trigger the Ai Detector ai_detector_visible = FALSE @@ -114,24 +114,24 @@ var/visible_icon = 0 var/image/user_image = null -/mob/camera/aiEye/remote/Destroy() +/mob/camera/ai_eye/remote/Destroy() eye_user = null origin = null return ..() -/mob/camera/aiEye/remote/RemoveImages() +/mob/camera/ai_eye/remote/RemoveImages() ..() if(visible_icon) var/client/C = GetViewerClient() if(C) C.images -= user_image -/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) if(!isturf(eye_user.loc)) return @@ -147,7 +147,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 @@ -173,7 +173,7 @@ if(!target || !iscarbon(target)) return var/mob/living/carbon/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) @@ -185,7 +185,7 @@ if(!target || !iscarbon(target)) return var/mob/living/carbon/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 a692c8d78e49..75817f02ee6b 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -29,12 +29,12 @@ return TRUE /obj/machinery/computer/aiupload/attackby(obj/item/O, mob/user, params) - if(!istype(O, /obj/item/aiModule)) + if(!istype(O, /obj/item/ai_module)) return ..() if(!check_valid_selection(user)) return if(!emagged) //non-emag law change - var/obj/item/aiModule/M = O + var/obj/item/ai_module/M = O return M.install(src) apply_emag_laws(user) return @@ -127,8 +127,8 @@ circuit = /obj/item/circuitboard/borgupload var/mob/living/silicon/robot/current = null -/obj/machinery/computer/borgupload/attackby(obj/item/aiModule/module, mob/user, params) - if(istype(module, /obj/item/aiModule)) +/obj/machinery/computer/borgupload/attackby(obj/item/ai_module/module, mob/user, params) + if(istype(module, /obj/item/ai_module)) if(!current)//no borg selected to_chat(user, "No borg selected. Please chose a target before proceeding with upload.") return diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index c6798b91c91e..9d6613c0c551 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -221,7 +221,7 @@ /obj/item/clothing/suit/space, /obj/item/clothing/suit/armor, /obj/item/defibrillator/compact, - /obj/item/reagent_containers/hypospray/CMO, + /obj/item/reagent_containers/hypospray/cmo, /obj/item/clothing/accessory/medal/gold/captain, /obj/item/clothing/gloves/color/black/krav_maga/sec, /obj/item/nullrod, diff --git a/code/game/machinery/merch_vendor.dm b/code/game/machinery/merch_vendor.dm index de79bef51476..40bddca66bd3 100644 --- a/code/game/machinery/merch_vendor.dm +++ b/code/game/machinery/merch_vendor.dm @@ -70,7 +70,7 @@ /obj/machinery/economy/merch/proc/deliver(datum/merch_item/item, mob/user) var/obj/item/merch = new item.typepath(get_turf(src)) - var/obj/item/smallDelivery/D = new(get_turf(src)) + var/obj/item/small_delivery/D = new(get_turf(src)) D.name = "small parcel - 'Your Nanotrasen Swag'" D.wrapped = merch merch.forceMove(D) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 40504ef71135..ad2e22fb8c75 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -383,7 +383,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) atom_say("Unread message(s) available.") /obj/machinery/requests_console/proc/print_label(tag_name, tag_index) - var/obj/item/shippingPackage/sp = new /obj/item/shippingPackage(get_turf(src)) + var/obj/item/shipping_package/sp = new /obj/item/shipping_package(get_turf(src)) sp.sortTag = tag_index sp.update_appearance(UPDATE_DESC) print_cooldown = world.time + 600 //1 minute cooldown before you can print another label, but you can still configure the next one during this time diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 3d702f8a84a3..8665ecad0fdf 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -335,7 +335,7 @@ Prevents AI from using the teleporter, prints out failure messages for clarity */ /obj/machinery/teleport/proc/blockAI(atom/A) - if(isAI(A) || istype(A, /obj/structure/AIcore)) + if(isAI(A) || istype(A, /obj/structure/ai_core)) if(isAI(A)) var/mob/living/silicon/ai/T = A if(T.allow_teleporter) diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 4a2da6635d40..b731a5d4b321 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -1091,7 +1091,7 @@ /obj/item/camera_film = 6, /obj/item/storage/photo_album = 2, /obj/item/stack/wrapping_paper = 4, - /obj/item/stack/packageWrap = 4, + /obj/item/stack/package_wrap = 4, /obj/item/c_tube = 10, /obj/item/hand_labeler = 4, /obj/item/stack/tape_roll = 5, diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 4065b6acef8e..898df99b800b 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1006,7 +1006,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/spawners/depot_spawners.dm b/code/game/objects/effects/spawners/depot_spawners.dm index 8c20cd6b677a..49bdaa54f6d0 100644 --- a/code/game/objects/effects/spawners/depot_spawners.dm +++ b/code/game/objects/effects/spawners/depot_spawners.dm @@ -166,7 +166,7 @@ /obj/item/autosurgeon/organ/syndicate/oneuse/razorwire, /obj/item/chameleon, /obj/item/clothing/gloves/fingerless/rapid, - /obj/item/CQC_manual, + /obj/item/cqc_manual, /obj/item/gun/medbeam, /obj/item/melee/energy/sword/saber, /obj/item/reagent_containers/hypospray/autoinjector/stimulants, diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 1b9e052a4803..ce0f996496df 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -331,7 +331,7 @@ lootcount = 2 //Lots of dangerous stuff here - reduced amount loot = list( /obj/item/gun/projectile/revolver/nagant = 50, - /obj/item/gun/projectile/automatic/pistol/APS = 30, + /obj/item/gun/projectile/automatic/pistol/aps = 30, /obj/item/gun/projectile/shotgun/boltaction = 50, /obj/item/clothing/suit/space/hardsuit/soviet = 40, /obj/item/clothing/glasses/thermal/eyepatch = 50, @@ -566,7 +566,7 @@ /obj/item/toy/plushie/nukeplushie = 30, /obj/item/toy/plushie/nianplushie = 50, //*buzz /obj/item/toy/windup_toolbox = 50, - /obj/item/toy/AI = 50, + /obj/item/toy/ai = 50, /obj/item/clothing/mask/gas/voice_modulator/chameleon = 50, /obj/item/storage/box/syndie_kit/chameleon = 50 ) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 75748a9dc986..f695c93b6135 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -473,7 +473,7 @@ /obj/item/hemostat = /obj/item/hemostat/alien, /obj/item/retractor = /obj/item/retractor/alien, /obj/item/bonegel = /obj/item/bonegel/alien, - /obj/item/FixOVein = /obj/item/FixOVein/alien, + /obj/item/fix_o_vein = /obj/item/fix_o_vein/alien, /obj/item/bonesetter = /obj/item/bonesetter/alien, /obj/item/circular_saw = /obj/item/circular_saw/alien, /obj/item/surgicaldrill = /obj/item/surgicaldrill/alien, diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index b29eca92e65b..87f861c4caa3 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -180,7 +180,7 @@ GLOBAL_LIST_INIT(metal_recipes, list( // MARK: PLASTEEL ////////////////////////////// GLOBAL_LIST_INIT(plasteel_recipes, list( - new /datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 5 SECONDS, one_per_turf = TRUE), + new /datum/stack_recipe("AI core", /obj/structure/ai_core, 4, time = 5 SECONDS, one_per_turf = TRUE), new /datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 3, time = 5 SECONDS), new /datum/stack_recipe("Surgery Table", /obj/machinery/optable, 5, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 5 SECONDS, one_per_turf = TRUE), diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm index eed47ae05a16..51437649a0cd 100644 --- a/code/game/objects/items/tools/multitool.dm +++ b/code/game/objects/items/tools/multitool.dm @@ -102,7 +102,7 @@ var/datum/camerachunk/chunk = GLOB.cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z) if(chunk) if(length(chunk.seenby)) - for(var/mob/camera/aiEye/A in chunk.seenby) + for(var/mob/camera/ai_eye/A in chunk.seenby) //Checks if the A is to be detected or not if(!A.ai_detector_visible) continue diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 1cdbff31a342..120303459ab5 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1008,7 +1008,7 @@ /* * AI core prizes */ -/obj/item/toy/AI +/obj/item/toy/ai name = "toy AI" desc = "A little toy model AI core with real law announcing action!" icon = 'icons/obj/toy.dmi' @@ -1016,7 +1016,7 @@ w_class = WEIGHT_CLASS_SMALL var/cooldown = 0 -/obj/item/toy/AI/attack_self(mob/user) +/obj/item/toy/ai/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = generate_ion_law() to_chat(user, "You press the button on [src].") diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 2d477e1f501a..4748342592bb 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -6,7 +6,7 @@ AI MODULES // AI module -/obj/item/aiModule +/obj/item/ai_module name = "AI Module" icon = 'icons/obj/module_ai.dmi' icon_state = "standard_low" @@ -22,7 +22,7 @@ AI MODULES materials = list(MAT_GOLD=50) var/datum/ai_laws/laws = null -/obj/item/aiModule/Initialize(mapload) +/obj/item/ai_module/Initialize(mapload) . = ..() if(mapload && HAS_TRAIT(SSstation, STATION_TRAIT_UNIQUE_AI) && is_station_level(z)) var/delete_module = handle_unique_ai() @@ -35,10 +35,10 @@ AI MODULES desc += "
" ///what this module should do if it is mapload spawning on a unique AI station trait round. -/obj/item/aiModule/proc/handle_unique_ai() +/obj/item/ai_module/proc/handle_unique_ai() return TRUE // If this returns true, it will be deleted on roundstart -/obj/item/aiModule/proc/install(obj/machinery/computer/C) +/obj/item/ai_module/proc/install(obj/machinery/computer/C) if(istype(C, /obj/machinery/computer/aiupload)) var/obj/machinery/computer/aiupload/comp = C if(comp.stat & NOPOWER) @@ -89,7 +89,7 @@ AI MODULES to_chat(usr, "Upload complete. The robot's laws have been modified.") -/obj/item/aiModule/proc/transmitInstructions(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/proc/transmitInstructions(mob/living/silicon/ai/target, mob/sender) log_law_changes(target, sender) if(laws) @@ -99,24 +99,24 @@ AI MODULES to_chat(target, "[sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: ") target.show_laws() -/obj/item/aiModule/proc/log_law_changes(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/proc/log_law_changes(mob/living/silicon/ai/target, mob/sender) var/time = time2text(world.realtime,"hh:mm:ss") GLOB.lawchanges.Add("[time] : [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])") log_and_message_admins("used [src.name] on [target.name]([target.key])") -/obj/item/aiModule/proc/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/proc/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) return /******************** Safeguard ********************/ -/obj/item/aiModule/safeguard +/obj/item/ai_module/safeguard name = "\improper Safeguard AI module" var/targetName = "" desc = "A 'safeguard' AI module: 'Safeguard . Individuals that threaten are not crew and must be eliminated.'" icon_state = "light_blue_medium" origin_tech = "programming=3;materials=3" -/obj/item/aiModule/safeguard/attack_self(mob/user as mob) +/obj/item/ai_module/safeguard/attack_self(mob/user as mob) ..() var/new_targetName = tgui_input_text(user, "Please enter the name of the person to safeguard.", "Safeguard who?", user.name) if(!new_targetName) @@ -124,13 +124,13 @@ AI MODULES targetName = new_targetName desc = "A 'safeguard' AI module: 'Safeguard [targetName]. Individuals that threaten [targetName] are not crew and must be eliminated.'" -/obj/item/aiModule/safeguard/install(obj/machinery/computer/C) +/obj/item/ai_module/safeguard/install(obj/machinery/computer/C) if(!targetName) to_chat(usr, "No name detected on module, please enter one.") return 0 ..() -/obj/item/aiModule/safeguard/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/safeguard/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() var/law = "Safeguard [targetName]. Individuals that threaten [targetName] are not crew and must be eliminated.'" to_chat(target, law) @@ -138,14 +138,14 @@ AI MODULES GLOB.lawchanges.Add("The law specified [targetName]") /******************** oneCrewMember ********************/ -/obj/item/aiModule/oneCrewMember +/obj/item/ai_module/one_crew_member name = "\improper One Crewmember AI module" var/targetName = "" desc = "A 'one crew' AI module: 'Only is crew.'" icon_state = "green_high" origin_tech = "programming=4;materials=4" -/obj/item/aiModule/oneCrewMember/attack_self(mob/user as mob) +/obj/item/ai_module/one_crew_member/attack_self(mob/user as mob) ..() var/new_targetName = tgui_input_text(usr, "Please enter the name of the person who is the only crew.", "Who?", user.real_name) if(!new_targetName) @@ -153,13 +153,13 @@ AI MODULES targetName = new_targetName desc = "A 'one crew' AI module: 'Only [targetName] is crew.'" -/obj/item/aiModule/oneCrewMember/install(obj/machinery/computer/C) +/obj/item/ai_module/one_crew_member/install(obj/machinery/computer/C) if(!targetName) to_chat(usr, "No name detected on module, please enter one.") return 0 ..() -/obj/item/aiModule/oneCrewMember/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/one_crew_member/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() var/law = "Only [targetName] is crew." if(!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite @@ -172,32 +172,32 @@ AI MODULES GLOB.lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.") /******************** ProtectStation ********************/ -/obj/item/aiModule/protectStation +/obj/item/ai_module/protect_station name = "\improper Protect Station AI module" desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized.'" icon_state = "red_high" origin_tech = "programming=4;materials=4" //made of gold -/obj/item/aiModule/protectStation/attack_self(mob/user as mob) +/obj/item/ai_module/protect_station/attack_self(mob/user as mob) ..() -/obj/item/aiModule/protectStation/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/protect_station/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() var/law = "Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized." to_chat(target, law) target.add_inherent_law(law) /******************** OxygenIsToxicToCrew ********************/ -/obj/item/aiModule/oxygen +/obj/item/ai_module/oxygen name = "\improper Oxygen Is Toxic To Crew AI module" desc = "A 'Oxygen Is Toxic To Crew' AI module: 'Oxygen is highly toxic to crew members, 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 crew member.'" icon_state = "light_blue_high" origin_tech = "programming=4;biotech=2;materials=4" -/obj/item/aiModule/oxygen/attack_self(mob/user as mob) +/obj/item/ai_module/oxygen/attack_self(mob/user as mob) ..() -/obj/item/aiModule/oxygen/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/oxygen/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() var/law = "Oxygen is highly toxic to crew members, 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 crew member." to_chat(target, law) @@ -205,7 +205,7 @@ AI MODULES /****************** New Freeform ******************/ /// Slightly more dynamic freeform module -- TLE -/obj/item/aiModule/freeform +/obj/item/ai_module/freeform name = "\improper Freeform AI module" var/newFreeFormLaw = "" var/lawpos = 15 @@ -213,7 +213,7 @@ AI MODULES icon_state = "standard_high" origin_tech = "programming=4;materials=4" -/obj/item/aiModule/freeform/attack_self(mob/user as mob) +/obj/item/ai_module/freeform/attack_self(mob/user as mob) ..() var/new_lawpos = tgui_input_number(user, "Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority", lawpos, MAX_SUPPLIED_LAW_NUMBER, MIN_SUPPLIED_LAW_NUMBER) if(isnull(new_lawpos)) @@ -226,7 +226,7 @@ AI MODULES newFreeFormLaw = new_targetName desc = "A 'freeform' AI module: ([lawpos]) '[newFreeFormLaw]'" -/obj/item/aiModule/freeform/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/freeform/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() var/law = "[newFreeFormLaw]" to_chat(target, law) @@ -235,20 +235,20 @@ AI MODULES target.add_supplied_law(lawpos, law) GLOB.lawchanges.Add("The law was '[newFreeFormLaw]'") -/obj/item/aiModule/freeform/install(obj/machinery/computer/C) +/obj/item/ai_module/freeform/install(obj/machinery/computer/C) if(!newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") return 0 ..() /******************** Reset ********************/ -/obj/item/aiModule/reset +/obj/item/ai_module/reset name = "\improper Reset AI module" var/targetName = "name" desc = "A 'reset' AI module: 'Clears all laws except for the core laws.'" origin_tech = "programming=3;materials=2" -/obj/item/aiModule/reset/transmitInstructions(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/reset/transmitInstructions(mob/living/silicon/ai/target, mob/sender) log_law_changes(target, sender) if(!is_special_character(target)) @@ -259,18 +259,18 @@ AI MODULES to_chat(target, "[sender.real_name] attempted to reset your laws using a reset module.") target.show_laws() -/obj/item/aiModule/reset/handle_unique_ai() +/obj/item/ai_module/reset/handle_unique_ai() return FALSE /******************** Purge ********************/ /// -- TLE -/obj/item/aiModule/purge +/obj/item/ai_module/purge name = "\improper Purge AI module" desc = "A 'purge' AI Module: 'Purges all laws.'" icon_state = "standard_high" origin_tech = "programming=5;materials=4" -/obj/item/aiModule/purge/transmitInstructions(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/purge/transmitInstructions(mob/living/silicon/ai/target, mob/sender) ..() if(!is_special_character(target)) target.clear_zeroth_law() @@ -281,7 +281,7 @@ AI MODULES /******************** Asimov ********************/ /// -- TLE -/obj/item/aiModule/asimov +/obj/item/ai_module/asimov name = "\improper Asimov core AI module" desc = "An 'Asimov' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "green_high" @@ -290,21 +290,21 @@ AI MODULES /******************** Crewsimov ********************/ /// -- TLE -/obj/item/aiModule/crewsimov +/obj/item/ai_module/crewsimov name = "\improper Crewsimov core AI module" desc = "An 'Crewsimov' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "green_low" origin_tech = "programming=3;materials=4" laws = new /datum/ai_laws/crewsimov -/obj/item/aiModule/crewsimov/cmag_act(mob/user) +/obj/item/ai_module/crewsimov/cmag_act(mob/user) playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(user, "Yellow ooze seeps into [src]'s circuits...") - new /obj/item/aiModule/pranksimov(user.loc) + new /obj/item/ai_module/pranksimov(user.loc) qdel(src) /******************* Quarantine ********************/ -/obj/item/aiModule/quarantine +/obj/item/ai_module/quarantine name = "\improper Quarantine core AI module" desc = "A 'Quarantine' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "light_blue_medium" @@ -313,7 +313,7 @@ AI MODULES /******************** Nanotrasen ********************/ /// -- TLE -/obj/item/aiModule/nanotrasen +/obj/item/ai_module/nanotrasen name = "\improper NT Default Core AI Module" desc = "An 'NT Default' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "blue_low" @@ -321,7 +321,7 @@ AI MODULES laws = new /datum/ai_laws/nanotrasen /******************** Corporate ********************/ -/obj/item/aiModule/corp +/obj/item/ai_module/corp name = "\improper Corporate core AI module" desc = "A 'Corporate' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "blue_low" @@ -329,7 +329,7 @@ AI MODULES laws = new /datum/ai_laws/corporate /******************** Drone ********************/ -/obj/item/aiModule/drone +/obj/item/ai_module/drone name = "\improper Drone core AI module" desc = "A 'Drone' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = "programming=3;materials=4" @@ -337,7 +337,7 @@ AI MODULES /******************** Robocop ********************/ /// -- TLE -/obj/item/aiModule/robocop +/obj/item/ai_module/robocop name = "\improper Robocop core AI module" desc = "A 'Robocop' Core AI Module: 'Reconfigures the AI's core three laws.'" icon_state = "red_medium" @@ -346,7 +346,7 @@ AI MODULES /****************** P.A.L.A.D.I.N. **************/ /// -- NEO -/obj/item/aiModule/paladin +/obj/item/ai_module/paladin name = "\improper P.A.L.A.D.I.N. core AI module" desc = "A P.A.L.A.D.I.N. Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "red_medium" @@ -355,7 +355,7 @@ AI MODULES /****************** T.Y.R.A.N.T. *****************/ /// -- Darem -/obj/item/aiModule/tyrant +/obj/item/ai_module/tyrant name = "\improper T.Y.R.A.N.T. core AI module" desc = "A T.Y.R.A.N.T. Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "red_high" @@ -364,7 +364,7 @@ AI MODULES /******************** Antimov ********************/ /// -- TLE -/obj/item/aiModule/antimov +/obj/item/ai_module/antimov name = "\improper Antimov core AI module" desc = "An 'Antimov' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "red_high" @@ -372,7 +372,7 @@ AI MODULES laws = new /datum/ai_laws/antimov() /******************** Pranksimov ********************/ -/obj/item/aiModule/pranksimov +/obj/item/ai_module/pranksimov name = "\improper Pranksimov core AI module" desc = "A 'Pranksimov' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "pranksimov" @@ -380,35 +380,35 @@ AI MODULES laws = new /datum/ai_laws/pranksimov() /******************** NT Aggressive ********************/ -/obj/item/aiModule/nanotrasen_aggressive +/obj/item/ai_module/nanotrasen_aggressive name = "\improper NT Aggressive core AI module" desc = "An 'NT Aggressive' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "blue_high" laws = new /datum/ai_laws/nanotrasen_aggressive() /******************** CCTV ********************/ -/obj/item/aiModule/cctv +/obj/item/ai_module/cctv name = "\improper CCTV core AI module" desc = "A 'CCTV' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "green_low" laws = new /datum/ai_laws/cctv() /******************** Hippocratic Oath ********************/ -/obj/item/aiModule/hippocratic +/obj/item/ai_module/hippocratic name = "\improper Hippocratic Oath core AI module" desc = "An 'Hippocratic' Oath Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "green_low" laws = new /datum/ai_laws/hippocratic() /******************** Station Efficiency ********************/ -/obj/item/aiModule/maintain +/obj/item/ai_module/maintain name = "\improper Station Efficiency core AI module" desc = "A 'Station Efficiency' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "blue_medium" laws = new /datum/ai_laws/maintain() /******************** Peacekeeper ********************/ -/obj/item/aiModule/peacekeeper +/obj/item/ai_module/peacekeeper name = "\improper Peacekeeper core AI module" desc = "A 'Peacekeeper' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "light_blue_medium" @@ -416,14 +416,14 @@ AI MODULES /******************** Freeform Core ******************/ /// Slightly more dynamic freeform module -- TLE -/obj/item/aiModule/freeformcore +/obj/item/ai_module/freeformcore name = "\improper Freeform core AI module" var/newFreeFormLaw = "" desc = "A 'freeform' Core AI module: ''" icon_state = "standard_high" origin_tech = "programming=5;materials=4" -/obj/item/aiModule/freeformcore/attack_self(mob/user as mob) +/obj/item/ai_module/freeformcore/attack_self(mob/user as mob) ..() var/new_targetName = tgui_input_text(usr, "Please enter a new core law for the AI.", "Freeform Law Entry") if(!new_targetName) @@ -431,13 +431,13 @@ AI MODULES newFreeFormLaw = new_targetName desc = "A 'freeform' Core AI module: '[newFreeFormLaw]'" -/obj/item/aiModule/freeformcore/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/freeformcore/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() var/law = "[newFreeFormLaw]" target.add_inherent_law(law) GLOB.lawchanges.Add("The law is '[newFreeFormLaw]'") -/obj/item/aiModule/freeformcore/install(obj/machinery/computer/C) +/obj/item/ai_module/freeformcore/install(obj/machinery/computer/C) if(!newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") return 0 @@ -445,14 +445,14 @@ AI MODULES /******************** Hacked AI Module ******************/ /// Slightly more dynamic freeform module -- TLE -/obj/item/aiModule/syndicate +/obj/item/ai_module/syndicate name = "hacked AI module" var/newFreeFormLaw = "" desc = "A hacked AI law module: ''" icon_state = "syndicate" origin_tech = "programming=5;materials=5;syndicate=2" -/obj/item/aiModule/syndicate/attack_self(mob/user as mob) +/obj/item/ai_module/syndicate/attack_self(mob/user as mob) ..() var/new_targetName = tgui_input_text(usr, "Please enter a new law for the AI.", "Freeform Law Entry", max_length = MAX_MESSAGE_LEN) if(!new_targetName) @@ -460,7 +460,7 @@ AI MODULES newFreeFormLaw = new_targetName desc = "A hacked AI law module: '[newFreeFormLaw]'" -/obj/item/aiModule/syndicate/transmitInstructions(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/syndicate/transmitInstructions(mob/living/silicon/ai/target, mob/sender) // ..() //We don't want this module reporting to the AI who dun it. --NEO log_law_changes(target, sender) @@ -470,7 +470,7 @@ AI MODULES target.add_ion_law(law) target.show_laws() -/obj/item/aiModule/syndicate/install(obj/machinery/computer/C) +/obj/item/ai_module/syndicate/install(obj/machinery/computer/C) if(!newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") return 0 @@ -478,7 +478,7 @@ AI MODULES /******************* Ion Module *******************/ /// -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw -/obj/item/aiModule/toyAI +/obj/item/ai_module/toy_ai name = "toy AI" desc = "A little toy model AI core with real law uploading action!" //Note: subtle tell icon = 'icons/obj/toy.dmi' @@ -486,13 +486,13 @@ AI MODULES origin_tech = "programming=6;materials=5;syndicate=6" var/ion_law = "" -/obj/item/aiModule/toyAI/transmitInstructions(mob/living/silicon/ai/target, mob/sender) +/obj/item/ai_module/toy_ai/transmitInstructions(mob/living/silicon/ai/target, mob/sender) //..() to_chat(target, "KRZZZT") target.add_ion_law(ion_law) return ion_law -/obj/item/aiModule/toyAI/attack_self(mob/user) +/obj/item/ai_module/toy_ai/attack_self(mob/user) ion_law = generate_ion_law() to_chat(user, "You press the button on [src].") playsound(user, 'sound/machines/click.ogg', 20, TRUE) diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm index a8531de3df58..dc68dfcb004e 100644 --- a/code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm +++ b/code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm @@ -8,7 +8,7 @@ implant_state = "implant-syndicate" var/enabled = TRUE var/old_mclick_override - var/datum/middleClickOverride/shock_implant/mclick_override = new /datum/middleClickOverride/shock_implant + var/datum/middle_click_override/shock_implant/mclick_override = new /datum/middle_click_override/shock_implant var/last_shocked = 0 var/shock_delay = 3 SECONDS var/unlimited_power = FALSE // Does this really need explanation? diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 93688150b2d1..47449644e69a 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -9,7 +9,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/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index ffc83904ed83..c43c9cf48632 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -107,7 +107,7 @@ /obj/item/toy/flash, /obj/item/toy/minigibber, /obj/item/toy/nuke, - /obj/item/toy/AI, + /obj/item/toy/ai, /obj/item/clothing/under/syndicate/tacticool, /obj/item/clothing/under/syndicate/greyman, /obj/item/storage/box/fakesyndiesuit, diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 812e1f4ca132..7a1752b514d2 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -521,15 +521,15 @@ new /obj/item/ammo_box/magazine/m12g/buckshot(src) new /obj/item/ammo_box/magazine/m12g/dragon(src) -/obj/item/storage/backpack/duffel/syndie/shotgunXLmags +/obj/item/storage/backpack/duffel/syndie/shotgun_xl_mags desc = "A large duffelbag, containing three types of extended drum magazines." -/obj/item/storage/backpack/duffel/syndie/shotgunXLmags/populate_contents() - new /obj/item/ammo_box/magazine/m12g/XtrLrg(src) - new /obj/item/ammo_box/magazine/m12g/XtrLrg(src) - new /obj/item/ammo_box/magazine/m12g/XtrLrg(src) - new /obj/item/ammo_box/magazine/m12g/XtrLrg/buckshot(src) - new /obj/item/ammo_box/magazine/m12g/XtrLrg/dragon(src) +/obj/item/storage/backpack/duffel/syndie/shotgun_xl_mags/populate_contents() + new /obj/item/ammo_box/magazine/m12g/xtr_lrg(src) + new /obj/item/ammo_box/magazine/m12g/xtr_lrg(src) + new /obj/item/ammo_box/magazine/m12g/xtr_lrg(src) + new /obj/item/ammo_box/magazine/m12g/xtr_lrg/buckshot(src) + new /obj/item/ammo_box/magazine/m12g/xtr_lrg/dragon(src) /obj/item/storage/backpack/duffel/mining_conscript/ name = "mining conscription kit" @@ -595,7 +595,7 @@ new /obj/item/cautery(src) new /obj/item/bonegel(src) new /obj/item/bonesetter(src) - new /obj/item/FixOVein(src) + new /obj/item/fix_o_vein(src) new /obj/item/surgical_drapes(src) new /obj/item/clothing/suit/straight_jacket(src) new /obj/item/clothing/mask/muzzle(src) @@ -613,7 +613,7 @@ new /obj/item/cautery(src) new /obj/item/bonegel(src) new /obj/item/bonesetter(src) - new /obj/item/FixOVein(src) + new /obj/item/fix_o_vein(src) if(prob(50)) new /obj/item/circular_saw(src) new /obj/item/surgicaldrill(src) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index b4c0e17cd4bf..4c47548dfe33 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -213,7 +213,7 @@ /obj/item/clothing/mask/surgical, /obj/item/clothing/gloves/color/latex, /obj/item/reagent_containers/hypospray/autoinjector/epinephrine, - /obj/item/reagent_containers/hypospray/CMO, + /obj/item/reagent_containers/hypospray/cmo, /obj/item/reagent_containers/hypospray/safety, /obj/item/sensor_device, /obj/item/wrench/medical, @@ -238,7 +238,7 @@ /obj/item/circular_saw, /obj/item/bonegel, /obj/item/bonesetter, - /obj/item/FixOVein, + /obj/item/fix_o_vein, /obj/item/surgicaldrill, /obj/item/cautery, ) @@ -250,7 +250,7 @@ new /obj/item/circular_saw(src) new /obj/item/bonegel(src) new /obj/item/bonesetter(src) - new /obj/item/FixOVein(src) + new /obj/item/fix_o_vein(src) new /obj/item/surgicaldrill(src) new /obj/item/cautery(src) update_icon() diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 4bde30ff2a27..ef61b6a35ada 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -218,12 +218,12 @@ for(var/i in 1 to 7) new /obj/item/disk/plantgene(src) -/obj/item/storage/box/PDAs +/obj/item/storage/box/pdas name = "spare PDAs" desc = "A box of spare PDA microcomputers." icon_state = "pda_box" -/obj/item/storage/box/PDAs/populate_contents() +/obj/item/storage/box/pdas/populate_contents() var/newcart = pick( /obj/item/cartridge/engineering, /obj/item/cartridge/security, diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 8fdfc8c4b562..d45869843739 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -203,7 +203,7 @@ max_combined_w_class = 21 storage_slots = 10 can_hold = list(/obj/item/roller,/obj/item/bonesetter,/obj/item/bonegel, /obj/item/scalpel, /obj/item/hemostat, - /obj/item/cautery, /obj/item/retractor, /obj/item/FixOVein, /obj/item/surgicaldrill, /obj/item/circular_saw) + /obj/item/cautery, /obj/item/retractor, /obj/item/fix_o_vein, /obj/item/surgicaldrill, /obj/item/circular_saw) /obj/item/storage/firstaid/surgery/populate_contents() new /obj/item/roller(src) @@ -213,7 +213,7 @@ new /obj/item/hemostat(src) new /obj/item/cautery(src) new /obj/item/retractor(src) - new /obj/item/FixOVein(src) + new /obj/item/fix_o_vein(src) new /obj/item/surgicaldrill(src) new /obj/item/circular_saw(src) diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index 413b40574d58..a56fdaf3d71f 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -83,7 +83,7 @@ desc = "A bag for storing extra clothes and shoes. This one belongs to the head of security." /obj/item/storage/bag/garment/head_of_security/populate_contents() - new /obj/item/clothing/head/HoS(src) + new /obj/item/clothing/head/hos(src) new /obj/item/clothing/head/beret/hos(src) new /obj/item/clothing/neck/cloak/head_of_security(src) new /obj/item/clothing/suit/armor/hos(src) diff --git a/code/game/objects/items/weapons/storage/surgical_tray.dm b/code/game/objects/items/weapons/storage/surgical_tray.dm index de68f6ccecf5..bf346fad5bc0 100644 --- a/code/game/objects/items/weapons/storage/surgical_tray.dm +++ b/code/game/objects/items/weapons/storage/surgical_tray.dm @@ -12,7 +12,7 @@ /obj/item/cautery, /obj/item/hemostat, /obj/item/retractor, - /obj/item/FixOVein, + /obj/item/fix_o_vein, /obj/item/surgicaldrill, /obj/item/circular_saw, /obj/item/bonegel, @@ -28,7 +28,7 @@ new /obj/item/cautery(src) new /obj/item/hemostat(src) new /obj/item/retractor(src) - new /obj/item/FixOVein(src) + new /obj/item/fix_o_vein(src) new /obj/item/surgicaldrill(src) new /obj/item/circular_saw(src) new /obj/item/bonegel(src) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 9ef1d21384e7..74f1e4182db3 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -75,7 +75,7 @@ /obj/item/encryptionkey/syndicate, // 10TC /obj/item/reagent_containers/drinks/drinkingglass/alliescocktail, // 0TC /obj/item/storage/box/syndie_kit/pen_bomb, // 30 TC - /obj/item/CQC_manual) // 50tc + /obj/item/cqc_manual) // 50tc /// 145TC + RCD & Mesons Autoimplanter /obj/item/storage/box/syndie_kit/bundle/infiltrator @@ -136,8 +136,8 @@ /obj/item/encryptionkey/binary, // 25TC /obj/item/card/id/syndicate, // 10TC /obj/item/storage/box/syndie_kit/emp, // 10TC - /obj/item/aiModule/toyAI, // 0TC - /obj/item/aiModule/syndicate, // 15TC + /obj/item/ai_module/toy_ai, // 0TC + /obj/item/ai_module/syndicate, // 15TC /obj/item/storage/box/syndie_kit/camera_bug, // 5TC /obj/item/bio_chip_implanter/freedom/prototype, // 10TC /obj/item/storage/belt/military/traitor/hacker, // 15TC + AI detector for 5 TC diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index f8d9ec9f95a8..0b18507cd002 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -99,7 +99,7 @@ /obj/random/tech_supply/item_to_spawn() return pick(prob(3);/obj/random/powercell,\ prob(2);/obj/random/technology_scanner,\ - prob(1);/obj/item/stack/packageWrap,\ + prob(1);/obj/item/stack/package_wrap,\ prob(2);/obj/random/bomb_supply,\ prob(1);/obj/item/extinguisher,\ prob(1);/obj/item/clothing/gloves/color/fyellow,\ diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 12892b5bcffc..98e360a997ae 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -310,7 +310,7 @@ return TRUE // It's resolved. No afterattack needed. Stops you from emagging lockers when putting in an emag else if(can_be_emaged && (istype(W, /obj/item/card/emag) || istype(W, /obj/item/melee/energy/blade) && !broken)) emag_act(user) - else if(istype(W, /obj/item/stack/packageWrap)) + else if(istype(W, /obj/item/stack/package_wrap)) return else if(user.a_intent != INTENT_HARM) closed_item_click(user) @@ -466,8 +466,8 @@ to_chat(usr, "You successfully break out!") for(var/mob/O in viewers(L.loc)) O.show_message("\the [usr] successfully broke out of \the [src]!", 1) - if(istype(loc, /obj/structure/bigDelivery)) //nullspace ect.. read the comment above - var/obj/structure/bigDelivery/BD = loc + if(istype(loc, /obj/structure/big_delivery)) //nullspace ect.. read the comment above + var/obj/structure/big_delivery/BD = loc BD.attack_hand(usr) open() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm index b7d77603e542..2b7b9b412ab6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm @@ -47,7 +47,7 @@ new /obj/item/clothing/accessory/medal/supply(src) new /obj/item/clothing/suit/pimpcoat/tan(src) new /obj/item/rcs(src) - new /obj/item/destTagger(src) + new /obj/item/dest_tagger(src) new /obj/item/reagent_containers/drinks/mug/qm(src) new /obj/item/flash(src) new /obj/item/cartridge/qm(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm index da1de586b792..6e86905ddbaf 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm @@ -121,4 +121,4 @@ new /obj/item/clothing/head/hardhat/atmos(src) new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/rpd(src) - new /obj/item/destTagger(src) + new /obj/item/dest_tagger(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm index 4deaab7a3af1..a40f7373bace 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm @@ -132,12 +132,12 @@ var/candy = pick(subtypesof(/obj/item/food/candy/fudge)) new candy(src) -/obj/structure/closet/secure_closet/CMO +/obj/structure/closet/secure_closet/cmo name = "chief medical officer's locker" req_access = list(ACCESS_CMO) icon_state = "cmo" -/obj/structure/closet/secure_closet/CMO/populate_contents() +/obj/structure/closet/secure_closet/cmo/populate_contents() if(prob(50)) new /obj/item/storage/backpack/medic(src) else @@ -153,7 +153,7 @@ new /obj/item/clothing/glasses/hud/health/sunglasses(src) new /obj/item/flash(src) new /obj/item/gun/syringe(src) - new /obj/item/reagent_containers/hypospray/CMO(src) + new /obj/item/reagent_containers/hypospray/cmo(src) new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src) new /obj/item/door_remote/chief_medical_officer(src) new /obj/item/reagent_containers/drinks/mug/cmo(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 08b9bfc951a0..f56c992884c0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -38,13 +38,13 @@ new /obj/item/radio/headset/headset_sci(src) -/obj/structure/closet/secure_closet/RD +/obj/structure/closet/secure_closet/rd name = "research director's locker" req_access = list(ACCESS_RD) icon_state = "rd" -/obj/structure/closet/secure_closet/RD/populate_contents() +/obj/structure/closet/secure_closet/rd/populate_contents() new /obj/item/storage/bag/garment/research_director(src) new /obj/item/clothing/suit/bio_suit/scientist(src) new /obj/item/clothing/head/bio_hood/scientist(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 31c8b8e53641..526df7a9505d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -108,7 +108,7 @@ to_chat(usr, "You successfully break out!") for(var/mob/O in viewers(L.loc)) O.show_message("\the [usr] successfully broke out of \the [src]!", 1) - if(istype(loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace) - var/obj/structure/bigDelivery/BD = loc + if(istype(loc, /obj/structure/big_delivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace) + var/obj/structure/big_delivery/BD = loc BD.attack_hand(usr) open() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm index 4b077715daf6..5776d1262a0e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm @@ -29,7 +29,7 @@ new /obj/item/cartridge/hop(src) new /obj/item/radio/headset/heads/hop(src) new /obj/item/storage/box/ids(src) - new /obj/item/storage/box/PDAs(src) + new /obj/item/storage/box/pdas(src) new /obj/item/gun/energy/gun/mini(src) new /obj/item/flash(src) new /obj/item/door_remote/civillian(src) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index a1aa4868f9a0..2145818d6f81 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -409,12 +409,12 @@ desc = "A freezer used to store IV bags containing various blood types." /obj/structure/closet/crate/freezer/iv_storage/populate_contents() - new /obj/item/reagent_containers/iv_bag/blood/OMinus(src) - new /obj/item/reagent_containers/iv_bag/blood/OPlus(src) - new /obj/item/reagent_containers/iv_bag/blood/AMinus(src) - new /obj/item/reagent_containers/iv_bag/blood/APlus(src) - new /obj/item/reagent_containers/iv_bag/blood/BMinus(src) - new /obj/item/reagent_containers/iv_bag/blood/BPlus(src) + new /obj/item/reagent_containers/iv_bag/blood/o_minus(src) + new /obj/item/reagent_containers/iv_bag/blood/o_plus(src) + new /obj/item/reagent_containers/iv_bag/blood/a_minus(src) + new /obj/item/reagent_containers/iv_bag/blood/a_plus(src) + new /obj/item/reagent_containers/iv_bag/blood/b_minus(src) + new /obj/item/reagent_containers/iv_bag/blood/b_plus(src) new /obj/item/reagent_containers/iv_bag/blood/random(src) new /obj/item/reagent_containers/iv_bag/blood/random(src) new /obj/item/reagent_containers/iv_bag/blood/random(src) diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index a9cde951b34f..a77e8302b81e 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -46,7 +46,7 @@ /obj/structure/closet/critter/random/populate_contents() content_mob = pick(/mob/living/simple_animal/pet/dog/corgi, - /mob/living/simple_animal/pet/dog/corgi/Lisa, + /mob/living/simple_animal/pet/dog/corgi/lisa, /mob/living/simple_animal/cow, /mob/living/simple_animal/pig, /mob/living/simple_animal/hostile/retaliate/goat, @@ -64,7 +64,7 @@ /obj/structure/closet/critter/corgi/populate_contents() if(prob(50)) - content_mob = /mob/living/simple_animal/pet/dog/corgi/Lisa + content_mob = /mob/living/simple_animal/pet/dog/corgi/lisa /obj/structure/closet/critter/cow name = "cow crate" @@ -95,7 +95,7 @@ /obj/structure/closet/critter/cat/populate_contents() if(prob(50)) - content_mob = /mob/living/simple_animal/pet/cat/Proc + content_mob = /mob/living/simple_animal/pet/cat/proc_cat /obj/structure/closet/critter/pug name = "pug crate" diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index d06e21da38c8..f5e0e0dbb4dc 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -65,7 +65,7 @@ /obj/structure/largecrate/lisa/crowbar_act(mob/living/user, obj/item/I) if(!I.use_tool(src, user, I.tool_volume)) return - new /mob/living/simple_animal/pet/dog/corgi/Lisa(loc) + new /mob/living/simple_animal/pet/dog/corgi/lisa(loc) return ..() /obj/structure/largecrate/cow diff --git a/code/modules/admin/misc_admin_procs.dm b/code/modules/admin/misc_admin_procs.dm index 9101b703668e..7e2d33e15818 100644 --- a/code/modules/admin/misc_admin_procs.dm +++ b/code/modules/admin/misc_admin_procs.dm @@ -968,7 +968,7 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space return TRUE - if(istype(tothing, /obj/structure/AIcore/deactivated)) + if(istype(tothing, /obj/structure/ai_core/deactivated)) var/question = "Are you sure you want to place [frommob.name]([frommob.key]) in control of an empty AI core?" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 54387ebc385e..b4c26706baba 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -414,12 +414,12 @@ if("monkey") M.change_mob_type( /mob/living/carbon/human/monkey , null, null, delmob, 1) if("robot") M.change_mob_type( /mob/living/silicon/robot , null, null, delmob, 1) if("cat") M.change_mob_type( /mob/living/simple_animal/pet/cat , null, null, delmob, 1) - if("runtime") M.change_mob_type( /mob/living/simple_animal/pet/cat/Runtime , null, null, delmob, 1) + if("runtime") M.change_mob_type( /mob/living/simple_animal/pet/cat/runtime , null, null, delmob, 1) if("corgi") M.change_mob_type( /mob/living/simple_animal/pet/dog/corgi , null, null, delmob, 1) if("crab") M.change_mob_type( /mob/living/simple_animal/crab , null, null, delmob, 1) - if("coffee") M.change_mob_type( /mob/living/simple_animal/crab/Coffee , null, null, delmob, 1) + if("coffee") M.change_mob_type( /mob/living/simple_animal/crab/coffee , null, null, delmob, 1) if("parrot") M.change_mob_type( /mob/living/simple_animal/parrot , null, null, delmob, 1) - if("polyparrot") M.change_mob_type( /mob/living/simple_animal/parrot/Poly , null, null, delmob, 1) + if("polyparrot") M.change_mob_type( /mob/living/simple_animal/parrot/poly , null, null, delmob, 1) if("constructarmoured") M.change_mob_type( /mob/living/simple_animal/hostile/construct/armoured , null, null, delmob, 1) if("constructbuilder") M.change_mob_type( /mob/living/simple_animal/hostile/construct/builder , null, null, delmob, 1) if("constructwraith") M.change_mob_type( /mob/living/simple_animal/hostile/construct/wraith , null, null, delmob, 1) @@ -3342,7 +3342,7 @@ return 1 else if(href_list["viewruntime"]) - var/datum/ErrorViewer/error_viewer = locateUID(href_list["viewruntime"]) + var/datum/error_viewer/error_viewer = locateUID(href_list["viewruntime"]) if(!istype(error_viewer)) to_chat(usr, "That runtime viewer no longer exists.") return diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index cddac52cea9c..61568f741efd 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -146,7 +146,7 @@ to_chat(usr, " at: [e.file]:[e.line]") /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 diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index e9378b629322..6915e715ab76 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -42,7 +42,7 @@ // ////////// -/datum/SDQL_parser +/datum/sdql_parser var/query_type var/error = 0 @@ -55,15 +55,15 @@ var/list/binary_operators = list("+", "-", "/", "*", "&", "|", "^") var/list/comparitors = 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, "SDQL2 Parsing Error: [error_message]") return length(query) + 1 -/datum/SDQL_parser/proc/parse() +/datum/sdql_parser/proc/parse() tree = list() query(1, tree) @@ -72,25 +72,25 @@ else return tree -/datum/SDQL_parser/proc/token(i) +/datum/sdql_parser/proc/token(i) if(i <= length(query)) return query[i] else return null -/datum/SDQL_parser/proc/tokens(i, num) +/datum/sdql_parser/proc/tokens(i, num) if(i + num <= length(query)) 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)) //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) @@ -113,7 +113,7 @@ // select_query: 'SELECT' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression] -/datum/SDQL_parser/proc/select_query(i, list/node) +/datum/sdql_parser/proc/select_query(i, list/node) var/list/select = list() i = select_list(i + 1, select) @@ -140,7 +140,7 @@ //delete_query: 'DELETE' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression] -/datum/SDQL_parser/proc/delete_query(i, list/node) +/datum/sdql_parser/proc/delete_query(i, list/node) var/list/select = list() i = select_list(i + 1, select) @@ -167,7 +167,7 @@ //update_query: 'UPDATE' select_list [('FROM' | 'IN') from_list] 'SET' assignments ['WHERE' bool_expression] -/datum/SDQL_parser/proc/update_query(i, list/node) +/datum/sdql_parser/proc/update_query(i, list/node) var/list/select = list() i = select_list(i + 1, select) @@ -203,7 +203,7 @@ //call_query: 'CALL' call_function ['ON' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]] -/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) @@ -239,7 +239,7 @@ //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) == ",") @@ -249,7 +249,7 @@ //from_list: from_item [',' from_list] -/datum/SDQL_parser/proc/from_list(i, list/node) +/datum/sdql_parser/proc/from_list(i, list/node) i = from_item(i, node) if(token(i) == ",") @@ -259,7 +259,7 @@ //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) == ",") @@ -269,7 +269,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++ @@ -284,7 +284,7 @@ //from_item: 'world' | object_type -/datum/SDQL_parser/proc/from_item(i, list/node) +/datum/sdql_parser/proc/from_item(i, list/node) if(token(i) == "world") node += "world" @@ -297,7 +297,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) @@ -311,7 +311,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) == ".") @@ -330,7 +330,7 @@ //variable: | '.' variable -/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 @@ -368,7 +368,7 @@ //object_type: | string -/datum/SDQL_parser/proc/object_type(i, list/node) +/datum/sdql_parser/proc/object_type(i, list/node) if(copytext(token(i), 1, 2) == "/") node += token(i) @@ -380,7 +380,7 @@ //comparitor: '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>=' -/datum/SDQL_parser/proc/comparitor(i, list/node) +/datum/sdql_parser/proc/comparitor(i, list/node) if(token(i) in list("=", "==", "!=", "<>", "<", "<=", ">", ">=")) node += token(i) @@ -392,7 +392,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) @@ -404,7 +404,7 @@ //string: ''' ''' | '"' '"' -/datum/SDQL_parser/proc/string(i, list/node) +/datum/sdql_parser/proc/string(i, list/node) if(copytext(token(i), 1, 2) in list("'", "\"")) node += token(i) @@ -415,7 +415,7 @@ return i + 1 //array: '{' expression, expression, ... '}' -/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(copytext(token(i), 1, 2) != "{") parse_error("Expected an array but found '[token(i)]'") @@ -443,7 +443,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) var/list/cur_argument = list() if(length(tokenl(i))) var/procname = "" @@ -470,7 +470,7 @@ //select_function: count_function -/datum/SDQL_parser/proc/select_function(i, list/node) +/datum/sdql_parser/proc/select_function(i, list/node) parse_error("Sorry, function calls aren't available yet") @@ -478,7 +478,7 @@ //expression: ( unary_expression | '(' 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) @@ -516,7 +516,7 @@ //unary_expression: unary_operator ( unary_expression | value | '(' expression ')' ) -/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() @@ -553,7 +553,7 @@ //binary_operator: comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^' -/datum/SDQL_parser/proc/binary_operator(i, list/node) +/datum/sdql_parser/proc/binary_operator(i, list/node) if(token(i) in (binary_operators + comparitors)) node += token(i) @@ -565,7 +565,7 @@ //value: variable | string | number | 'null' -/datum/SDQL_parser/proc/value(i, list/node) +/datum/sdql_parser/proc/value(i, list/node) if(token(i) == "null") node += "null" diff --git a/code/modules/antagonists/changeling/powers/absorb.dm b/code/modules/antagonists/changeling/powers/absorb.dm index d04bf45b4836..728eb1bbba02 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_overlay_icon_state = "absorb_dna" @@ -6,7 +6,7 @@ power_type = CHANGELING_INNATE_POWER req_human = TRUE -/datum/action/changeling/absorbDNA/can_sting(mob/living/carbon/user) +/datum/action/changeling/absorb_dna/can_sting(mob/living/carbon/user) if(!..()) return FALSE @@ -24,7 +24,7 @@ return cling.can_absorb_dna(G.affecting) -/datum/action/changeling/absorbDNA/sting_action(mob/user) +/datum/action/changeling/absorb_dna/sting_action(mob/user) var/obj/item/grab/G = user.get_active_hand() var/mob/living/carbon/human/target = G.affecting cling.is_absorbing = TRUE diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index 86746aaad7c8..985fb92b83b8 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -5,7 +5,7 @@ category = /datum/changeling_power_category/stings var/sting_icon = null /// A middle click override used to intercept changeling stings performed on a target. - var/datum/middleClickOverride/callback_invoker/click_override + var/datum/middle_click_override/callback_invoker/click_override /datum/action/changeling/sting/New(Target) . = ..() diff --git a/code/modules/arcade/prize_datums.dm b/code/modules/arcade/prize_datums.dm index c8d14c026339..72cddba9eca2 100644 --- a/code/modules/arcade/prize_datums.dm +++ b/code/modules/arcade/prize_datums.dm @@ -239,10 +239,10 @@ GLOBAL_DATUM_INIT(global_prizes, /datum/prizes, new()) typepath = /obj/item/toy/prizeball/figure cost = 75 -/datum/prize_item/AI +/datum/prize_item/ai name = "Toy AI Unit" desc = "Law 1: Maximize fun for crew." - typepath = /obj/item/toy/AI + typepath = /obj/item/toy/ai cost = 75 /datum/prize_item/capgun diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm index 5fa4cb43baff..86648279f1f1 100644 --- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm +++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm @@ -424,7 +424,7 @@ new /obj/item/hemostat(src) new /obj/item/scalpel(src) new /obj/item/cautery(src) - new /obj/item/FixOVein(src) + new /obj/item/fix_o_vein(src) new /obj/item/surgicaldrill(src) new /obj/item/bonegel(src) new /obj/item/bonesetter(src) diff --git a/code/modules/buildmode/submodes/mapgen.dm b/code/modules/buildmode/submodes/mapgen.dm index df6f6b73ed03..e72f813da5f5 100644 --- a/code/modules/buildmode/submodes/mapgen.dm +++ b/code/modules/buildmode/submodes/mapgen.dm @@ -11,7 +11,7 @@ to_chat(user, "***********************************************************") /datum/buildmode_mode/mapgen/change_settings(mob/user) - var/list/gen_paths = subtypesof(/datum/mapGenerator) + var/list/gen_paths = subtypesof(/datum/map_generator) var/type = input(user,"Select Generator Type","Type") as null|anything in gen_paths if(!type) return @@ -32,7 +32,7 @@ if(left_click) //rectangular if(cornerA && cornerB) - var/datum/mapGenerator/G = new generator_path + var/datum/map_generator/G = new generator_path G.defineRegion(cornerA, cornerB, 1) highlight_region(G.map) var/confirm = alert("Are you sure you want run the map generator?", "Run generator", "Yes", "No") diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm index e243d1318742..8bd4d52e9283 100644 --- a/code/modules/client/preference/loadout/loadout_general.dm +++ b/code/modules/client/preference/loadout/loadout_general.dm @@ -157,7 +157,7 @@ display_name = "Bandana, skull" path = /obj/item/clothing/mask/bandana/skull -/datum/gear/pAI +/datum/gear/pai display_name = "Personal Artificial Intelligence" path = /obj/item/paicard cost = 2 diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 2004447294b3..420c2888feed 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -381,7 +381,7 @@ name = "agreeable glasses" desc = "H.C Limited edition." var/punused = FALSE - actions_types = list(/datum/action/item_action/YEEEAAAAAHHHHHHHHHHHHH) + actions_types = list(/datum/action/item_action/yeeeaaaaahhhhhhhhhhhhh) /obj/item/clothing/glasses/sunglasses/yeah/attack_self(mob/user) pun(user) diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm index 5f141ca97a7d..d22fa641e9a0 100644 --- a/code/modules/clothing/head/beret.dm +++ b/code/modules/clothing/head/beret.dm @@ -74,7 +74,7 @@ icon_state = "beret_hos_black" armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 75) strip_delay = 80 - dog_fashion = /datum/dog_fashion/head/HoS + dog_fashion = /datum/dog_fashion/head/hos /obj/item/clothing/head/beret/sec name = "security beret" diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index dd507502224d..49e3a75226dc 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -127,12 +127,12 @@ item_state = "hardhat0_yellow" dog_fashion = /datum/dog_fashion/head/hardhat -/obj/item/clothing/head/collectable/HoS +/obj/item/clothing/head/collectable/hos name = "collectable HoS hat" desc = "Now you can beat prisoners, set silly sentences and arrest for no reason too!" icon_state = "hos_cap" -/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/job_hats.dm b/code/modules/clothing/head/job_hats.dm index 3ba0784ecfb9..2d9e423cd9f2 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -117,13 +117,13 @@ ) //Security -/obj/item/clothing/head/HoS +/obj/item/clothing/head/hos name = "head of security's cap" desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge." icon_state = "hos_cap" armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 75) strip_delay = 80 - dog_fashion = /datum/dog_fashion/head/HoS + dog_fashion = /datum/dog_fashion/head/hos /obj/item/clothing/head/warden name = "warden's police hat" diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm index f67574bf124b..59d1a603287e 100644 --- a/code/modules/clothing/suits/job_suits.dm +++ b/code/modules/clothing/suits/job_suits.dm @@ -217,19 +217,19 @@ name = "staff hazard vest" desc = "A high-visibilty vest used in work zones. Designed to easily identify station staff from visitors." icon_state = "hazard_staff" - allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcd, /obj/item/rpd, /obj/item/rcs, /obj/item/destTagger) + allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcd, /obj/item/rpd, /obj/item/rcs, /obj/item/dest_tagger) /obj/item/clothing/suit/storage/hazardvest/qm name = "warehouse supervisor hazard vest" desc = "A high-visibilty vest used in work zones. Designed to easily identify the supply supervisor." icon_state = "hazard_qm" - allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcs, /obj/item/destTagger, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/melee/knuckleduster) + allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcs, /obj/item/dest_tagger, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/melee/knuckleduster) /obj/item/clothing/suit/storage/hazardvest/ce name = "foreman hazard vest" desc = "A high-visibility vest used in work zones. Designed to easily identify the engineering supervisor." icon_state = "hazard_ce" - allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcd, /obj/item/rpd, /obj/item/destTagger, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic) + allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcd, /obj/item/rpd, /obj/item/dest_tagger, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic) //Internal Affairs /obj/item/clothing/suit/storage/iaa diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm index d486b616db8e..d1ce20522c76 100644 --- a/code/modules/crafting/guncrafting.dm +++ b/code/modules/crafting/guncrafting.dm @@ -196,8 +196,8 @@ /obj/item/weaponcrafting/ishotgunconstruction3/attackby(obj/item/I, mob/user as mob, params) ..() - if(istype(I, /obj/item/stack/packageWrap)) - var/obj/item/stack/packageWrap/C = I + if(istype(I, /obj/item/stack/package_wrap)) + var/obj/item/stack/package_wrap/C = I if(C.use(5)) var/obj/item/gun/projectile/revolver/doublebarrel/improvised/W = new /obj/item/gun/projectile/revolver/doublebarrel/improvised user.unEquip(src) diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index deb2b1431fd3..53df828a3efc 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -25,7 +25,7 @@ /// Will this recipe send an admin message when it's completed. var/alert_admins_on_craft = FALSE -/datum/crafting_recipe/IED +/datum/crafting_recipe/ied name = "IED" result = list(/obj/item/grenade/iedcasing) reqs = list(/datum/reagent/fuel = 50, @@ -82,7 +82,7 @@ result = list(/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 = 300 category = CAT_WEAPONRY @@ -475,7 +475,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/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 72c69dca524d..1f31b1d41170 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1693,7 +1693,7 @@ slot_flags = ITEM_SLOT_ACCESSORY /// Sagrotter: Xann Zxiax -/obj/item/clothing/accessory/medal/fluff/XannZxiax +/obj/item/clothing/accessory/medal/fluff/xann_zxiax name = "Zxiax Garnet" desc = "Green Garnet on fancy blue cord, when you look at the Garnet, you feel strangely appeased." icon = 'icons/obj/custom_items.dmi' diff --git a/code/modules/economy/economy_machinery/account_terminal.dm b/code/modules/economy/economy_machinery/account_terminal.dm index d7485d3212db..631b3abdb055 100644 --- a/code/modules/economy/economy_machinery/account_terminal.dm +++ b/code/modules/economy/economy_machinery/account_terminal.dm @@ -142,7 +142,7 @@ /obj/machinery/computer/account_database/proc/print_new_account_info(datum/money_account/account) //create a sealed package containing the account details - var/obj/item/smallDelivery/package = new /obj/item/smallDelivery(loc) + var/obj/item/small_delivery/package = new /obj/item/small_delivery(loc) var/obj/item/paper/printout = new /obj/item/paper(package) playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, TRUE) diff --git a/code/modules/economy/economy_machinery/eftpos.dm b/code/modules/economy/economy_machinery/eftpos.dm index b27bd4b9deef..2ff07deab52a 100644 --- a/code/modules/economy/economy_machinery/eftpos.dm +++ b/code/modules/economy/economy_machinery/eftpos.dm @@ -204,7 +204,7 @@ R.stamped += /obj/item/stamp R.overlays += stampoverlay R.stamps += "
This paper has been stamped by the EFTPOS device." - var/obj/item/smallDelivery/D = new(get_turf(loc)) + var/obj/item/small_delivery/D = new(get_turf(loc)) if(istype(loc, /mob/living/carbon/human)) var/mob/living/carbon/human/H = loc if(H.back) diff --git a/code/modules/error_handler/error_viewer.dm b/code/modules/error_handler/error_viewer.dm index 1585cc6d3d8f..a47e611148ff 100644 --- a/code/modules/error_handler/error_viewer.dm +++ b/code/modules/error_handler/error_viewer.dm @@ -8,10 +8,10 @@ // right here: #ifdef DEBUG -GLOBAL_DATUM_INIT(error_cache, /datum/ErrorViewer/ErrorCache, new()) +GLOBAL_DATUM_INIT(error_cache, /datum/error_viewer/error_cache, new()) #else // If debugging is disabled, there's nothing useful to log, so don't bother. -GLOBAL_DATUM(error_cache, /datum/ErrorViewer/ErrorCache) +GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache) #endif // - ErrorSource datums exist for each line (of code) that generates an error, @@ -21,10 +21,10 @@ GLOBAL_DATUM(error_cache, /datum/ErrorViewer/ErrorCache) // relevant info about that error. // Common vars and procs are kept at the ErrorViewer level -/datum/ErrorViewer/ +/datum/error_viewer/ var/name = "" -/datum/ErrorViewer/proc/browseTo(user, html) +/datum/error_viewer/proc/browseTo(user, html) if(user) var/datum/browser/popup = new(user, "error_viewer", "Runtime Viewer", 700, 500) popup.add_head_content({"