From a0487028574fef43f253447f780aefbfa826bc6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Thu, 30 May 2024 19:31:14 -0600 Subject: [PATCH 1/8] Adds a solgov variant of the squad vendor dispensing laser pistols instead of handguns --- nsv13/code/modules/squads/squad_vendor.dm | 58 +++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/nsv13/code/modules/squads/squad_vendor.dm b/nsv13/code/modules/squads/squad_vendor.dm index 7a1fde00433..6e401ce8fcb 100644 --- a/nsv13/code/modules/squads/squad_vendor.dm +++ b/nsv13/code/modules/squads/squad_vendor.dm @@ -41,6 +41,15 @@ for(var/instance in subtypesof(/datum/squad_loadout)) loadouts += new instance +/obj/machinery/squad_vendor/solgov + name = "SolGov Squad Vendor" + +/obj/machinery/squad_vendor/solgov/Initialize(mapload) + . = ..() + if(!length(loadouts)) + for(var/instance in subtypesof(/datum/squad_loadout_solgov)) + loadouts += new instance + /obj/machinery/squad_vendor/attackby(obj/item/I, mob/living/user, params) return return_item(user, I) || ..() @@ -216,3 +225,52 @@ name = "Squad Medic (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains specialist equipment for treating common battlefield injuries." items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/storage/firstaid/o2, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock) + + +/datum/squad_loadout_solgov + var/name = "Parent" + var/desc = "A standardised equipment set for Blue Phalanx marines. This set is designed for use in pressurized areas, it comes with lightweight armour to protect the wearer from most hazards." + var/list/items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro) + var/leader_only = FALSE + var/list/allowed_roles = SQUAD_TYPES + +/datum/squad_loadout_solgov/marine + name = "Squad Marine (Standard)" + +/datum/squad_loadout_solgov/space + name = "Squad Marine (Hazardous Environment)" + desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements." + items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro) + +/datum/squad_loadout_solgov/leader + name = "Squad Leader (Standard)" + desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements." + items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad/leader, /obj/item/gun/energy/laser/retro) + leader_only = TRUE + +/datum/squad_loadout_solgov/leader/space + name = "Squad Leader (Hazardous Environment)" + desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements." + items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro) + +/datum/squad_loadout_solgov/engineer + name = "Squad Engineer (Standard)" + desc = "This kit contains everything a squad engineer needs to effect repairs in non-hazardous environments. Recommended only for planetside operations where speed is necessary." + items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro) + allowed_roles = list(DC_SQUAD, MUNITIONS_SUPPORT, COMBAT_AIR_PATROL) + +/datum/squad_loadout_solgov/engineer/space + name = "Squad Engineer (Hazardous Environment)" + desc = "For hazardous, low pressure environments. This kit contains everything a squad engineer needs to effect repairs in the heat of battle, no matter the condition of the ship they're on." + items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad/space,/obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro) + +/datum/squad_loadout_solgov/medic + name = "Squad Medic (Standard)" + desc = "A kit containing battlefield medical equipment and light squad armour." + items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro) + allowed_roles = list(MEDICAL_SQUAD) + +/datum/squad_loadout_solgov/medic/space + name = "Squad Medic (Hazardous Environment)" + desc = "For hazardous, low pressure environments. This kit contains specialist equipment for treating common battlefield injuries." + items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/storage/firstaid/o2, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro) From 664c4469c6403fecc0998eb1c648e12ed3bdd1ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Fri, 31 May 2024 10:47:54 -0600 Subject: [PATCH 2/8] I HAVE NO IDEA WHAT I'M DOING --- nsv13/code/modules/squads/squad_vendor.dm | 48 +++++++++++------------ 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/nsv13/code/modules/squads/squad_vendor.dm b/nsv13/code/modules/squads/squad_vendor.dm index 6e401ce8fcb..b11a918a874 100644 --- a/nsv13/code/modules/squads/squad_vendor.dm +++ b/nsv13/code/modules/squads/squad_vendor.dm @@ -38,17 +38,18 @@ /obj/machinery/squad_vendor/Initialize(mapload) . = ..() if(!length(loadouts)) - for(var/instance in subtypesof(/datum/squad_loadout)) + for(var/instance in subtypesof(/datum/squad_loadout/nt)) loadouts += new instance /obj/machinery/squad_vendor/solgov name = "SolGov Squad Vendor" + var/static/list/loadouts/solgov = list() /obj/machinery/squad_vendor/solgov/Initialize(mapload) . = ..() - if(!length(loadouts)) - for(var/instance in subtypesof(/datum/squad_loadout_solgov)) - loadouts += new instance + if(!length(loadouts/solgov)) + for(var/instance in subtypesof(/datum/squad_loadout/solgov)) + loadouts/solgov += new instance /obj/machinery/squad_vendor/attackby(obj/item/I, mob/living/user, params) return return_item(user, I) || ..() @@ -185,92 +186,87 @@ var/leader_only = FALSE var/list/allowed_roles = SQUAD_TYPES -/datum/squad_loadout/marine +/datum/squad_loadout/nt/marine name = "Squad Marine (Standard)" -/datum/squad_loadout/space +/datum/squad_loadout/nt/space name = "Squad Marine (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements." items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock) -/datum/squad_loadout/leader +/datum/squad_loadout/nt/leader name = "Squad Leader (Standard)" desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements." items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad/leader, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock) leader_only = TRUE -/datum/squad_loadout/leader/space +/datum/squad_loadout/nt/leader/space name = "Squad Leader (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements." items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock) -/datum/squad_loadout/engineer +/datum/squad_loadout/nt/engineer name = "Squad Engineer (Standard)" desc = "This kit contains everything a squad engineer needs to effect repairs in non-hazardous environments. Recommended only for planetside operations where speed is necessary." items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock) allowed_roles = list(DC_SQUAD, MUNITIONS_SUPPORT, COMBAT_AIR_PATROL) -/datum/squad_loadout/engineer/space +/datum/squad_loadout/nt/engineer/space name = "Squad Engineer (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains everything a squad engineer needs to effect repairs in the heat of battle, no matter the condition of the ship they're on." items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad/space,/obj/item/clothing/head/helmet/ship/squad/space, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock) -/datum/squad_loadout/medic +/datum/squad_loadout/nt/medic name = "Squad Medic (Standard)" desc = "A kit containing battlefield medical equipment and light squad armour." items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock) allowed_roles = list(MEDICAL_SQUAD) -/datum/squad_loadout/medic/space +/datum/squad_loadout/nt/medic/space name = "Squad Medic (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains specialist equipment for treating common battlefield injuries." items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/storage/firstaid/o2, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock) -/datum/squad_loadout_solgov - var/name = "Parent" - var/desc = "A standardised equipment set for Blue Phalanx marines. This set is designed for use in pressurized areas, it comes with lightweight armour to protect the wearer from most hazards." - var/list/items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro) - var/leader_only = FALSE - var/list/allowed_roles = SQUAD_TYPES -/datum/squad_loadout_solgov/marine +/datum/squad_loadout/solgov/marine name = "Squad Marine (Standard)" + var/list/items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro) -/datum/squad_loadout_solgov/space +/datum/squad_loadout/solgov/space name = "Squad Marine (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements." items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro) -/datum/squad_loadout_solgov/leader +/datum/squad_loadout/solgov/leader name = "Squad Leader (Standard)" desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements." items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad/leader, /obj/item/gun/energy/laser/retro) leader_only = TRUE -/datum/squad_loadout_solgov/leader/space +/datum/squad_loadout/solgov/leader/space name = "Squad Leader (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements." items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro) -/datum/squad_loadout_solgov/engineer +/datum/squad_loadout/solgov/engineer name = "Squad Engineer (Standard)" desc = "This kit contains everything a squad engineer needs to effect repairs in non-hazardous environments. Recommended only for planetside operations where speed is necessary." items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro) allowed_roles = list(DC_SQUAD, MUNITIONS_SUPPORT, COMBAT_AIR_PATROL) -/datum/squad_loadout_solgov/engineer/space +/datum/squad_loadout/solgov/engineer/space name = "Squad Engineer (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains everything a squad engineer needs to effect repairs in the heat of battle, no matter the condition of the ship they're on." items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad/space,/obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro) -/datum/squad_loadout_solgov/medic +/datum/squad_loadout/solgov/medic name = "Squad Medic (Standard)" desc = "A kit containing battlefield medical equipment and light squad armour." items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro) allowed_roles = list(MEDICAL_SQUAD) -/datum/squad_loadout_solgov/medic/space +/datum/squad_loadout/solgov/medic/space name = "Squad Medic (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains specialist equipment for treating common battlefield injuries." items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/storage/firstaid/o2, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro) From b47f74a56b4d23d5f258f6487716c0d8295cbd69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Fri, 31 May 2024 10:57:30 -0600 Subject: [PATCH 3/8] maybe work? --- nsv13/code/modules/squads/squad_vendor.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nsv13/code/modules/squads/squad_vendor.dm b/nsv13/code/modules/squads/squad_vendor.dm index b11a918a874..761bbf3d47a 100644 --- a/nsv13/code/modules/squads/squad_vendor.dm +++ b/nsv13/code/modules/squads/squad_vendor.dm @@ -32,12 +32,12 @@ resistance_flags = ACID_PROOF | FIRE_PROOF req_one_access = list(ACCESS_HOP, ACCESS_HOS) var/static/list/loans_info = list() - var/static/list/loadouts = list() + var/static/list/loadouts/nt = list() var/static/list/requires_weapons_clearance = list(/obj/item/ammo_box, /obj/item/gun) /obj/machinery/squad_vendor/Initialize(mapload) . = ..() - if(!length(loadouts)) + if(!length(loadouts/nt)) for(var/instance in subtypesof(/datum/squad_loadout/nt)) loadouts += new instance @@ -231,7 +231,7 @@ /datum/squad_loadout/solgov/marine name = "Squad Marine (Standard)" - var/list/items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro) + items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro) /datum/squad_loadout/solgov/space name = "Squad Marine (Hazardous Environment)" From c13d58d4977f7dfab4454a6c48fc051d88cc2c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Fri, 31 May 2024 11:07:37 -0600 Subject: [PATCH 4/8] cheating a little --- nsv13/code/modules/squads/squad_vendor.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nsv13/code/modules/squads/squad_vendor.dm b/nsv13/code/modules/squads/squad_vendor.dm index 761bbf3d47a..3bba07b5dc5 100644 --- a/nsv13/code/modules/squads/squad_vendor.dm +++ b/nsv13/code/modules/squads/squad_vendor.dm @@ -32,24 +32,25 @@ resistance_flags = ACID_PROOF | FIRE_PROOF req_one_access = list(ACCESS_HOP, ACCESS_HOS) var/static/list/loans_info = list() - var/static/list/loadouts/nt = list() + var/static/list/loadouts = list() var/static/list/requires_weapons_clearance = list(/obj/item/ammo_box, /obj/item/gun) + /obj/machinery/squad_vendor/Initialize(mapload) . = ..() - if(!length(loadouts/nt)) + if(!length(loadouts)) for(var/instance in subtypesof(/datum/squad_loadout/nt)) loadouts += new instance /obj/machinery/squad_vendor/solgov name = "SolGov Squad Vendor" - var/static/list/loadouts/solgov = list() + var/static/list/loadouts_solgov = list() /obj/machinery/squad_vendor/solgov/Initialize(mapload) . = ..() - if(!length(loadouts/solgov)) + if(!length(loadouts_solgov)) for(var/instance in subtypesof(/datum/squad_loadout/solgov)) - loadouts/solgov += new instance + loadouts_solgov += new instance /obj/machinery/squad_vendor/attackby(obj/item/I, mob/living/user, params) return return_item(user, I) || ..() From 5f79a5ab98ead9b37cd579669f53941528e02b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Sat, 1 Jun 2024 23:08:56 -0600 Subject: [PATCH 5/8] works now --- nsv13/code/modules/squads/squad_vendor.dm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/nsv13/code/modules/squads/squad_vendor.dm b/nsv13/code/modules/squads/squad_vendor.dm index 3bba07b5dc5..0ade07510c0 100644 --- a/nsv13/code/modules/squads/squad_vendor.dm +++ b/nsv13/code/modules/squads/squad_vendor.dm @@ -32,26 +32,21 @@ resistance_flags = ACID_PROOF | FIRE_PROOF req_one_access = list(ACCESS_HOP, ACCESS_HOS) var/static/list/loans_info = list() - var/static/list/loadouts = list() + var/loadout_type = /datum/squad_loadout/nt + var/list/loadouts = list() var/static/list/requires_weapons_clearance = list(/obj/item/ammo_box, /obj/item/gun) +/obj/machinery/squad_vendor/solgov + name = "Squad Vendor" + icon_state = "squadvend" + loadout_type = /datum/squad_loadout/solgov /obj/machinery/squad_vendor/Initialize(mapload) . = ..() if(!length(loadouts)) - for(var/instance in subtypesof(/datum/squad_loadout/nt)) + for(var/instance in subtypesof(loadout_type)) loadouts += new instance -/obj/machinery/squad_vendor/solgov - name = "SolGov Squad Vendor" - var/static/list/loadouts_solgov = list() - -/obj/machinery/squad_vendor/solgov/Initialize(mapload) - . = ..() - if(!length(loadouts_solgov)) - for(var/instance in subtypesof(/datum/squad_loadout/solgov)) - loadouts_solgov += new instance - /obj/machinery/squad_vendor/attackby(obj/item/I, mob/living/user, params) return return_item(user, I) || ..() From e60b508a50c7f871793baa6074f1a7787493da8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:16:25 -0600 Subject: [PATCH 6/8] laser gun nerf --- nsv13/code/modules/squads/squad_vendor.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nsv13/code/modules/squads/squad_vendor.dm b/nsv13/code/modules/squads/squad_vendor.dm index 0ade07510c0..af4520eed6a 100644 --- a/nsv13/code/modules/squads/squad_vendor.dm +++ b/nsv13/code/modules/squads/squad_vendor.dm @@ -227,42 +227,42 @@ /datum/squad_loadout/solgov/marine name = "Squad Marine (Standard)" - items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro) + items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro/old) /datum/squad_loadout/solgov/space name = "Squad Marine (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements." - items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro) + items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro/old) /datum/squad_loadout/solgov/leader name = "Squad Leader (Standard)" desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements." - items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad/leader, /obj/item/gun/energy/laser/retro) + items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad/leader, /obj/item/gun/energy/laser/retro/old) leader_only = TRUE /datum/squad_loadout/solgov/leader/space name = "Squad Leader (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements." - items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro) + items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro/old) /datum/squad_loadout/solgov/engineer name = "Squad Engineer (Standard)" desc = "This kit contains everything a squad engineer needs to effect repairs in non-hazardous environments. Recommended only for planetside operations where speed is necessary." - items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro) + items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro/old) allowed_roles = list(DC_SQUAD, MUNITIONS_SUPPORT, COMBAT_AIR_PATROL) /datum/squad_loadout/solgov/engineer/space name = "Squad Engineer (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains everything a squad engineer needs to effect repairs in the heat of battle, no matter the condition of the ship they're on." - items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad/space,/obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro) + items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad/space,/obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro/old) /datum/squad_loadout/solgov/medic name = "Squad Medic (Standard)" desc = "A kit containing battlefield medical equipment and light squad armour." - items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro) + items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro/old) allowed_roles = list(MEDICAL_SQUAD) /datum/squad_loadout/solgov/medic/space name = "Squad Medic (Hazardous Environment)" desc = "For hazardous, low pressure environments. This kit contains specialist equipment for treating common battlefield injuries." - items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/storage/firstaid/o2, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro) + items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/storage/firstaid/o2, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro/old) From 1e61f8ebea56f66d0602f30ff0a3776db32b1a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:46:03 -0600 Subject: [PATCH 7/8] adds solgov squad vendors to the wisp --- _maps/map_files/Aetherwhisp/Aetherwhisp1.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm b/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm index 37630b2560d..94eeb5b48c0 100644 --- a/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm +++ b/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm @@ -9172,7 +9172,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/squad_vendor{ +/obj/machinery/squad_vendor/solgov{ density = 0; pixel_y = -32 }, @@ -30379,7 +30379,7 @@ /turf/open/floor/carpet/ship/blue, /area/medical/patients_rooms/room_a) "tLG" = ( -/obj/machinery/squad_vendor{ +/obj/machinery/squad_vendor/solgov{ density = 0; pixel_y = 26 }, From 10c02b6a9b9f3f3cad5ab69f8b49b8a681488337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Fri, 7 Jun 2024 12:40:57 -0600 Subject: [PATCH 8/8] Update squad_vendor.dm --- nsv13/code/modules/squads/squad_vendor.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nsv13/code/modules/squads/squad_vendor.dm b/nsv13/code/modules/squads/squad_vendor.dm index af4520eed6a..876db0d0166 100644 --- a/nsv13/code/modules/squads/squad_vendor.dm +++ b/nsv13/code/modules/squads/squad_vendor.dm @@ -21,7 +21,7 @@ new /obj/item/crowbar(src) /obj/machinery/squad_vendor - name = "Squad Vendor" + name = "squad Vendor" desc = "A machine which can dispense equipment to squads. Kits taken from this machine must be returned before you can get a new one." icon = 'nsv13/icons/obj/computers.dmi' icon_state = "squadvend" @@ -37,8 +37,6 @@ var/static/list/requires_weapons_clearance = list(/obj/item/ammo_box, /obj/item/gun) /obj/machinery/squad_vendor/solgov - name = "Squad Vendor" - icon_state = "squadvend" loadout_type = /datum/squad_loadout/solgov /obj/machinery/squad_vendor/Initialize(mapload)