Skip to content

Commit

Permalink
Removes Elephant Graveyard. (#3422)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Removes Elephant Graveyard and fluff papers. 
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Quality control
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: The Elephant Graveyard ruin has been taken out back
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Erikafox authored Sep 29, 2024
1 parent 9d9a3f5 commit 315239c
Show file tree
Hide file tree
Showing 8 changed files with 184 additions and 2,067 deletions.
1,788 changes: 0 additions & 1,788 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm

This file was deleted.

9 changes: 0 additions & 9 deletions code/datums/ruins/lavaland.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@
suffix = "lavaland_surface_biodome_winter.dmm"
ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MINOR_LOOT, RUIN_TAG_SHELTER)

/datum/map_template/ruin/lavaland/elephant_graveyard
name = "Elephant Graveyard"
id = "Graveyard"
description = "An abandoned graveyard, calling to those unable to continue."
suffix = "lavaland_surface_elephant_graveyard.dmm"
allow_duplicates = FALSE
cost = 10
ruin_tags = list(RUIN_TAG_NO_COMBAT, RUIN_TAG_MINOR_LOOT, RUIN_TAG_HAZARDOUS, RUIN_TAG_INHOSPITABLE)

/datum/map_template/ruin/lavaland/buried_shrine
name = "Buried Shrine"
id = "buried_shrine"
Expand Down
11 changes: 0 additions & 11 deletions code/game/area/areas/ruins/lavaland.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,6 @@
name = "Hierophant's Arena"
icon_state = "dk_yellow"


//Elephant Graveyard

/area/ruin/unpowered/elephant_graveyard
name = "Elephant Graveyard"
icon_state = "dk_yellow"

/area/ruin/powered/graveyard_shuttle
name = "Elephant Graveyard"
icon_state = "green"

//Lava Canyon

/area/ruin/unpowered/scorched_hut
Expand Down
112 changes: 112 additions & 0 deletions code/game/objects/structures/crates_lockers/crates/graves.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
/obj/structure/closet/crate/grave
name = "burial mound"
desc = "A marked patch of soil, adorned with a wooden cross"
icon_state = "grave"
dense_when_open = TRUE
material_drop = /obj/item/stack/ore/glass/basalt
material_drop_amount = 5
opened = TRUE
anchorable = FALSE
anchored = TRUE
locked = TRUE
breakout_time = 900
cutting_tool = TOOL_SHOVEL

/obj/structure/closet/crate/grave/attackby(obj/item/W, mob/user, params)
.=..()
if(istype(W, /obj/item/screwdriver))
if(!user.is_literate())
to_chat(user, "<span class='notice'>You scratch illegibly on [src]!</span>")
return
var/t = stripped_input(user, "What would you like the inscription to be?", name, null, 53)
if(user.get_active_held_item() != W)
return
if(!user.canUseTopic(src, BE_CLOSE))
return
if(t)
desc = "[t]"
return

/obj/structure/closet/crate/grave/open(mob/living/user, obj/item/S, force = FALSE)
if(!opened)
to_chat(user, "<span class='notice'>The ground here is too hard to dig up with your bare hands. You'll need a shovel.</span>")
else
to_chat(user, "<span class='notice'>The grave has already been dug up.</span>")

/obj/structure/closet/crate/grave/tool_interact(obj/item/S, mob/living/carbon/user)
if(user.a_intent == INTENT_HELP) //checks to attempt to dig the grave, must be done on help intent only.
if(!opened)
if(S.tool_behaviour == cutting_tool)
to_chat(user, "<span class='notice'>You start start to dig open \the [src] with \the [S]...</span>")
if (do_after(user,20, target = src))
opened = TRUE
locked = TRUE
dump_contents()
update_appearance()
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "graverobbing", /datum/mood_event/graverobbing)
return TRUE
return TRUE
else
to_chat(user, "<span class='notice'>You can't dig up a grave with \the [S.name].</span>")
return TRUE
else
to_chat(user, "<span class='notice'>The grave has already been dug up.</span>")
return TRUE

else if((user.a_intent != INTENT_HELP) && opened) //checks to attempt to remove the grave entirely.
if(S.tool_behaviour == cutting_tool)
to_chat(user, "<span class='notice'>You start to remove \the [src] with \the [S].</span>")
if (do_after(user,15, target = src))
to_chat(user, "<span class='notice'>You remove \the [src] completely.</span>")
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "graverobbing", /datum/mood_event/graverobbing)
deconstruct(TRUE)
return TRUE
return

/obj/structure/closet/crate/grave/bust_open()
..()
opened = TRUE
update_appearance()
dump_contents()
return

/obj/structure/closet/crate/grave/stone
name = "burial mound"
desc = "A marked patch of soil, adorned with a sandstone slab"
icon_state = "grave_lead"

/obj/structure/closet/crate/grave/loot
name = "burial mound"
desc = "A marked patch of soil, showing signs of a burial long ago. You wouldn't disturb a grave... right?"
opened = FALSE

/obj/structure/closet/crate/grave/loot/PopulateContents() //GRAVEROBBING IS NOW A FEATURE
..()
new /obj/effect/decal/remains/human/grave(src)
switch(rand(1,7))
if(1)
new /obj/item/spacecash/bundle/smallrand(src)
new /obj/item/card/id
new /obj/item/storage/wallet(src)
if(2)
new /obj/item/clothing/head/papersack/smiley(src)
if(3)
new /obj/item/clothing/under/nanotrasen(src)
new /obj/item/clothing/head/nanotrasen(src)
if(4)
new /obj/item/storage/book/bible/booze(src)
if(5)
new /obj/item/clothing/neck/stethoscope(src)
new /obj/item/scalpel(src)
new /obj/item/hemostat(src)

if(6)
new /obj/item/reagent_containers/glass/beaker/large/napalm(src)
new /obj/item/clothing/under/frontiersmen(src)
if(7)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/mask/cigarette/rollie(src)
new /obj/item/lighter(src)

/obj/effect/decal/remains/human/grave
turf_loc_check = FALSE
28 changes: 28 additions & 0 deletions code/game/objects/structures/statues.dm
Original file line number Diff line number Diff line change
Expand Up @@ -299,3 +299,31 @@
name = "\improper Karl Marx bust"
desc = "A bust depicting a certain 19th century economist. You get the feeling a specter is haunting the sector."
icon_state = "marx"

/// bone
/obj/structure/statue/bone
anchored = TRUE
max_integrity = 120
material_drop_type = /obj/item/stack/sheet/bone
impressiveness = 18 // Carved from the bones of a massive creature, it's going to be a specticle to say the least
layer = ABOVE_ALL_MOB_LAYER

/obj/structure/statue/bone/rib
name = "collosal rib"
desc = "It's staggering to think that something this big could have lived, let alone died."
oreAmount = 4
icon = 'icons/obj/statuelarge.dmi'
icon_state = "rib"

/obj/structure/statue/bone/skull
name = "collosal skull"
desc = "The gaping maw of a dead, titanic monster."
oreAmount = 12
icon = 'icons/obj/statuelarge.dmi'
icon_state = "skull"

/obj/structure/statue/bone/skull/half
desc = "The gaping maw of a dead, titanic monster. This one is cracked in half."
oreAmount = 6
icon = 'icons/obj/statuelarge.dmi'
icon_state = "skull-half"
43 changes: 43 additions & 0 deletions code/game/objects/structures/watercloset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,49 @@
icon_state = "puddle"
resistance_flags = UNACIDABLE

//***Oil well puddles.
/obj/structure/sink/oil_well
name = "oil well"
desc = "A bubbling pool of oil.This would probably be valuable, had bluespace technology not destroyed the need for fossil fuels 200 years ago."
icon = 'icons/obj/watercloset.dmi'
icon_state = "puddle-oil"
dispensedreagent = /datum/reagent/fuel/oil

/obj/structure/sink/oil_well/Initialize()
.=..()
create_reagents(20)
reagents.add_reagent(dispensedreagent, 20)

/obj/structure/sink/oil_well/attack_hand(mob/M)
flick("puddle-oil-splash",src)
reagents.expose(M, TOUCH, 20) //Covers target in 20u of oil.
to_chat(M, "<span class='notice'>You touch the pool of oil, only to get oil all over yourself. It would be wise to wash this off with water.</span>")

/obj/structure/sink/oil_well/attackby(obj/item/O, mob/user, params)
flick("puddle-oil-splash",src)
if(O.tool_behaviour == TOOL_SHOVEL && !(flags_1&NODECONSTRUCT_1)) //attempt to deconstruct the puddle with a shovel
to_chat(user, "You fill in the oil well with soil.")
O.play_tool_sound(src)
deconstruct()
return 1
if(istype(O, /obj/item/reagent_containers)) //Refilling bottles with oil
var/obj/item/reagent_containers/RG = O
if(RG.is_refillable())
if(!RG.reagents.holder_full())
RG.reagents.add_reagent(dispensedreagent, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
to_chat(user, "<span class='notice'>You fill [RG] from [src].</span>")
return TRUE
to_chat(user, "<span class='notice'>\The [RG] is full.</span>")
return FALSE
if(user.a_intent != INTENT_HARM)
to_chat(user, "<span class='notice'>You won't have any luck getting \the [O] out if you drop it in the oil.</span>")
return 1
else
return ..()

/obj/structure/sink/oil_well/drop_materials()
new /obj/effect/decal/cleanable/oil(loc)

//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/structure/sink/puddle/attack_hand(mob/M)
icon_state = "puddle-splash"
Expand Down
Loading

0 comments on commit 315239c

Please sign in to comment.