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.

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

Heron- Class! #1670

Merged
merged 110 commits into from
Oct 15, 2023
Merged

Heron- Class! #1670

merged 110 commits into from
Oct 15, 2023

Conversation

spockye
Copy link
Contributor

@spockye spockye commented Jan 7, 2023

About The Pull Request

2023 01 19-16 00 15

image

This PR adds the Heron-Class Star Dreadnaught (ADMINSPAWN ONLY)!!! It's a gigantic Nanotrasen Vessel, containing a Dropship, a Mechbay, and a full Emergency Response Team!

I created this ship as a kind of "opposing force" to the Twinkleshine, though it would probably heavily differ, in use.
while it has less soldier capacity, less combat gear, and less medical equipment, it makes up for it with its Marauder mech, Functional"tm" Supermatter engine, and its state-of-the-art, totally radical, dropship.

the crew consists of:


  • 1x Captain (Centcom Officer)
  • 1x First Officer (hop)
  • 1x HOS
  • 2x Pilots (for the dropship)
  • 1x Security Officer (Internal, actual Security work)
  • 6x ERT Officers
  • 1x Mech Pilot
  • 1x Engine Technician (Engineers)
  • 1x Chief Engineer
  • 1x Roboticist
  • 2x Medical workers (Paramedic and Medical doctor)
  • 1x Atmos tech
  • 2x Cargo Crew (quartermaster and cargo tech)
  • 1x Cook
  • 1x Janitor

  • I affirm that I have tested all of my proposed changes and that any issues found during tested have been addressed.

Why It's Good For The Game

More big ships for admins and players to have fun with is good!

Changelog

🆑
add: adds the Heron Class Dreadnaught
/:cl:

heron.json
nanotrasen_heron.dmm
captain.dm
cargo_tech.dm
security officer.dm
json fixes
map fixes and changes
ship area "Dock" added
pilot changes
officer changes
@spockye spockye requested review from a team as code owners January 7, 2023 00:13
@github-actions github-actions bot added Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service. labels Jan 7, 2023
@Sun-Soaked
Copy link
Member

Screen Shot 2023-01-06 at 7 15 17 PM

criminal behavior detected. Deploying memetic kill agents

@spockye
Copy link
Contributor Author

spockye commented Jan 7, 2023

Screen Shot 2023-01-06 at 7 15 17 PM

criminal behavior detected. Deploying memetic kill agents

i affirm that im going to find out where you live, and mail you large amounts of packages containing air generating devices, and dust

@Sun-Soaked
Copy link
Member

I could be a Dust Mite for all you know. Maybe you'd be feeding me for years. Didn't think about that did you huh???

adds missing wire
@Erikafox
Copy link
Contributor

Erikafox commented Jan 7, 2023

firefox_7Kgbb4Ookf
Whoever did this is evil

Ping me on the discord for a review tomorrow.

Copy link
Contributor

@Erikafox Erikafox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ship doesn't always spawn.
dreamseeker_t6Ctu3boja
needs a bypass so people don't feel obligated to pull gasses out, I'd do something like...
StrongDMM_ncccgB5ozX
StrongDMM_1oc0AgM0Ed
Take the shutters out of the walls
image
swap the upper airlock for a glass one, put an air alarm in there, like the screencap.
image
the holopad is cute, but any callers will be offset from it.
StrongDMM_cwOMY1YhMJ
toss a button on the inside of the cargo area, so you can't just trap people in there
dreamseeker_5QdB05PHD3
minor decal melding, if you can figure out a way to make it have less of that, that'd be bitchin
image
Give them some suit variety, preferably to match the variety in roles (as mentioned in file review).
dreamseeker_bbIM4nukDg
Decal merging
StrongDMM_pPcmAw8Im9
Give the hardsuit it's own name, clean the captain's bathroom.
dreamseeker_iKe6DYCQQH
You should make this a sprite instead of pixelshifting 3 together.
dreamseeker_HXgU3O80NQ
You can just pull the medals off the wall, I'd recommend using a /structure for that instead of the items.
dreamseeker_BhfeS2G2fg
James (59)
StrongDMM_bGwmbM2Q6L
I would turn this area into a proper like.. Checkpoint?
StrongDMM_2T3xlzUYH9
For a big ship that I'm sure will be seeing a decent bit of downtime, there's just not enough of a crew area. I'd push it out into the hallway and giving them a bit more of a lounge - chill space.
StrongDMM_o4WEgmCOPs
You're gonna need another vent here
StrongDMM_rgI5lzXZ3o
Add some markings for the orange pipes here.
StrongDMM_MlDYSIdeGv
Same deal with the cafe, it could stand to eat into the hallway a bit
StrongDMM_k0TGMBV1ag
This airlock needs another vent too
StrongDMM_DdCOQ0Zgha
Give the AI a blast door or shutters tbh ngl
StrongDMM_4sKaa4EDZF
Box reflector in the middle, they need it if all emitters are gonna be firing.

I'm sure there'll be more but I'm feeling map fatigue, so I'll give another go over once you do all this up

_maps/configs/heron.json Outdated Show resolved Hide resolved
_maps/configs/heron.json Outdated Show resolved Hide resolved
/area/ship/security/dock
name = "Shuttle Dock"
icon_state = "security"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commenting here as a reminder, no need to do anything right now

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^^ remove this area! we now have ship/hangar fulfilling the same role.

code/modules/jobs/job_types/captain.dm Show resolved Hide resolved
suit = /obj/item/clothing/suit/jacket/leather/duster
glasses = /obj/item/clothing/glasses/hud/spacecop
accessory = /obj/item/clothing/accessory/holster

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm starting to think we need to just wire up a pilot job.

_maps/configs/heron.json Outdated Show resolved Hide resolved
@spockye spockye requested a review from Erikafox January 14, 2023 02:30
json changes(
captain -> Fleet Captain
ERT officer 6<4
ERT Engineering Officer
ERT Medical Officer
)
Map changes(
extra table outside canteen
wall shutter gone
plasma subship fuelline marker
hardsuit changes (captain hardsuit/ERT member hardsuits/Medic Hardsuit)
ai shutter
roboticist spare clothing
snowflakes wall-medals
snowflakes decal layers to prevent improper overlaying
gives the poor janitor a souvernier of his glory days.
pretty big changes to the layout
SM fixes
@Erikafox Erikafox added the Ship Ship successfully tested. label Jan 16, 2023
@Erikafox
Copy link
Contributor

image
If you really wanted the medals to look fancy, you could layer a notice board under them.

@ZephyrTFA ZephyrTFA added the Test Merge Candidate You do it for free. label Sep 2, 2023
@goober3
Copy link
Member

goober3 commented Oct 15, 2023

good! i'd nitpick this more but this ship been in the oven for long enough.

@goober3 goober3 enabled auto-merge October 15, 2023 15:04
@goober3 goober3 added this pull request to the merge queue Oct 15, 2023
Merged via the queue into shiptest-ss13:master with commit 68ec49a Oct 15, 2023
10 checks passed
@Doubleumc
Copy link
Contributor

Emitter reflectors start oriented such that they will reflect back at the emitter, destroying it.

No SM monitor console.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service. Ship Ship successfully tested. Test Merge Candidate You do it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.