Skip to content

Commit

Permalink
[MIRROR] Simple animal xenos are now basic animal xenos (#1649)
Browse files Browse the repository at this point in the history
* Simple animal xenos are now basic animal xenos

* Update living.dm

* Update living.dm

* Update living.dm

* Update Paths Ran

* Fix spawners to basic

* Update mothership_astrum.dmm

---------

Co-authored-by: John Willard <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
  • Loading branch information
4 people authored and StealsThePRs committed Mar 27, 2024
1 parent 120381a commit 3440047
Show file tree
Hide file tree
Showing 29 changed files with 481 additions and 345 deletions.
22 changes: 11 additions & 11 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
/area/ruin/unpowered/xenonest)
"j" = (
/obj/structure/alien/weeds,
/mob/living/simple_animal/hostile/alien,
/mob/living/basic/alien,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/xenonest)
"l" = (
Expand All @@ -55,7 +55,7 @@
/area/ruin/unpowered/xenonest)
"t" = (
/obj/structure/alien/weeds,
/mob/living/simple_animal/hostile/alien/sentinel,
/mob/living/basic/alien/sentinel,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/xenonest)
"u" = (
Expand Down Expand Up @@ -103,18 +103,18 @@
/area/ruin/unpowered/xenonest)
"E" = (
/obj/structure/alien/weeds,
/mob/living/simple_animal/hostile/alien/drone{
plants_off = 1
/mob/living/basic/alien/drone{
can_plant_weeds = 0
},
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/xenonest)
"F" = (
/obj/structure/alien/weeds,
/mob/living/simple_animal/hostile/alien/queen/large{
/mob/living/basic/alien/queen/large{
desc = "A gigantic alien who is in charge of the hive and all of its loyal servants.";
name = "alien queen";
pixel_x = -16;
plants_off = 1
can_plant_weeds = 0
},
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/xenonest)
Expand All @@ -137,13 +137,13 @@
/area/ruin/unpowered/xenonest)
"K" = (
/obj/structure/alien/weeds/node,
/mob/living/simple_animal/hostile/alien,
/mob/living/basic/alien,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/xenonest)
"L" = (
/obj/structure/alien/weeds/node,
/mob/living/simple_animal/hostile/alien/drone{
plants_off = 1
/mob/living/basic/alien/drone{
can_plant_weeds = 0
},
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/xenonest)
Expand All @@ -160,8 +160,8 @@
"Q" = (
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/blood,
/mob/living/simple_animal/hostile/alien/drone{
plants_off = 1
/mob/living/basic/alien/drone{
can_plant_weeds = 0
},
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/xenonest)
Expand Down
38 changes: 17 additions & 21 deletions _maps/RandomRuins/SpaceRuins/infested_frigate.dmm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"ab" = (
/obj/structure/alien/weeds,
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/mineral/plastitanium,
Expand Down Expand Up @@ -368,7 +368,7 @@
/turf/template_noop,
/area/ruin/space/has_grav/infested_frigate)
"eE" = (
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/obj/structure/cable,
Expand Down Expand Up @@ -430,7 +430,6 @@
/obj/effect/turf_decal/tile/bar,
/obj/structure/table/reinforced,
/obj/structure/closet/mini_fridge/grimy{
anchored = 1;
pixel_y = 6
},
/obj/effect/spawner/random/food_or_drink/refreshing_beverage,
Expand Down Expand Up @@ -844,7 +843,7 @@
/turf/open/floor/pod/dark,
/area/ruin/space/has_grav/infested_frigate)
"nG" = (
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/mineral/plastitanium/red,
Expand Down Expand Up @@ -1232,7 +1231,7 @@
icon_state = "warningline_red";
dir = 4
},
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/pod/dark,
Expand Down Expand Up @@ -1327,8 +1326,7 @@
},
/obj/effect/mob_spawn/corpse/human/syndicatecommando/lessenedgear,
/obj/structure/bed/nest,
/mob/living/simple_animal/hostile/alien/drone{
del_on_death = 1;
/mob/living/basic/alien/drone{
loot = list(/obj/effect/gibspawner/xeno);
faction = list("syndicate","xenomorph")
},
Expand Down Expand Up @@ -1387,7 +1385,7 @@
dir = 4
},
/obj/structure/cable,
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/mineral/plastitanium,
Expand Down Expand Up @@ -1475,7 +1473,7 @@
icon_state = "gib1-old"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/mineral/plastitanium/red,
Expand Down Expand Up @@ -1535,7 +1533,7 @@
/obj/item/ammo_casing/spent,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/cable,
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/mineral/plastitanium/red,
Expand Down Expand Up @@ -1643,7 +1641,7 @@
/obj/effect/mob_spawn/corpse/human/syndicatecommando/lessenedgear,
/obj/item/ammo_casing/spent,
/obj/item/ammo_casing/spent,
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/mineral/titanium/tiled/white,
Expand Down Expand Up @@ -1941,8 +1939,7 @@
/area/ruin/space/has_grav/infested_frigate)
"ER" = (
/obj/structure/cable,
/mob/living/simple_animal/hostile/alien/sentinel{
del_on_death = 1;
/mob/living/basic/alien/sentinel{
loot = list(/obj/effect/gibspawner/xeno);
faction = list("syndicate","xenomorph")
},
Expand All @@ -1958,7 +1955,7 @@
/obj/effect/decal/cleanable/glass,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/mineral/plastitanium/red,
Expand Down Expand Up @@ -2050,7 +2047,7 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/mineral/plastitanium/red,
Expand All @@ -2077,7 +2074,7 @@
icon_state = "gib1-old"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/mineral/plastitanium,
Expand All @@ -2098,7 +2095,7 @@
icon_state = "xgibhead";
dir = 4
},
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/mineral/plastitanium,
Expand Down Expand Up @@ -2201,7 +2198,7 @@
/turf/open/floor/pod/dark,
/area/ruin/space/has_grav/infested_frigate)
"Jx" = (
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/mineral/plastitanium,
Expand Down Expand Up @@ -2809,8 +2806,7 @@
/obj/item/shard{
icon_state = "plastitaniumtiny"
},
/mob/living/simple_animal/hostile/alien/queen/large{
del_on_death = 1;
/mob/living/basic/alien/queen/large{
loot = list(/obj/effect/gibspawner/xeno,/obj/item/ammo_box/magazine/plastikov9mm,/obj/effect/mob_spawn/corpse/human/syndicatecommando/soft_suit);
desc = "What you saw in your dreams last night.";
faction = list("syndicate","xenomorph")
Expand Down Expand Up @@ -3086,7 +3082,7 @@
"Yd" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/alien/egg/burst,
/mob/living/simple_animal/hostile/alien{
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
},
/turf/open/floor/mineral/plastitanium/red,
Expand Down
30 changes: 15 additions & 15 deletions _maps/RandomRuins/SpaceRuins/nova/waypointstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/waypoint)
"bF" = (
/mob/living/simple_animal/hostile/alien/queen/large,
/mob/living/basic/alien/queen/large,
/obj/structure/alien/weeds,
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/waypoint)
Expand All @@ -52,7 +52,7 @@
/area/ruin/space/has_grav/waypoint)
"co" = (
/obj/structure/lattice,
/mob/living/simple_animal/hostile/alien,
/mob/living/basic/alien,
/turf/template_noop,
/area/ruin)
"cV" = (
Expand All @@ -67,7 +67,7 @@
/turf/open/floor/carpet/royalblue/airless,
/area/ruin/space/has_grav/waypoint)
"dz" = (
/mob/living/simple_animal/hostile/alien,
/mob/living/basic/alien,
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/waypoint)
"dQ" = (
Expand Down Expand Up @@ -140,7 +140,7 @@
/area/ruin)
"hE" = (
/obj/effect/decal/cleanable/blood/tracks,
/mob/living/simple_animal/hostile/alien,
/mob/living/basic/alien,
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/waypoint)
"iu" = (
Expand Down Expand Up @@ -175,12 +175,12 @@
/turf/open/floor/carpet/royalblue/airless,
/area/ruin/space/has_grav/waypoint)
"kR" = (
/mob/living/simple_animal/hostile/alien/sentinel,
/mob/living/basic/alien/sentinel,
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/waypoint)
"lf" = (
/obj/effect/decal/cleanable/blood/drip,
/mob/living/simple_animal/hostile/alien,
/mob/living/basic/alien,
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/waypoint)
"lr" = (
Expand Down Expand Up @@ -241,11 +241,11 @@
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/waypoint)
"nC" = (
/mob/living/simple_animal/hostile/alien/drone,
/mob/living/basic/alien/drone,
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/waypoint)
"nO" = (
/mob/living/simple_animal/hostile/alien,
/mob/living/basic/alien,
/obj/structure/alien/weeds,
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/waypoint)
Expand Down Expand Up @@ -351,7 +351,7 @@
pixel_x = -3;
pixel_y = 10
},
/mob/living/simple_animal/hostile/alien/sentinel,
/mob/living/basic/alien/sentinel,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waypoint)
"sw" = (
Expand Down Expand Up @@ -476,7 +476,7 @@
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/waypoint)
"zy" = (
/mob/living/simple_animal/hostile/alien/drone,
/mob/living/basic/alien/drone,
/obj/effect/decal/cleanable/xenoblood,
/obj/structure/sign/poster/contraband/lusty_xenomorph/directional/east,
/turf/open/floor/iron/dark,
Expand All @@ -499,7 +499,7 @@
/turf/open/floor/carpet/royalblue/airless,
/area/ruin/space/has_grav/waypoint)
"Af" = (
/mob/living/simple_animal/hostile/alien/sentinel,
/mob/living/basic/alien/sentinel,
/obj/structure/alien/weeds/node,
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/waypoint)
Expand All @@ -517,7 +517,7 @@
/area/ruin/space/has_grav/waypoint)
"AG" = (
/obj/effect/decal/cleanable/blood/drip,
/mob/living/simple_animal/hostile/alien/drone,
/mob/living/basic/alien/drone,
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/waypoint)
"AP" = (
Expand All @@ -537,7 +537,7 @@
},
/obj/effect/decal/cleanable/blood/splatter,
/obj/machinery/light/small/broken/directional/north,
/mob/living/simple_animal/hostile/alien/sentinel,
/mob/living/basic/alien/sentinel,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waypoint)
"BD" = (
Expand Down Expand Up @@ -959,7 +959,7 @@
/obj/item/stack/cable_coil{
pixel_y = -3
},
/mob/living/simple_animal/hostile/alien/drone,
/mob/living/basic/alien/drone,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waypoint)
"VK" = (
Expand All @@ -971,7 +971,7 @@
/turf/open/floor/carpet/royalblue/airless,
/area/ruin/space/has_grav/waypoint)
"Wg" = (
/mob/living/simple_animal/hostile/alien/drone,
/mob/living/basic/alien/drone,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/waypoint)
"Wu" = (
Expand Down
Loading

0 comments on commit 3440047

Please sign in to comment.