From 50240fe6dffa623de0a9fa8fcc93670622115407 Mon Sep 17 00:00:00 2001 From: UEDCommander Date: Wed, 29 Jan 2025 03:16:29 +0300 Subject: [PATCH 01/14] Stuff --- .../modules/security-rearm/code/outfit.dm | 1 + .../security-rearm/code/security_first_aid.dm | 23 +++++++++++++++++++ tgstation.dme | 1 + 3 files changed, 25 insertions(+) create mode 100644 tff_modular/modules/security-rearm/code/security_first_aid.dm diff --git a/tff_modular/modules/security-rearm/code/outfit.dm b/tff_modular/modules/security-rearm/code/outfit.dm index 72c33477624..f4b88a5cf2c 100644 --- a/tff_modular/modules/security-rearm/code/outfit.dm +++ b/tff_modular/modules/security-rearm/code/outfit.dm @@ -3,4 +3,5 @@ backpack_contents = list( /obj/item/evidencebag = 1, /obj/item/choice_beacon/sec_officer = 1, + /obj/item/storage/medkit/tac_security = 1, ) diff --git a/tff_modular/modules/security-rearm/code/security_first_aid.dm b/tff_modular/modules/security-rearm/code/security_first_aid.dm new file mode 100644 index 00000000000..b3fffecd377 --- /dev/null +++ b/tff_modular/modules/security-rearm/code/security_first_aid.dm @@ -0,0 +1,23 @@ +/obj/item/storage/medkit/tac_security + name = "security emergency medkit" + desc = "Standard-issue medical kit issued to NanoTrasen security operatives. Contains first-aid supplies meant to keep an officer alive until proper medical staff can take over." + icon = 'modular_nova/modules/deforest_medical_items/icons/storage.dmi' + icon_state = "frontier" + lefthand_file = 'modular_nova/modules/deforest_medical_items/icons/inhands/cases_lefthand.dmi' + righthand_file = 'modular_nova/modules/deforest_medical_items/icons/inhands/cases_righthand.dmi' + inhand_icon_state = "frontier" + worn_icon_state = "frontier" + worn_icon = 'modular_nova/modules/deforest_medical_items/icons/worn/worn.dmi' + worn_icon_teshari = 'modular_nova/modules/deforest_medical_items/icons/worn/worn_teshari.dmi' + +/obj/item/storage/medkit/tac_security/PopulateContents() + if(empty) + return + var/static/items_inside = list( + /obj/item/stack/medical/gauze = 1, + /obj/item/stack/medical/suture = 1, + /obj/item/stack/medical/mesh = 1, + /obj/item/reagent_containers/hypospray/medipen = 1, + /obj/item/reagent_containers/hypospray/medipen/deforest/coagulants = 1, + ) + generate_items_inside(items_inside,src) diff --git a/tgstation.dme b/tgstation.dme index ca08d41d8f7..579d416a95b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8977,6 +8977,7 @@ #include "tff_modular\modules\redsec_reskins\code\redsec.dm" #include "tff_modular\modules\security-rearm\code\outfit.dm" #include "tff_modular\modules\security-rearm\code\security_beacon.dm" +#include "tff_modular\modules\security-rearm\code\security_first_aid.dm" #include "tff_modular\modules\security-rearm\code\wespe.dm" #include "tff_modular\modules\selestial_language\language.dm" #include "tff_modular\modules\silicon_laws_tweaks\code\upload.dm" From cd9c68f5da04eeac615598863f9b6ed2cd6208bf Mon Sep 17 00:00:00 2001 From: UEDCommander Date: Wed, 29 Jan 2025 10:57:31 +0300 Subject: [PATCH 02/14] Medkit size tweak --- .../modules/security-rearm/code/security_first_aid.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tff_modular/modules/security-rearm/code/security_first_aid.dm b/tff_modular/modules/security-rearm/code/security_first_aid.dm index b3fffecd377..b7311d1d810 100644 --- a/tff_modular/modules/security-rearm/code/security_first_aid.dm +++ b/tff_modular/modules/security-rearm/code/security_first_aid.dm @@ -10,6 +10,13 @@ worn_icon = 'modular_nova/modules/deforest_medical_items/icons/worn/worn.dmi' worn_icon_teshari = 'modular_nova/modules/deforest_medical_items/icons/worn/worn_teshari.dmi' +/obj/item/storage/medkit/tac_security/Initialize(mapload) + . = ..() + atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL //holds the same equipment as a medibelt + atom_storage.max_slots = 6 + atom_storage.max_total_storage = 12 + atom_storage.set_holdable(list_of_everything_medkits_can_hold) + /obj/item/storage/medkit/tac_security/PopulateContents() if(empty) return From f1c0806a269311de4ebfa915f92d13395eae6b64 Mon Sep 17 00:00:00 2001 From: UEDCommander Date: Wed, 12 Feb 2025 01:05:55 +0300 Subject: [PATCH 03/14] More stuff --- .../modules/security-rearm/code/loadout.dm | 21 ++++++++ .../modules/security-rearm/code/outfit.dm | 1 - .../security-rearm/code/security_first_aid.dm | 49 +++++++++++------- .../modules/security-rearm/icons/pouches.dmi | Bin 0 -> 408 bytes tgstation.dme | 1 + 5 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 tff_modular/modules/security-rearm/code/loadout.dm create mode 100644 tff_modular/modules/security-rearm/icons/pouches.dmi diff --git a/tff_modular/modules/security-rearm/code/loadout.dm b/tff_modular/modules/security-rearm/code/loadout.dm new file mode 100644 index 00000000000..9d4a0e2129f --- /dev/null +++ b/tff_modular/modules/security-rearm/code/loadout.dm @@ -0,0 +1,21 @@ +/datum/loadout_item/pocket_items/synthetic_medkit + blacklisted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) + +/datum/loadout_item/pocket_items/medkit + blacklisted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) + +/datum/loadout_item/pocket_items/medipen_pouch + blacklisted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) + +/datum/loadout_item/pocket_items/medkit_pouch + blacklisted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) + +/datum/loadout_item/pocket_items/security_medkit + name = "Security Emergency Medkit" + item_path = /obj/item/storage/pouch/medical/tac_security/loaded + restricted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) + +/datum/loadout_item/pocket_items/synth_security_medkit + name = "Security Maintenance Kit (Synthetic)" + item_path = /obj/item/storage/pouch/medical/tac_security/synth/loaded + restricted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) diff --git a/tff_modular/modules/security-rearm/code/outfit.dm b/tff_modular/modules/security-rearm/code/outfit.dm index f4b88a5cf2c..72c33477624 100644 --- a/tff_modular/modules/security-rearm/code/outfit.dm +++ b/tff_modular/modules/security-rearm/code/outfit.dm @@ -3,5 +3,4 @@ backpack_contents = list( /obj/item/evidencebag = 1, /obj/item/choice_beacon/sec_officer = 1, - /obj/item/storage/medkit/tac_security = 1, ) diff --git a/tff_modular/modules/security-rearm/code/security_first_aid.dm b/tff_modular/modules/security-rearm/code/security_first_aid.dm index b7311d1d810..ab4aa8adf36 100644 --- a/tff_modular/modules/security-rearm/code/security_first_aid.dm +++ b/tff_modular/modules/security-rearm/code/security_first_aid.dm @@ -1,30 +1,41 @@ -/obj/item/storage/medkit/tac_security +/obj/item/storage/pouch/medical/tac_security name = "security emergency medkit" - desc = "Standard-issue medical kit issued to NanoTrasen security operatives. Contains first-aid supplies meant to keep an officer alive until proper medical staff can take over." - icon = 'modular_nova/modules/deforest_medical_items/icons/storage.dmi' - icon_state = "frontier" - lefthand_file = 'modular_nova/modules/deforest_medical_items/icons/inhands/cases_lefthand.dmi' - righthand_file = 'modular_nova/modules/deforest_medical_items/icons/inhands/cases_righthand.dmi' - inhand_icon_state = "frontier" - worn_icon_state = "frontier" - worn_icon = 'modular_nova/modules/deforest_medical_items/icons/worn/worn.dmi' - worn_icon_teshari = 'modular_nova/modules/deforest_medical_items/icons/worn/worn_teshari.dmi' + desc = "Standard-issue medical kit issued to NanoTrasen security operatives. Contains first-aid supplies meant to keep an officer alive until proper medical staff can take over. Stored in a pocket pouch for ease of access." + w_class = WEIGHT_CLASS_BULKY + icon = 'tff_modular/modules/security-rearm/icons/pouches.dmi' + icon_state = "tac_security" -/obj/item/storage/medkit/tac_security/Initialize(mapload) +/obj/item/storage/pouch/medical/tac_security/Initialize(mapload) . = ..() - atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL //holds the same equipment as a medibelt + atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL atom_storage.max_slots = 6 atom_storage.max_total_storage = 12 - atom_storage.set_holdable(list_of_everything_medkits_can_hold) + atom_storage.set_holdable(med_pouch_holdables) -/obj/item/storage/medkit/tac_security/PopulateContents() - if(empty) - return +/obj/item/storage/pouch/medical/tac_security/loaded/Initialize(mapload) + . = ..() var/static/items_inside = list( - /obj/item/stack/medical/gauze = 1, + /obj/item/stack/medical/gauze/sterilized = 1, + /obj/item/stack/medical/suture/coagulant = 1, /obj/item/stack/medical/suture = 1, /obj/item/stack/medical/mesh = 1, - /obj/item/reagent_containers/hypospray/medipen = 1, + /obj/item/reagent_containers/hypospray/medipen/deforest/calopine = 1, + /obj/item/reagent_containers/hypospray/medipen/deforest/morpital = 1, + ) + generate_items_inside(items_inside, src) + +/obj/item/storage/pouch/medical/tac_security/synth + name = "security maintenance kit" + desc = "Standard-issue maintenance kit issued to NanoTrasen synthetic security operatives. Stored in a pocket pouch for ease of access." + icon_state = "tac_security_synth" + +/obj/item/storage/pouch/medical/tac_security/synth/loaded/Initialize(mapload) + . = ..() + var/static/items_inside = list( + /obj/item/stack/medical/gauze = 1, + /obj/item/reagent_containers/pill/robotic_patch/synth_repair = 2, + /obj/item/stack/medical/wound_recovery/robofoam = 1, + /obj/item/reagent_containers/hypospray/medipen/deforest/robot_system_cleaner = 1, /obj/item/reagent_containers/hypospray/medipen/deforest/coagulants = 1, ) - generate_items_inside(items_inside,src) + generate_items_inside(items_inside, src) diff --git a/tff_modular/modules/security-rearm/icons/pouches.dmi b/tff_modular/modules/security-rearm/icons/pouches.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e9d3a67f9a2ae0f84f921e4020c04989576942b1 GIT binary patch literal 408 zcmV;J0cZY+P)7qF7#JI6X>uEMU>E=Z00DGTPE!Ct z=GbNc004S=R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSBr!R@I5oMnD6^zeiHkEOv#1y-Y{F6&14bnQ zAStAXi_c&z=mG?e!Uj0_3?`vq5MqFX4;Dy8RS*`2rXZ{WO#w2WVG7WMQlP*D9DD{# zSFoL)21xu=BtCMeMzyJV9=w^Q%8HCIL0000 Date: Wed, 12 Feb 2025 07:14:27 +0300 Subject: [PATCH 04/14] This should probably be there as well --- .../modules/security-rearm/code/security_first_aid.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tff_modular/modules/security-rearm/code/security_first_aid.dm b/tff_modular/modules/security-rearm/code/security_first_aid.dm index ab4aa8adf36..412354fcd5d 100644 --- a/tff_modular/modules/security-rearm/code/security_first_aid.dm +++ b/tff_modular/modules/security-rearm/code/security_first_aid.dm @@ -29,6 +29,14 @@ desc = "Standard-issue maintenance kit issued to NanoTrasen synthetic security operatives. Stored in a pocket pouch for ease of access." icon_state = "tac_security_synth" +/obj/item/storage/pouch/medical/tac_security/synth/Initialize(mapload) + . = ..() + var/static/list/synth_med_pouch_holdables = med_pouch_holdables + list( + /obj/item/stack/cable_coil, + /obj/item/weldingtool, + ) + atom_storage.set_holdable(synth_med_pouch_holdables) + /obj/item/storage/pouch/medical/tac_security/synth/loaded/Initialize(mapload) . = ..() var/static/items_inside = list( From 622ab3e81b22a84675a725a328280a7ea59a46c5 Mon Sep 17 00:00:00 2001 From: UEDCommander Date: Sat, 22 Feb 2025 20:04:06 +0300 Subject: [PATCH 05/14] This is an actual war crime tbh --- .../modules/security-rearm/code/loadout.dm | 18 +++------- .../modules/security-rearm/code/outfit.dm | 35 +++++++++++++++++++ 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/tff_modular/modules/security-rearm/code/loadout.dm b/tff_modular/modules/security-rearm/code/loadout.dm index 9d4a0e2129f..f3f12450c26 100644 --- a/tff_modular/modules/security-rearm/code/loadout.dm +++ b/tff_modular/modules/security-rearm/code/loadout.dm @@ -1,21 +1,11 @@ /datum/loadout_item/pocket_items/synthetic_medkit - blacklisted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) + blacklisted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) /datum/loadout_item/pocket_items/medkit - blacklisted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) + blacklisted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) /datum/loadout_item/pocket_items/medipen_pouch - blacklisted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) + blacklisted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) /datum/loadout_item/pocket_items/medkit_pouch - blacklisted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) - -/datum/loadout_item/pocket_items/security_medkit - name = "Security Emergency Medkit" - item_path = /obj/item/storage/pouch/medical/tac_security/loaded - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) - -/datum/loadout_item/pocket_items/synth_security_medkit - name = "Security Maintenance Kit (Synthetic)" - item_path = /obj/item/storage/pouch/medical/tac_security/synth/loaded - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) + blacklisted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) diff --git a/tff_modular/modules/security-rearm/code/outfit.dm b/tff_modular/modules/security-rearm/code/outfit.dm index 72c33477624..5972a2c151b 100644 --- a/tff_modular/modules/security-rearm/code/outfit.dm +++ b/tff_modular/modules/security-rearm/code/outfit.dm @@ -1,6 +1,41 @@ +/datum/job + var/datum/outfit/synthetic_outfit //Да, новая переменная в датум чисто ради аптечки, нет, мне не стыдно + +/datum/species/synthetic/pre_equip_species_outfit(datum/job/job, mob/living/carbon/human/equipping, visuals_only) + . = ..() + if(job?.synthetic_outfit) + equipping.equipOutfit(job.synthetic_outfit, visuals_only) + +//Сами аутфиты /datum/outfit/job/security suit_store = null backpack_contents = list( /obj/item/evidencebag = 1, /obj/item/choice_beacon/sec_officer = 1, ) + r_pocket = /obj/item/storage/pouch/medical/tac_security/loaded + +/datum/outfit/job/security/synthetic + r_pocket = /obj/item/storage/pouch/medical/tac_security/synth/loaded + +/datum/job/security_officer + synthetic_outfit = /datum/outfit/job/security/synthetic + +/datum/outfit/job/hos + r_pocket = /obj/item/storage/pouch/medical/tac_security/loaded + +/datum/outfit/job/hos/synthetic + r_pocket = /obj/item/storage/pouch/medical/tac_security/synth/loaded + +/datum/outfit/job/warden + r_pocket = /obj/item/storage/pouch/medical/tac_security/loaded + +/datum/outfit/job/warden/synthetic + r_pocket = /obj/item/storage/pouch/medical/tac_security/synth/loaded + +/datum/species/synthetic + outfit_override_registry = list( + /datum/outfit/job/security = /datum/outfit/job/security/synthetic, + /datum/outfit/job/warden = /datum/outfit/job/warden/synthetic, + /datum/outfit/job/hos = /datum/outfit/job/hos/synthetic, + ) From 72591305fbdf2a0774513188eba5b8ca74005bc3 Mon Sep 17 00:00:00 2001 From: UEDCommander Date: Sat, 22 Feb 2025 20:11:51 +0300 Subject: [PATCH 06/14] Forgot hos and warden --- tff_modular/modules/security-rearm/code/outfit.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tff_modular/modules/security-rearm/code/outfit.dm b/tff_modular/modules/security-rearm/code/outfit.dm index 5972a2c151b..f94110b5dbc 100644 --- a/tff_modular/modules/security-rearm/code/outfit.dm +++ b/tff_modular/modules/security-rearm/code/outfit.dm @@ -27,12 +27,18 @@ /datum/outfit/job/hos/synthetic r_pocket = /obj/item/storage/pouch/medical/tac_security/synth/loaded +/datum/job/hos + synthetic_outfit = /datum/outfit/job/hos/synthetic + /datum/outfit/job/warden r_pocket = /obj/item/storage/pouch/medical/tac_security/loaded /datum/outfit/job/warden/synthetic r_pocket = /obj/item/storage/pouch/medical/tac_security/synth/loaded +/datum/job/warden + synthetic_outfit = /datum/outfit/job/warden/synthetic + /datum/species/synthetic outfit_override_registry = list( /datum/outfit/job/security = /datum/outfit/job/security/synthetic, From ec05b65e923b739156aaa723495d4b346e57775e Mon Sep 17 00:00:00 2001 From: Feenie <62373791+FeenieRU@users.noreply.github.com> Date: Sun, 23 Feb 2025 21:12:53 +0300 Subject: [PATCH 07/14] Fix bottles putting --- .../security-rearm/code/security_first_aid.dm | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/tff_modular/modules/security-rearm/code/security_first_aid.dm b/tff_modular/modules/security-rearm/code/security_first_aid.dm index 412354fcd5d..db7925a350d 100644 --- a/tff_modular/modules/security-rearm/code/security_first_aid.dm +++ b/tff_modular/modules/security-rearm/code/security_first_aid.dm @@ -4,13 +4,36 @@ w_class = WEIGHT_CLASS_BULKY icon = 'tff_modular/modules/security-rearm/icons/pouches.dmi' icon_state = "tac_security" + var/static/list/pouch_holdables = list( + /obj/item/healthanalyzer, + /obj/item/dnainjector, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/pill, + /obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/medigel, + /obj/item/reagent_containers/spray, + /obj/item/reagent_containers/hypospray, + /obj/item/storage/pill_bottle, + /obj/item/storage/box/bandages, + /obj/item/stack/medical, + /obj/item/flashlight/pen, + /obj/item/reagent_containers/blood, + /obj/item/stack/sticky_tape, + ) + var/static/list/pouch_unholdables = list( + /obj/item/reagent_containers/spray/pepper, + /obj/item/reagent_containers/cup, + /obj/item/storage/wallet, + ) + + /obj/item/storage/pouch/medical/tac_security/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL atom_storage.max_slots = 6 atom_storage.max_total_storage = 12 - atom_storage.set_holdable(med_pouch_holdables) + atom_storage.set_holdable(pouch_holdables, pouch_unholdables) /obj/item/storage/pouch/medical/tac_security/loaded/Initialize(mapload) . = ..() From aec1db2b078ee9ed679ad5b619a8ab36fe6e4136 Mon Sep 17 00:00:00 2001 From: Iajret Date: Wed, 5 Mar 2025 22:38:29 +0300 Subject: [PATCH 08/14] Update security_first_aid.dm --- tff_modular/modules/security-rearm/code/security_first_aid.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tff_modular/modules/security-rearm/code/security_first_aid.dm b/tff_modular/modules/security-rearm/code/security_first_aid.dm index db7925a350d..5b7c64c87c3 100644 --- a/tff_modular/modules/security-rearm/code/security_first_aid.dm +++ b/tff_modular/modules/security-rearm/code/security_first_aid.dm @@ -64,7 +64,7 @@ . = ..() var/static/items_inside = list( /obj/item/stack/medical/gauze = 1, - /obj/item/reagent_containers/pill/robotic_patch/synth_repair = 2, + /obj/item/stack/medical/synth_repair = 2, /obj/item/stack/medical/wound_recovery/robofoam = 1, /obj/item/reagent_containers/hypospray/medipen/deforest/robot_system_cleaner = 1, /obj/item/reagent_containers/hypospray/medipen/deforest/coagulants = 1, From dfbb2d09ad35253daf0a20009943ebfadde5648e Mon Sep 17 00:00:00 2001 From: UEDCommander Date: Fri, 21 Mar 2025 08:47:10 +0300 Subject: [PATCH 09/14] Fixed HOS outfit, put medkit back into backpack --- .../modules/security-rearm/code/outfit.dm | 32 +++++++++++++++---- .../security-rearm/code/security_first_aid.dm | 1 - 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/tff_modular/modules/security-rearm/code/outfit.dm b/tff_modular/modules/security-rearm/code/outfit.dm index f94110b5dbc..db1eb0b7547 100644 --- a/tff_modular/modules/security-rearm/code/outfit.dm +++ b/tff_modular/modules/security-rearm/code/outfit.dm @@ -12,29 +12,47 @@ backpack_contents = list( /obj/item/evidencebag = 1, /obj/item/choice_beacon/sec_officer = 1, + /obj/item/storage/pouch/medical/tac_security/loaded = 1, ) - r_pocket = /obj/item/storage/pouch/medical/tac_security/loaded /datum/outfit/job/security/synthetic - r_pocket = /obj/item/storage/pouch/medical/tac_security/synth/loaded + backpack_contents = list( + /obj/item/evidencebag = 1, + /obj/item/choice_beacon/sec_officer = 1, + /obj/item/storage/pouch/medical/tac_security/synth/loaded = 1, + ) /datum/job/security_officer synthetic_outfit = /datum/outfit/job/security/synthetic /datum/outfit/job/hos - r_pocket = /obj/item/storage/pouch/medical/tac_security/loaded + backpack_contents = list( + /obj/item/evidencebag = 1, + /obj/item/melee/baton/security/loaded/hos = 1, + /obj/item/storage/pouch/medical/tac_security/loaded = 1, + ) /datum/outfit/job/hos/synthetic - r_pocket = /obj/item/storage/pouch/medical/tac_security/synth/loaded + backpack_contents = list( + /obj/item/evidencebag = 1, + /obj/item/melee/baton/security/loaded/hos = 1, + /obj/item/storage/pouch/medical/tac_security/synth/loaded = 1, + ) -/datum/job/hos +/datum/job/head_of_security synthetic_outfit = /datum/outfit/job/hos/synthetic /datum/outfit/job/warden - r_pocket = /obj/item/storage/pouch/medical/tac_security/loaded + backpack_contents = list( + /obj/item/evidencebag = 1, + /obj/item/storage/pouch/medical/tac_security/loaded = 1, + ) /datum/outfit/job/warden/synthetic - r_pocket = /obj/item/storage/pouch/medical/tac_security/synth/loaded + backpack_contents = list( + /obj/item/evidencebag = 1, + /obj/item/storage/pouch/medical/tac_security/synth/loaded = 1, + ) /datum/job/warden synthetic_outfit = /datum/outfit/job/warden/synthetic diff --git a/tff_modular/modules/security-rearm/code/security_first_aid.dm b/tff_modular/modules/security-rearm/code/security_first_aid.dm index 412354fcd5d..5945b7d4afd 100644 --- a/tff_modular/modules/security-rearm/code/security_first_aid.dm +++ b/tff_modular/modules/security-rearm/code/security_first_aid.dm @@ -1,7 +1,6 @@ /obj/item/storage/pouch/medical/tac_security name = "security emergency medkit" desc = "Standard-issue medical kit issued to NanoTrasen security operatives. Contains first-aid supplies meant to keep an officer alive until proper medical staff can take over. Stored in a pocket pouch for ease of access." - w_class = WEIGHT_CLASS_BULKY icon = 'tff_modular/modules/security-rearm/icons/pouches.dmi' icon_state = "tac_security" From 6e3cb70752f053081e55847a430e69c3d2090f17 Mon Sep 17 00:00:00 2001 From: UEDCommander Date: Fri, 21 Mar 2025 10:12:03 +0300 Subject: [PATCH 10/14] Fixes for double-spawning loadout --- .../modules/security-rearm/code/outfit.dm | 52 +++++++------------ .../security-rearm/code/security_first_aid.dm | 1 + 2 files changed, 19 insertions(+), 34 deletions(-) diff --git a/tff_modular/modules/security-rearm/code/outfit.dm b/tff_modular/modules/security-rearm/code/outfit.dm index db1eb0b7547..25d15f46632 100644 --- a/tff_modular/modules/security-rearm/code/outfit.dm +++ b/tff_modular/modules/security-rearm/code/outfit.dm @@ -9,57 +9,41 @@ //Сами аутфиты /datum/outfit/job/security suit_store = null + l_pocket = /obj/item/storage/pouch/medical/tac_security/loaded backpack_contents = list( /obj/item/evidencebag = 1, /obj/item/choice_beacon/sec_officer = 1, - /obj/item/storage/pouch/medical/tac_security/loaded = 1, + /obj/item/restraints/handcuffs = 1, ) -/datum/outfit/job/security/synthetic +/datum/outfit/job/warden + l_pocket = /obj/item/storage/pouch/medical/tac_security/loaded backpack_contents = list( /obj/item/evidencebag = 1, - /obj/item/choice_beacon/sec_officer = 1, - /obj/item/storage/pouch/medical/tac_security/synth/loaded = 1, + /obj/item/restraints/handcuffs = 1, ) -/datum/job/security_officer - synthetic_outfit = /datum/outfit/job/security/synthetic - /datum/outfit/job/hos + l_pocket = /obj/item/storage/pouch/medical/tac_security/loaded backpack_contents = list( /obj/item/evidencebag = 1, /obj/item/melee/baton/security/loaded/hos = 1, - /obj/item/storage/pouch/medical/tac_security/loaded = 1, + /obj/item/restraints/handcuffs = 1, ) -/datum/outfit/job/hos/synthetic - backpack_contents = list( - /obj/item/evidencebag = 1, - /obj/item/melee/baton/security/loaded/hos = 1, - /obj/item/storage/pouch/medical/tac_security/synth/loaded = 1, - ) +/datum/outfit/synthetic + name = "Synthetic Crewmember Outfit" -/datum/job/head_of_security - synthetic_outfit = /datum/outfit/job/hos/synthetic +/datum/outfit/synthetic/security + name = "Synthetic Security Outfit" -/datum/outfit/job/warden - backpack_contents = list( - /obj/item/evidencebag = 1, - /obj/item/storage/pouch/medical/tac_security/loaded = 1, - ) + l_pocket = /obj/item/storage/pouch/medical/tac_security/synth/loaded -/datum/outfit/job/warden/synthetic - backpack_contents = list( - /obj/item/evidencebag = 1, - /obj/item/storage/pouch/medical/tac_security/synth/loaded = 1, - ) +/datum/job/security_officer + synthetic_outfit = /datum/outfit/synthetic/security -/datum/job/warden - synthetic_outfit = /datum/outfit/job/warden/synthetic +/datum/job/head_of_security + synthetic_outfit = /datum/outfit/synthetic/security -/datum/species/synthetic - outfit_override_registry = list( - /datum/outfit/job/security = /datum/outfit/job/security/synthetic, - /datum/outfit/job/warden = /datum/outfit/job/warden/synthetic, - /datum/outfit/job/hos = /datum/outfit/job/hos/synthetic, - ) +/datum/job/warden + synthetic_outfit = /datum/outfit/synthetic/security diff --git a/tff_modular/modules/security-rearm/code/security_first_aid.dm b/tff_modular/modules/security-rearm/code/security_first_aid.dm index e6642c66e9c..5b7c64c87c3 100644 --- a/tff_modular/modules/security-rearm/code/security_first_aid.dm +++ b/tff_modular/modules/security-rearm/code/security_first_aid.dm @@ -1,6 +1,7 @@ /obj/item/storage/pouch/medical/tac_security name = "security emergency medkit" desc = "Standard-issue medical kit issued to NanoTrasen security operatives. Contains first-aid supplies meant to keep an officer alive until proper medical staff can take over. Stored in a pocket pouch for ease of access." + w_class = WEIGHT_CLASS_BULKY icon = 'tff_modular/modules/security-rearm/icons/pouches.dmi' icon_state = "tac_security" var/static/list/pouch_holdables = list( From ab13666b30213467bfecbb43350e3eab5926b417 Mon Sep 17 00:00:00 2001 From: Iajret Date: Fri, 21 Mar 2025 16:37:40 +0300 Subject: [PATCH 11/14] Update security_first_aid.dm --- tff_modular/modules/security-rearm/code/security_first_aid.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tff_modular/modules/security-rearm/code/security_first_aid.dm b/tff_modular/modules/security-rearm/code/security_first_aid.dm index 5b7c64c87c3..3c31960758f 100644 --- a/tff_modular/modules/security-rearm/code/security_first_aid.dm +++ b/tff_modular/modules/security-rearm/code/security_first_aid.dm @@ -8,7 +8,7 @@ /obj/item/healthanalyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, - /obj/item/reagent_containers/pill, + /obj/item/reagent_containers/applicator, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/medigel, /obj/item/reagent_containers/spray, From 93a89b276955c3c18c5b52a2b0de64db3ebe61e1 Mon Sep 17 00:00:00 2001 From: Iajret Date: Mon, 24 Mar 2025 01:43:22 +0300 Subject: [PATCH 12/14] .dme moment --- tff_modular/modules/security_rearm/code/security_first_aid.dm | 2 +- tgstation.dme | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tff_modular/modules/security_rearm/code/security_first_aid.dm b/tff_modular/modules/security_rearm/code/security_first_aid.dm index 3c31960758f..5fcb03c9a2c 100644 --- a/tff_modular/modules/security_rearm/code/security_first_aid.dm +++ b/tff_modular/modules/security_rearm/code/security_first_aid.dm @@ -2,7 +2,7 @@ name = "security emergency medkit" desc = "Standard-issue medical kit issued to NanoTrasen security operatives. Contains first-aid supplies meant to keep an officer alive until proper medical staff can take over. Stored in a pocket pouch for ease of access." w_class = WEIGHT_CLASS_BULKY - icon = 'tff_modular/modules/security-rearm/icons/pouches.dmi' + icon = 'tff_modular/modules/security_rearm/icons/pouches.dmi' icon_state = "tac_security" var/static/list/pouch_holdables = list( /obj/item/healthanalyzer, diff --git a/tgstation.dme b/tgstation.dme index 3667c1e6a54..2923f5dff8d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9131,6 +9131,7 @@ #include "tff_modular\modules\security_rearm\code\outfit.dm" #include "tff_modular\modules\security_rearm\code\p213.dm" #include "tff_modular\modules\security_rearm\code\security_beacon.dm" +#include "tff_modular\modules\security_rearm\code\security_first_aid.dm" #include "tff_modular\modules\security_rearm\code\shotgun\ammobox.dm" #include "tff_modular\modules\security_rearm\code\shotgun\shotgunammo.dm" #include "tff_modular\modules\selestial_language\language.dm" From 1b8c3bf26ba08946de6506fde7638f12297ca39e Mon Sep 17 00:00:00 2001 From: UEDCommander Date: Mon, 7 Apr 2025 12:18:27 +0300 Subject: [PATCH 13/14] Fixes for synth outfits again --- .../modules/security-rearm/code/outfit.dm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tff_modular/modules/security-rearm/code/outfit.dm b/tff_modular/modules/security-rearm/code/outfit.dm index 25d15f46632..0d2b813e71f 100644 --- a/tff_modular/modules/security-rearm/code/outfit.dm +++ b/tff_modular/modules/security-rearm/code/outfit.dm @@ -38,12 +38,25 @@ name = "Synthetic Security Outfit" l_pocket = /obj/item/storage/pouch/medical/tac_security/synth/loaded + uniform = /obj/item/clothing/under/rank/security/officer + ears = /obj/item/radio/headset/headset_sec/alt + +/datum/outfit/synthetic/security/warden + name = "Synthetic Security Warden Outfit" + + uniform = /obj/item/clothing/under/rank/security/warden + +/datum/outfit/synthetic/security/hos + name = "Synthetic Security HoS Outfit" + + uniform = /obj/item/clothing/under/rank/security/head_of_security + ears = /obj/item/radio/headset/heads/hos/alt /datum/job/security_officer synthetic_outfit = /datum/outfit/synthetic/security /datum/job/head_of_security - synthetic_outfit = /datum/outfit/synthetic/security + synthetic_outfit = /datum/outfit/synthetic/security/hos /datum/job/warden - synthetic_outfit = /datum/outfit/synthetic/security + synthetic_outfit = /datum/outfit/synthetic/security/warden From 822afe81d42124df362ba1c75b22e460011cdec4 Mon Sep 17 00:00:00 2001 From: Iajret <8430839+Iajret@users.noreply.github.com> Date: Fri, 9 May 2025 12:12:11 +0300 Subject: [PATCH 14/14] spring storage update --- .../security_rearm/code/security_first_aid.dm | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tff_modular/modules/security_rearm/code/security_first_aid.dm b/tff_modular/modules/security_rearm/code/security_first_aid.dm index 5fcb03c9a2c..1f439d8f1c7 100644 --- a/tff_modular/modules/security_rearm/code/security_first_aid.dm +++ b/tff_modular/modules/security_rearm/code/security_first_aid.dm @@ -4,6 +4,13 @@ w_class = WEIGHT_CLASS_BULKY icon = 'tff_modular/modules/security_rearm/icons/pouches.dmi' icon_state = "tac_security" + storage_type = /datum/storage/pouch/medical/tac_sec + +/datum/storage/pouch/medical/tac_sec + max_specific_storage = WEIGHT_CLASS_SMALL + max_slots = 6 + max_total_storage = 12 + var/static/list/pouch_holdables = list( /obj/item/healthanalyzer, /obj/item/dnainjector, @@ -26,14 +33,9 @@ /obj/item/storage/wallet, ) - - -/obj/item/storage/pouch/medical/tac_security/Initialize(mapload) +/datum/storage/pouch/medical/tac_sec/New() . = ..() - atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL - atom_storage.max_slots = 6 - atom_storage.max_total_storage = 12 - atom_storage.set_holdable(pouch_holdables, pouch_unholdables) + set_holdable(pouch_holdables, pouch_unholdables) /obj/item/storage/pouch/medical/tac_security/loaded/Initialize(mapload) . = ..() @@ -51,20 +53,22 @@ name = "security maintenance kit" desc = "Standard-issue maintenance kit issued to NanoTrasen synthetic security operatives. Stored in a pocket pouch for ease of access." icon_state = "tac_security_synth" + storage_type = /datum/storage/pouch/medical/tac_sec/synth -/obj/item/storage/pouch/medical/tac_security/synth/Initialize(mapload) - . = ..() - var/static/list/synth_med_pouch_holdables = med_pouch_holdables + list( +/datum/storage/pouch/medical/tac_sec/synth + var/static/list/synth_pouch_holdables = list( /obj/item/stack/cable_coil, /obj/item/weldingtool, ) - atom_storage.set_holdable(synth_med_pouch_holdables) +/datum/storage/pouch/medical/tac_sec/synth/New() + . = ..() + set_holdable(pouch_holdables + synth_pouch_holdables, pouch_unholdables) /obj/item/storage/pouch/medical/tac_security/synth/loaded/Initialize(mapload) . = ..() var/static/items_inside = list( /obj/item/stack/medical/gauze = 1, - /obj/item/stack/medical/synth_repair = 2, + /obj/item/stack/medical/synth_repair = 1, /obj/item/stack/medical/wound_recovery/robofoam = 1, /obj/item/reagent_containers/hypospray/medipen/deforest/robot_system_cleaner = 1, /obj/item/reagent_containers/hypospray/medipen/deforest/coagulants = 1,