Skip to content

Commit

Permalink
New sand ruin - the E-11 Manufacturing Plant. (#3304)
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
An old Eoehoma manufacturing plant dedicated to assembly of the
beloved-by-many E-11 rifle. It has since become home to a particularly
dedicated group of hermits.

**TODO:**
- [x] stuff outside the fence (placeholder rn)
- [x] fill out all the descs
- [x] beg people for E-11 inhands (maybe) (just put placeholders there,
might be good enough)
- [x] rust because I forgor
- [x] faction for the hermits

<details><summary>Screenshots:</summary>
<p>


![scrnshot1](https://github.com/user-attachments/assets/813b570b-b21a-4446-be71-c435bf201497)

![StrongDMM-2024-09-27 20 58
55](https://github.com/user-attachments/assets/6b3f6975-5419-4592-9ca8-a5cad9a2365f)

![StrongDMM-2024-08-31 13 53
44](https://github.com/user-attachments/assets/2d526ee1-5f29-4bee-8bfe-7d3d09960e64)

</p>
</details> 

Loot you can expect here is: Way Too Many E-11s (~12); Cargo mech; Cash;
Some mats; One E-10; One E-60; Six Rations

Danger you can expect here: One Hermit Soldier; One Hermit Hunter; Two
Hermit Wanderers; Eleven Hermit Troopers; One Goliath; One Legion; A
bunch of bear traps; Acid pit I guess?

Also adds: E-11 /no_cell variant; E-11 hermits; Purple hardhat (need it
ok?).

<!-- 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
Sand planet is like. Medipen ruin 50% of the time, I swear.
Also uh, Eoehoma love I guess.
<!-- 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:
add: A new sand ruin - the E-11 Manufacturing Plant - and associated
code.
add: A purple hardhat.
/: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
Sadhorizon authored Oct 28, 2024
1 parent 92aedf9 commit cddd989
Show file tree
Hide file tree
Showing 10 changed files with 11,277 additions and 0 deletions.
11,181 changes: 11,181 additions & 0 deletions _maps/RandomRuins/SandRuins/whitesands_surface_e11_manufactory.dmm

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions code/datums/ruins/whitesands.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,9 @@
allow_duplicates = FALSE
ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_INHOSPITABLE, RUIN_TAG_HAZARDOUS)

/datum/map_template/ruin/whitesands/e11_manufactory
name = "E-11 Manufacturing Plant"
id = "ws-e11manufactory"
description = "An old Eoehoma Firearms manufacturing plant dedicated to assembly of the beloved-by-many E-11 rifle."
suffix = "whitesands_surface_e11_manufactory.dmm"
ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_HAZARDOUS)
25 changes: 25 additions & 0 deletions code/game/area/areas/ruins/sandplanet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,31 @@
name = "Pubby-Class Chunk"
icon_state = "red"

//e-11 manufactory
/area/ruin/whitesands/e11manufactory
name = "Eoehoma Firearms Assembly Line"
icon_state = "mining_production"

/area/ruin/whitesands/e11manufactory/warehouse
name = "Eoehoma Firearms Warehouse"
icon_state = "storage"

/area/ruin/whitesands/e11manufactory/mats
name = "Eoehoma Firearms Material Storage"
icon_state = "auxstorage"

/area/ruin/whitesands/e11manufactory/security
name = "Eoehoma Firearms Security Office"
icon_state = "security"

/area/ruin/whitesands/e11manufactory/barracks
name = "Eoehoma Firearms Worker Barracks"
icon_state = "crew_quarters"

/area/ruin/whitesands/e11manufactory/office
name = "Eoehoma Firearms Management Offices"
icon_state = "quartoffice"

//cave base
/area/ruin/whitesands/cave_base
name = "Abandoned Facility"
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/items/documents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
desc = "\"Top Secret\" documents belonging to the Second Battlegroup of New Gorlex Republic. They are filled with sensitive operational intelligence. These documents are verified with a red wax seal."
icon_state = "docs_red"

/obj/item/documents/eoehoma // For use in Eoehoma-related ruins.
desc = "\"Top Secret\" Eoehoma Firearms documents. Filled with weapon blueprints and eviction notices."
icon_state = "docs_blue"

/obj/item/documents/photocopy
desc = "A copy of some top-secret documents. Nobody will notice they aren't the originals... right?"
var/forgedseal = 0
Expand Down
14 changes: 14 additions & 0 deletions code/game/turfs/open/floor/plating/whitesands.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,20 @@

/turf/open/floor/concrete/whitesands
initial_gas_mix = WHITESANDS_ATMOS
light_range = 2
light_power = 0.6
light_color = COLOR_VERY_LIGHT_GRAY

/turf/open/floor/concrete/reinforced/whitesands
initial_gas_mix = WHITESANDS_ATMOS
light_range = 2
light_power = 0.6
light_color = COLOR_VERY_LIGHT_GRAY

/turf/open/floor/concrete/pavement/whitesands
initial_gas_mix = WHITESANDS_ATMOS
light_range = 2
light_power = 0.6
light_color = COLOR_VERY_LIGHT_GRAY

/turf/open/floor/concrete/slab_1/whitesands
Expand Down
4 changes: 4 additions & 0 deletions code/modules/clothing/head/hardhat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@
icon_state = "hardhat_orange"
dog_fashion = null

/obj/item/clothing/head/hardhat/purple
icon_state = "hardhat_purple"
dog_fashion = null

/obj/item/clothing/head/hardhat/red
name = "firefighter helmet"
icon_state = "hardhat_red"
Expand Down
37 changes: 37 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/human/survivors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,21 @@
/obj/effect/mob_spawn/human/corpse/damaged/whitesands/gunslinger,
)

/mob/living/simple_animal/hostile/human/hermit/ranged/e11 // Intended for the e11_manufactory ruin.
name = "Hermit Trooper"
desc = "Quality weapons are hard to get by in the sandworlds, which forces many survivors to improvise with that they have. This one is hoping that an E-11 of all things will save his life."
icon_state = "survivor_e11"
icon_living = "survivor_e11"
projectilesound = 'sound/weapons/gun/laser/e-fire.ogg'
speed = 10
faction = list("eoehoma")
rapid_fire_delay = 1
casingtype = null
projectiletype = /obj/projectile/beam/laser/eoehoma/hermit
loot = list(
/obj/effect/mob_spawn/human/corpse/damaged/whitesands/e11,
)

//survivor corpses

/obj/effect/mob_spawn/human/corpse/damaged/whitesands
Expand Down Expand Up @@ -278,6 +293,25 @@
else
visible_message(span_warning("The gunslinger's weapon shatters as they impact the ground!"))

if("e11")
uniform = pick_weight(list(
/obj/item/clothing/under/rank/cargo/miner = 65,
/obj/item/clothing/under/color/random = 25,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 10,
)
)
belt = pick_weight(list(
/obj/item/storage/belt/utility = 25,
/obj/item/storage/belt/mining = 15,
/obj/item/storage/belt/fannypack = 15,
/obj/item/storage/belt/mining/alt = 5,
)
)
shoes = /obj/item/clothing/shoes/workboots
if(prob(50)) // Hilarious, ain't it?
new /obj/item/gun/energy/e_gun/e11 (loc)
else
visible_message(span_warning("The trooper's weapon shatters as they impact the ground!"))
. = ..()


Expand All @@ -290,6 +324,9 @@
/obj/effect/mob_spawn/human/corpse/damaged/whitesands/gunslinger
survivor_type = "gunslinger"

/obj/effect/mob_spawn/human/corpse/damaged/whitesands/e11
survivor_type = "e11"

//hold overs for any admin who may want to spawn their own survivor realmobs

/datum/outfit/whitesands
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/ammunition/energy/laser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
projectile_type = /obj/projectile/beam/laser/eoehoma
fire_sound = 'sound/weapons/gun/laser/e-fire.ogg'

/obj/projectile/beam/laser/eoehoma/hermit // Used for the Hermits with E-11 because apparently you can only set it on projectile for simple mobs? That's fun!
spread = 80

/obj/item/ammo_casing/energy/laser/assault
projectile_type = /obj/projectile/beam/laser/assault
fire_sound = 'sound/weapons/gun/laser/e40_las.ogg'
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/guns/energy/energy_gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -253,3 +253,6 @@
dual_wield_spread = 140
shaded_charge = TRUE
manufacturer = MANUFACTURER_EOEHOMA

/obj/item/gun/energy/e_gun/e11/empty_cell
spawn_no_ammo = TRUE
Binary file modified icons/mob/simple_human.dmi
Binary file not shown.

0 comments on commit cddd989

Please sign in to comment.