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

updates & adds some synthvivor presets #8121

Merged
Merged
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
14 changes: 12 additions & 2 deletions code/datums/map_config.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,23 +81,33 @@
)

synth_survivor_types = list(
/datum/equipment_preset/synth/survivor/medical_synth,
/datum/equipment_preset/synth/survivor/emt_synth,
/datum/equipment_preset/synth/survivor/doctor_synth,
/datum/equipment_preset/synth/survivor/surgeon_synth,
/datum/equipment_preset/synth/survivor/emt_synth_teal,
/datum/equipment_preset/synth/survivor/emt_synth_red,
/datum/equipment_preset/synth/survivor/scientist_synth,
/datum/equipment_preset/synth/survivor/biohazard_synth,
/datum/equipment_preset/synth/survivor/archaeologist_synth,
/datum/equipment_preset/synth/survivor/engineer_synth,
/datum/equipment_preset/synth/survivor/firefighter_synth,
/datum/equipment_preset/synth/survivor/miner_synth,
/datum/equipment_preset/synth/survivor/chef_synth,
/datum/equipment_preset/synth/survivor/teacher_synth,
/datum/equipment_preset/synth/survivor/surveyor_synth,
/datum/equipment_preset/synth/survivor/freelancer_synth,
/datum/equipment_preset/synth/survivor/trucker_synth,
/datum/equipment_preset/synth/survivor/bartender_synth,
/datum/equipment_preset/synth/survivor/fisher_synth,
/datum/equipment_preset/synth/survivor/hydro_synth,
/datum/equipment_preset/synth/survivor/journalist_synth,
/datum/equipment_preset/synth/survivor/atc_synth,
/datum/equipment_preset/synth/survivor/cmb_synth,
/datum/equipment_preset/synth/survivor/wy/security_synth,
/datum/equipment_preset/synth/survivor/wy/protection_synth,
/datum/equipment_preset/synth/survivor/wy/corporate_synth,
/datum/equipment_preset/synth/survivor/detective_synth,
/datum/equipment_preset/synth/survivor/icc_synth,
/datum/equipment_preset/synth/survivor/pilot_synth,
/datum/equipment_preset/synth/survivor/radiation_synth,
)

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/landmarks/survivor_spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@

/obj/effect/landmark/survivor_spawner/shivas_panic_room_doc
equipment = /datum/equipment_preset/survivor/doctor/shiva
synth_equipment = /datum/equipment_preset/synth/survivor/emt_synth
synth_equipment = /datum/equipment_preset/synth/survivor/emt_synth_teal
intro_text = list("<h2>You are a Medical Doctor on the Colony!</h2>",\
"<span class='notice'>You are aware of the xenomorph threat.</span>",\
"<span class='danger'>Your primary objective is to survive the outbreak.</span>")
Expand Down
4 changes: 4 additions & 0 deletions code/modules/clothing/glasses/glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,10 @@
icon_state = "kutjevo_goggles"
item_state = "kutjevo_goggles"

/obj/item/clothing/glasses/kutjevo/safety
name = "safety goggles"
desc = "Goggles used to shield the eyes of workers. N95Z Rated."

/obj/item/clothing/glasses/eyepatch
name = "eyepatch"
gender = NEUTER
Expand Down
Loading
Loading