Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes the Blood Cult from Maps #2776

Merged
merged 12 commits into from
Apr 1, 2024
Merged

Removes the Blood Cult from Maps #2776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
932842d
removes cult content from maps, removes several ruins.
goober3 Feb 27, 2024
be4daae
i should probably throw some walls in here come to think of it
goober3 Feb 28, 2024
4c7be2a
oh, and here too. how'd i possibly miss that.
goober3 Feb 28, 2024
9344ca3
Merge branch 'master' into cult-begone
goober3 Feb 28, 2024
b81be34
oops! removes a stray cult airlock.
goober3 Feb 28, 2024
a575dcd
Merge branch 'cult-begone' of https://github.com/goober3/hi-github-po…
goober3 Feb 28, 2024
0ed234c
Merge remote-tracking branch 'upstream/master' into cult-begone
goober3 Mar 17, 2024
95af975
Update CentCom.dmm
goober3 Mar 17, 2024
3140364
fixes centcom and also a missing turf which existed for some reason
goober3 Mar 17, 2024
f3111c0
removes an accidentally re-added map catalogue entry
goober3 Mar 18, 2024
11ce472
Delete clericden.dmm
goober3 Mar 29, 2024
9f02481
this user forgot to update the map catalogue and ruin datum
goober3 Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@
/area/ruin/unpowered/corprejectrooms)
"vP" = (
/obj/structure/bed,
/obj/item/bedsheet/cult,
/obj/item/bedsheet/dorms,
/turf/open/floor/carpet/lone,
/area/ruin/unpowered/corprejectrooms)
"wl" = (
Expand Down
58 changes: 29 additions & 29 deletions _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@
/area/overmap_encounter/planetoid/cave/explored)
"hD" = (
/obj/effect/decal/cleanable/blood/gibs/limb,
/turf/open/floor/engine/cult,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
/area/ruin/powered)
"hI" = (
/obj/item/reagent_containers/food/drinks/beer,
Expand Down Expand Up @@ -128,12 +131,17 @@
/area/overmap_encounter/planetoid/cave/explored)
"mi" = (
/obj/effect/decal/remains/human,
/mob/living/simple_animal/hostile/construct/juggernaut/hostile{
health = 450;
maxHealth = 450;
name = "Right Hand of the Elder"
/obj/item/flashlight/lamp/green{
pixel_y = 12;
pixel_x = 8
},
/obj/item/cigbutt/cigarbutt{
pixel_x = -7;
pixel_y = 8
},
/turf/open/floor/engine/cult,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/powered)
"mI" = (
/obj/structure/flora/ausbushes/fullgrass,
Expand Down Expand Up @@ -323,7 +331,7 @@
"AM" = (
/obj/effect/decal/cleanable/blood/gibs/down,
/obj/item/pickaxe,
/turf/open/floor/engine/cult,
/turf/open/floor/wood,
/area/ruin/powered)
"AN" = (
/obj/structure/closet/cabinet,
Expand All @@ -349,10 +357,11 @@
/turf/open/floor/carpet,
/area/ruin/powered)
"Cl" = (
/obj/structure/sacrificealtar,
/obj/effect/decal/cleanable/blood/old,
/obj/item/kitchen/knife/bloodletter,
/turf/open/floor/engine/cult,
/obj/structure/chair/comfy/brown,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/powered)
"Dm" = (
/obj/structure/flora/grass/brown,
Expand Down Expand Up @@ -382,13 +391,12 @@
/area/overmap_encounter/planetoid/cave/explored)
"EF" = (
/obj/effect/decal/cleanable/blood/gibs/torso,
/obj/effect/decal/remains/human,
/mob/living/simple_animal/hostile/construct/juggernaut/hostile{
health = 450;
maxHealth = 450;
name = "Left Hand of the Elder"
},
/turf/open/floor/engine/cult,
/obj/structure/safe,
/obj/item/ammo_box/a12g/slug,
/obj/item/kitchen/knife/combat,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/powered)
"FR" = (
/obj/effect/decal/cleanable/blood/splatter,
Expand Down Expand Up @@ -486,17 +494,9 @@
/area/ruin/powered)
"PQ" = (
/obj/effect/decal/cleanable/blood/splatter,
/mob/living/simple_animal/hostile/illusion{
deathmessage = "disperses into the air in a cloud of red mist, you feel slightly more at ease.";
desc = "You can't quite make out what you're seeing.";
faction = list("cult");
health = 500;
maxHealth = 500;
melee_damage_lower = 10;
melee_damage_upper = 30;
name = "Village Elder"
},
/turf/open/floor/engine/cult,
/mob/living/simple_animal/hostile/frontier/ranged/trooper,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/powered)
"Qt" = (
/obj/effect/decal/cleanable/blood/footprints{
Expand Down Expand Up @@ -566,7 +566,7 @@
"WH" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed,
/obj/item/bedsheet/cult,
/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ruin/powered)
"Ze" = (
Expand Down
Loading
Loading