Skip to content

Commit

Permalink
Adds a Colony Synthetic variant, with bug fixes (#4760)
Browse files Browse the repository at this point in the history
# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

1. should fix fax machine problem(thx forest)
2.  gives trucker synth the frontier jumpsuit(Thwomplert)
3. adds Freelancer Synthetic. This Synth is one that was bought off a
civi market and reprogrammed, or stolen and reprogrammed, or hacked, You
get the point - its going with a band of freelancers. The idea behind it
is that this synth's team is dead and they are just programmed as a merc
for pay - hoping to someday find their boss boss and give the money as
set up. I always thought about this one for a long time and decided to
put him in the civilian category, where its hard to roll and also gives
you freedom to choose your allegiance. In this case I hope that a
freelancer synthetic will open up unique avenue of RP and allegiance.
I've only explored it once ingame, but it was very good for RP!
Hopefully people can recreate this success.

was hard to make this guy look cool and I also wasn't sure on what his
loadout would be. I ended up giving him random generic stuff while
looking like a beat up freelancer(missing the armor especially hurt his
look, since thats the largest piece of a freelancer - the curiass, but I
don't want to give armor for balance reasons) and no beret because its
for a SL only.

as usual, if a synth wants to change RP avenues and don different
clothes for different RP, no one would know the difference
# Explain why it's good for the game
1. bug bad
2. a beat up UA laborer that so happens to be synthetic. you wouldn't
expect it because there's so many similar looking people! exactly the
job of a synth - to blend in.
3. Freelancer colony synth hopefully will open up a unique avenue of RP.
If they don't want to they can always ditch it - but its on a relatively
rare and uncommon roll anyways.
# Testing Photographs and Procedure
<details>
<summary>[Screenshots &
Videos](https://cdn.discordapp.com/attachments/490668342357786645/1166307813719556187/image.png?ex=654a03cb&is=65378ecb&hm=7108218bbaab61c78c0bedcecbfdcc07bdf9db87a3fefe9fb94b28d3430cc815&)</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: adds another Colony Synthetic variant, changes up some existing
ones(trucker,CMB)
fix: fixes a small problem with WY-Colony Synthetic access(thx forest),
adds WY subtype of Synthetics for admin building/faxes
fix: fixes problems with organic spawning ferret industries Trucker
Synthetic
/:cl:
  • Loading branch information
QuickLode committed Nov 7, 2023
1 parent ffdb054 commit 830e002
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 8 deletions.
8 changes: 5 additions & 3 deletions code/datums/map_config.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,14 @@
/datum/equipment_preset/synth/survivor/janitor_synth,
/datum/equipment_preset/synth/survivor/chef_synth,
/datum/equipment_preset/synth/survivor/teacher_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/detective_synth,
/datum/equipment_preset/synth/survivor/cmb_synth,
/datum/equipment_preset/synth/survivor/security_synth,
/datum/equipment_preset/synth/survivor/protection_synth,
/datum/equipment_preset/synth/survivor/corporate_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/radiation_synth,
)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@
worn_state = "freelancer_uniform"
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
has_sensor = UNIFORM_NO_SENSORS
suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/freelancer)
suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/freelancer, /obj/item/clothing/suit/storage/webbing, /obj/item/clothing/suit/storage/utility_vest)

//=========================//Dutch Dozen\\================================\\
Expand Down
30 changes: 26 additions & 4 deletions code/modules/gear_presets/synths.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@
. = ..()
access = get_access(ACCESS_LIST_WY_PMC)

/datum/equipment_preset/synth/survivor/wy/New()
. = ..()
access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH + ACCESS_WY_GENERAL // for WY synths - admin building and wy fax machines access

/datum/equipment_preset/synth/survivor/load_gear(mob/living/carbon/human/new_human)
for(var/equipment in equipment_to_spawn)
var/equipment_path = islist(equipment_to_spawn[equipment]) ? pick(equipment_to_spawn[equipment]) : equipment_to_spawn[equipment]
Expand Down Expand Up @@ -300,11 +304,28 @@
WEAR_L_HAND = /obj/item/storage/large_holster/machete/full
)

/datum/equipment_preset/synth/survivor/freelancer_synth
name = "Survivor - Synthetic - Freelancer Synth"
equipment_to_spawn = list(
WEAR_HEAD = /obj/item/clothing/head/welding,
WEAR_FACE = /obj/item/clothing/mask/rebreather/scarf,
WEAR_BODY = /obj/item/clothing/under/marine/veteran/freelancer,
WEAR_BACK = /obj/item/storage/backpack/lightpack,
WEAR_IN_BACK = /obj/item/tool/weldpack/minitank,
WEAR_JACKET = /obj/item/clothing/suit/storage/utility_vest,
WEAR_IN_JACKET = /obj/item/explosive/grenade/smokebomb,
WEAR_WAIST = /obj/item/storage/belt/marine,
WEAR_HANDS = /obj/item/clothing/gloves/marine/veteran,
WEAR_R_HAND = /obj/item/storage/pouch/flare/full,
WEAR_FEET = /obj/item/clothing/shoes/marine/upp,
WEAR_L_HAND = /obj/item/storage/large_holster/katana/full
)

/datum/equipment_preset/synth/survivor/trucker_synth
name = "Survivor - Synthetic - Trucker Synth"
equipment_to_spawn = list(
WEAR_HEAD = /obj/item/clothing/head/soft/ferret,
WEAR_BODY = /obj/item/clothing/under/colonist,
WEAR_BODY = /obj/item/clothing/under/rank/synthetic/frontier,
WEAR_BACK = /obj/item/storage/backpack/satchel/norm,
WEAR_IN_BACK = /obj/item/pamphlet/skill/powerloader,
WEAR_R_HAND = /obj/item/tool/weldingtool/hugetank,
Expand Down Expand Up @@ -359,6 +380,7 @@
WEAR_L_EAR = /obj/item/device/radio/headset/distress/CMB/limited,
WEAR_EYES = /obj/item/clothing/glasses/sunglasses/sechud,
WEAR_BODY = /obj/item/clothing/under/CM_uniform,
WEAR_ACCESSORY = /obj/item/clothing/accessory/holobadge/cord,
WEAR_BACK = /obj/item/storage/backpack/satchel/sec,
WEAR_IN_BACK = /obj/item/device/camera,
WEAR_IN_BACK = /obj/item/device/taperecorder,
Expand All @@ -373,7 +395,7 @@

survivor_variant = SECURITY_SURVIVOR

/datum/equipment_preset/synth/survivor/security_synth
/datum/equipment_preset/synth/survivor/wy/security_synth
name = "Survivor - Synthetic - Corporate Security Synth"
idtype = /obj/item/card/id/silver/cl
role_comm_title = "WY Syn"
Expand All @@ -394,7 +416,7 @@

survivor_variant = SECURITY_SURVIVOR

/datum/equipment_preset/synth/survivor/protection_synth
/datum/equipment_preset/synth/survivor/wy/protection_synth
name = "Survivor - Synthetic - Corporate Protection Synth"
idtype = /obj/item/card/id/pmc
role_comm_title = "WY Syn"
Expand All @@ -418,7 +440,7 @@

survivor_variant = SECURITY_SURVIVOR

/datum/equipment_preset/synth/survivor/corporate_synth
/datum/equipment_preset/synth/survivor/wy/corporate_synth
name = "Survivor - Synthetic - Corporate Clerical Synth"
idtype = /obj/item/card/id/data
role_comm_title = "WY Syn"
Expand Down

0 comments on commit 830e002

Please sign in to comment.