From f4e07e798c22aa52d7ba7dbaeabc647887277163 Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Sat, 21 Oct 2023 07:46:37 -0700 Subject: [PATCH 1/6] idk why i put this on cmb typo branch LMAO --- code/modules/clothing/under/marine_uniform.dm | 5 ++++- code/modules/gear_presets/synths.dm | 20 +++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index d9d8d7da45b7..166a000d28e6 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -605,7 +605,10 @@ 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 + ) //=========================//Dutch Dozen\\================================\\ diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index dc5d3b7217c8..fb9638ba6998 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -141,7 +141,7 @@ /datum/equipment_preset/synth/survivor/New() . = ..() - access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH //Access to civillians stuff + medbay stuff + engineering stuff + research + access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH + ACCESS_WY_GENERAL//Access to civillians stuff + medbay stuff + engineering stuff + research + admin building and faxes /datum/equipment_preset/synth/survivor/load_gear(mob/living/carbon/human/new_human) for(var/equipment in equipment_to_spawn) @@ -296,11 +296,27 @@ WEAR_L_HAND = /obj/item/storage/large_holster/machete/full ) +/datum/equipment_preset/synth/survivor/teacher_synth + name = "Survivor - Synthetic - Freelancer Synth" + equipment_to_spawn = list( + WEAR_HEAD = /obj/item/clothing/head/welding, + 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/webbing, + 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/knife, + 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, From 8dc28867e48ebd23624eab4d045e9ee3e70b6638 Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Sat, 21 Oct 2023 07:58:17 -0700 Subject: [PATCH 2/6] linter fix --- code/modules/clothing/under/marine_uniform.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 166a000d28e6..e912df63020d 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -607,7 +607,7 @@ has_sensor = UNIFORM_NO_SENSORS suit_restricted = list( /obj/item/clothing/suit/storage/marine/faction/freelancer, - /obj/item/clothing/suit/storage/webbing + /obj/item/clothing/suit/storage/webbing, ) //=========================//Dutch Dozen\\================================\\ From bef73300a99dd5a56b2601cfa079c99812833d2e Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Sat, 21 Oct 2023 08:02:16 -0700 Subject: [PATCH 3/6] typo --- code/modules/gear_presets/synths.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index fb9638ba6998..b510cff61b7d 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -296,7 +296,7 @@ WEAR_L_HAND = /obj/item/storage/large_holster/machete/full ) -/datum/equipment_preset/synth/survivor/teacher_synth +/datum/equipment_preset/synth/survivor/freelancer_synth name = "Survivor - Synthetic - Freelancer Synth" equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/welding, From df97104bb51ac58d2813cd91f8547c6e2bda854a Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Sat, 21 Oct 2023 08:05:31 -0700 Subject: [PATCH 4/6] long list you're giving me problems bye --- code/modules/clothing/under/marine_uniform.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index e912df63020d..b9986969ae7f 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -605,10 +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, - /obj/item/clothing/suit/storage/webbing, - ) + suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/freelancer, /obj/item/clothing/suit/storage/webbing) //=========================//Dutch Dozen\\================================\\ From fa487f4b8dfce1a11f031bdf8f869bd7fd55e171 Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Tue, 24 Oct 2023 02:34:33 -0700 Subject: [PATCH 5/6] excellent test --- code/datums/map_config.dm | 8 +++--- code/modules/clothing/under/marine_uniform.dm | 2 +- code/modules/gear_presets/synths.dm | 25 ++++++++++++++----- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 1f3c265ead76..3bf5c601cec9 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -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, ) diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index b9986969ae7f..8ff4bd48d3b6 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -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, /obj/item/clothing/suit/storage/webbing) + 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\\================================\\ diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index b510cff61b7d..160ca1b9f393 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -141,7 +141,18 @@ /datum/equipment_preset/synth/survivor/New() . = ..() - access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH + ACCESS_WY_GENERAL//Access to civillians stuff + medbay stuff + engineering stuff + research + admin building and faxes + access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH //Access to civillians stuff + medbay stuff + engineering stuff + research + +/datum/equipment_preset/synth/survivor/pmc/New() + . = ..() + 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 //admin building and wy fax machines + + + /datum/equipment_preset/synth/survivor/load_gear(mob/living/carbon/human/new_human) for(var/equipment in equipment_to_spawn) @@ -300,15 +311,16 @@ 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/webbing, + 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/knife, + WEAR_FEET = /obj/item/clothing/shoes/marine/upp, WEAR_L_HAND = /obj/item/storage/large_holster/katana/full ) @@ -371,6 +383,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, @@ -385,7 +398,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" @@ -406,7 +419,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" @@ -430,7 +443,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" From 2d3b2bf0808364ed8824bb524157e5c186abe1ac Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Tue, 24 Oct 2023 02:42:51 -0700 Subject: [PATCH 6/6] where is this linter? --- code/modules/gear_presets/synths.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 160ca1b9f393..13caffd1c6ee 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -149,10 +149,7 @@ /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 //admin building and wy fax machines - - - + 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)