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.

Sign up for GitHub

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

Jump to bottom

Adds a Colony Synthetic variant, with bug fixes #4760

Merged
merged 7 commits into from
Nov 7, 2023
Merged

Adds a Colony Synthetic variant, with bug fixes #4760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f4e07e7
idk why i put this on cmb typo branch LMAO
QuickLode Oct 21, 2023
8dc2886
linter fix
QuickLode Oct 21, 2023
bef7330
typo
QuickLode Oct 21, 2023
df97104
long list you're giving me problems bye
QuickLode Oct 21, 2023
fa487f4
excellent test
QuickLode Oct 24, 2023
2d3b2bf
where is this linter?
QuickLode Oct 24, 2023
9d9afac
Merge branch 'master' into cmbtypo
QuickLode Oct 24, 2023
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
8 changes: 5 additions & 3 deletions code/datums/map_config.dm
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,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
View file
Open in desktop
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