[MIRROR] basic cats and mini kitchen helpers (#929)

* [MIRROR] basic cats and mini kitchen helpers [MDB IGNORE] (#25330) * update paths * Update birdshot.dmm --------- Co-authored-by: SkyratBot <[email protected]> Co-authored-by: Ben10Omintrix <[email protected]> Co-authored-by: Giz <[email protected]> Co-authored-by: Iajret <[email protected]>
Fluffy-Frontier · Dec 4, 2023 · 954536d · 954536d
1 parent d31093b
commit 954536d
Show file tree

Hide file tree

Showing 60 changed files with 1,837 additions and 1,269 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm b/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
@@ -824,7 +824,7 @@
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/derelictsulaco)
 "BQ" = (
-/mob/living/simple_animal/pet/cat{
+/mob/living/basic/pet/cat{
 	name = "Jonesy";
 	desc = "Old and grumpy cat- wait, how the hell is he still alive?!"
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
@@ -245,7 +245,7 @@
 /obj/structure/bed/dogbed{
 	name = "kitty bed"
 	},
-/mob/living/simple_animal/pet/cat/space,
+/mob/living/basic/pet/cat/space,
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/powered/cat_man)
 "aS" = (

diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
@@ -5283,7 +5283,7 @@
 /area/ruin/space/has_grav/skyrat/interdynefob/medbay)
 "yb" = (
 /obj/effect/turf_decal/stripes/red/corner,
-/mob/living/simple_animal/pet/cat/kitten{
+/mob/living/basic/pet/cat/kitten{
 	desc = "What appears to be a single-celled organism with a pronounced low-level intelligence.";
 	name = "Murder-Mittens"
 	},

diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -2140,6 +2140,15 @@
 /obj/machinery/door/airlock/maintenance,
 /turf/open/floor/plating,
 /area/awaymission/moonoutpost19/arrivals)
+"ob" = (
+/mob/living/basic/pet/cat/space{
+	desc = "With survival instincts like these, it's no wonder cats survived to the 26th century.";
+	name = "Jones"
+	},
+/turf/open/misc/asteroid/moon{
+	initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+	},
+/area/awaymission/moonoutpost19/main)
 "od" = (
 /obj/effect/decal/cleanable/xenoblood/xgibs/larva/body,
 /turf/open/misc/asteroid/moon{
@@ -2775,16 +2784,6 @@
 	dir = 1
 	},
 /area/awaymission/moonoutpost19/research)
-"rF" = (
-/obj/structure/secure_safe/directional/east,
-/obj/effect/decal/cleanable/blood/splatter,
-/obj/item/pen,
-/obj/item/paper/crumpled/awaymissions/moonoutpost19/hastey_note,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/iron/dark,
-/area/awaymission/moonoutpost19/research)
 "rH" = (
 /obj/structure/closet/crate/bin,
 /obj/effect/turf_decal/siding/purple{
@@ -3366,6 +3365,17 @@
 /obj/item/stack/cable_coil/cut,
 /turf/open/floor/plating,
 /area/awaymission/moonoutpost19/research)
+"vu" = (
+/obj/structure/table,
+/obj/item/storage/briefcase/secure,
+/obj/item/taperecorder{
+	pixel_x = -3
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/iron/dark,
+/area/awaymission/moonoutpost19/research)
 "vx" = (
 /obj/structure/table/reinforced,
 /obj/machinery/button/door{
@@ -5047,17 +5057,6 @@
 /obj/effect/mapping_helpers/airalarm/unlocked,
 /turf/open/floor/plating,
 /area/awaymission/moonoutpost19/syndicate)
-"Hr" = (
-/obj/structure/table,
-/obj/item/storage/briefcase/secure,
-/obj/item/taperecorder{
-	pixel_x = -3
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/turf/open/floor/iron/dark,
-/area/awaymission/moonoutpost19/research)
 "Hs" = (
 /obj/effect/turf_decal/stripes{
 	dir = 4
@@ -5129,15 +5128,6 @@
 	dir = 8
 	},
 /area/awaymission/moonoutpost19/research)
-"HP" = (
-/mob/living/simple_animal/pet/cat/space{
-	desc = "With survival instincts like these, it's no wonder cats survived to the 26th century.";
-	name = "Jones"
-	},
-/turf/open/misc/asteroid/moon{
-	initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
-	},
-/area/awaymission/moonoutpost19/main)
 "HS" = (
 /obj/structure/chair/stool/directional/east{
 	pixel_x = 9
@@ -6853,6 +6843,16 @@
 	dir = 5
 	},
 /area/awaymission/moonoutpost19/research)
+"Tx" = (
+/obj/structure/secure_safe/directional/east,
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/item/pen,
+/obj/item/paper/crumpled/awaymissions/moonoutpost19/hastey_note,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/iron/dark,
+/area/awaymission/moonoutpost19/research)
 "Tz" = (
 /obj/machinery/power/shuttle_engine/propulsion/burst/left{
 	dir = 4
@@ -29319,7 +29319,7 @@ ac
 ac
 My
 My
-HP
+ob
 My
 My
 My
@@ -35484,8 +35484,8 @@ ik
 OC
 aJ
 Um
-rF
-Hr
+Tx
+vu
 ea
 of
 TS