Skip to content

Phoron Deposit Away Site #20730

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.

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

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions aurorastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3901,6 +3901,8 @@
#include "maps\away\away_site\magshield\magshield_areas.dm"
#include "maps\away\away_site\orion\orion_automated_station.dm"
#include "maps\away\away_site\overgrown_mining_station\overgrown_mining_station.dm"
#include "maps\away\away_site\phoron_deposit\phoron_deposit.dm"
#include "maps\away\away_site\phoron_deposit\phoron_deposit_objects.dm"
#include "maps\away\away_site\pirate_base\pirate_base.dm"
#include "maps\away\away_site\pirate_base\pirate_base_areas.dm"
#include "maps\away\away_site\pirate_base\pirate_base_ghostroles.dm"
Expand Down
3 changes: 3 additions & 0 deletions code/__HELPERS/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ GLOBAL_LIST_INIT(headsetlist, list("Nothing", "Headset", "Bowman Headset", "Doub
/// Primary Radio Slot loadout choices.
GLOBAL_LIST_INIT(primary_radio_slot_choice, list("Left Ear", "Right Ear", "Wrist"))

// Used to track fauna spawners on the phoron deposit away site.
GLOBAL_LIST_INIT(fauna_spawners, list())

/// Visual nets.
GLOBAL_LIST_EMPTY_TYPED(visual_nets, /datum/visualnet)
/// Camera visualnet.
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/barricades/_barricade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
playsound(src, barricade_hitsound, 50, 1)
if(is_wired)
visible_message(SPAN_DANGER("\The [src]'s barbed wire slices into [L]!"))
L.apply_damage(rand(5, 10), DAMAGE_BRUTE, pick(BP_R_HAND, BP_L_HAND), "barbed wire", DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE, 25)
L.apply_damage((5), DAMAGE_BRUTE, pick(BP_R_HAND, BP_L_HAND), "barbed wire", DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE, 25)
L.do_attack_animation(src)
take_damage(damage)

Expand Down
10 changes: 9 additions & 1 deletion code/modules/mining/drilling/drill.dm
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,15 @@
return

//Drill through the flooring, if any.
if(istype(get_turf(src), /turf/simulated/floor/exoplanet/asteroid))
if(istype(get_turf(src), /turf/simulated/floor/exoplanet/asteroid/ash/rocky/phoron_deposit))
var/turf/simulated/floor/exoplanet/asteroid/ash/rocky/phoron_deposit/T = get_turf(src)
if(!T.dug)
T.gets_dug()
for(var/obj/item/ore/ore in range(1, src)) // gets_dug causes ore to spawn, this picks that ore up as well
ore.forceMove(src)
if(attached_satchel?.linked_box)
attached_satchel.insert_into_storage(ore)
else if(istype(get_turf(src), /turf/simulated/floor/exoplanet/asteroid))
var/turf/simulated/floor/exoplanet/asteroid/T = get_turf(src)
if(!T.dug)
T.gets_dug()
Expand Down
20 changes: 18 additions & 2 deletions code/modules/mob/living/simple_animal/hostile/hostile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ ABSTRACT_TYPE(/mob/living/simple_animal/hostile)
hunger_enabled = 0//Until automated eating mechanics are enabled, disable hunger for hostile mobs
var/shuttletarget = null
var/enroute = 0
var/obj/effect/fauna_spawner/spawner_source = null // For the phoron deposit away site

// Vars to help find targets
var/list/targets = list()
Expand Down Expand Up @@ -432,8 +433,9 @@ ABSTRACT_TYPE(/mob/living/simple_animal/hostile)
if(prob(break_stuff_probability) || bypass_prob) //bypass_prob is used to make mob destroy things in the way to our target
for(var/card_dir in GLOB.cardinals) // North, South, East, West
var/turf/target_turf = get_step(src, card_dir)
var/obj/found_obj = null

var/obj/found_obj = locate(/obj/effect/energy_field) in target_turf
found_obj = locate(/obj/effect/energy_field) in target_turf
if(found_obj && !found_obj.invisibility && found_obj.density)
var/obj/effect/energy_field/e = found_obj
e.Stress(rand(0.5, 1.5))
Expand Down Expand Up @@ -479,7 +481,21 @@ ABSTRACT_TYPE(/mob/living/simple_animal/hostile)
hostile_last_attack = world.time
return TRUE

return FALSE
found_obj = locate(/obj/structure/girder) in target_turf
if(found_obj)
found_obj.attack_generic(src, rand(melee_damage_lower, melee_damage_upper), attacktext, TRUE)
hostile_last_attack = world.time
return TRUE

found_obj = null
for (var/obj/structure/barricade/B in target_turf)
found_obj = B
break
if(found_obj)
found_obj.attack_generic(src, rand(melee_damage_lower, melee_damage_upper), attacktext, TRUE)
hostile_last_attack = world.time
return TRUE
return FALSE

/mob/living/simple_animal/hostile/RangedAttack(atom/A, params) //Player firing
if(ranged)
Expand Down
60 changes: 60 additions & 0 deletions html/changelogs/4000daniel1-phoron-deposit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: 4000daniel1

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Added the phoron deposit away site."
- balance: "Hostile mobs now attack barricades & girders in their way."
- balance: "Barricades with barbed wire now deal slightly less damage to attacking mobs."
27 changes: 27 additions & 0 deletions maps/away/away_site/phoron_deposit/phoron_deposit.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/datum/map_template/ruin/away_site/phoron_deposit
name = "phoron deposit"
description = "An asteroid with a phoron deposit."

prefix = "away_site/phoron_deposit/"
suffix = "phoron_deposit.dmm"

sectors = list(ALL_POSSIBLE_SECTORS)
sectors_blacklist = list(SECTOR_HANEUNIM, SECTOR_TAU_CETI)
spawn_weight = 1
spawn_cost = 2
id = "deposit"
unit_test_groups = list(3)

/singleton/submap_archetype/deposit
map = "phoron deposit"
descriptor = "An asteroid with a phoron deposit."

/obj/effect/overmap/visitable/sector/deposit
name = "phoron deposit"
desc = "Sensors have detected a rare high yield subsurface phoron deposit within a canyon on this asteroid. Additional scanning of the area reveals that there's a large underground cavern system surrounding it, with a plethora of lifesigns within, likely being aggressive fauna. Expeditionary personnel are advised to fortify the area before commencing drilling, as the process may attract intense hostile attention from the caverns."
icon_state = "object"
in_space = FALSE

/area/phoron_deposit_shuttle
name = "Einstein Engines Shuttle"
icon_state = "yellow"
Loading
Loading