Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
50240fe
Stuff
UEDCommander Jan 29, 2025
cd9c68f
Medkit size tweak
UEDCommander Jan 29, 2025
f1c0806
More stuff
UEDCommander Feb 11, 2025
18cf7a7
Merge branch 'master' into security-first-aid
UEDCommander Feb 11, 2025
602c1ea
This should probably be there as well
UEDCommander Feb 12, 2025
03b77f6
Merge branch 'security-first-aid' of https://github.com/UEDCommander/…
UEDCommander Feb 12, 2025
4aa8704
Merge branch 'master' into security-first-aid
Iajret Feb 20, 2025
622ab3e
This is an actual war crime tbh
UEDCommander Feb 22, 2025
9608bfe
Merge branch 'security-first-aid' of https://github.com/UEDCommander/…
UEDCommander Feb 22, 2025
7259130
Forgot hos and warden
UEDCommander Feb 22, 2025
ec05b65
Fix bottles putting
FeenieRU Feb 23, 2025
045eb3b
Merge branch 'master' into pr/5352
Iajret Mar 5, 2025
aec1db2
Update security_first_aid.dm
Iajret Mar 5, 2025
dfbb2d0
Fixed HOS outfit, put medkit back into backpack
UEDCommander Mar 21, 2025
5a095a9
Merge branch 'security-first-aid' of https://github.com/UEDCommander/…
UEDCommander Mar 21, 2025
6e3cb70
Fixes for double-spawning loadout
UEDCommander Mar 21, 2025
0114987
Merge branch 'master' into pr/5352
Iajret Mar 21, 2025
ab13666
Update security_first_aid.dm
Iajret Mar 21, 2025
c071420
Merge branch 'security-first-aid' of https://github.com/UEDCommander/…
Iajret Mar 21, 2025
a394ef3
Merge branch 'master' into pr/5352
Iajret Mar 23, 2025
93a89b2
.dme moment
Iajret Mar 23, 2025
1b8c3bf
Fixes for synth outfits again
UEDCommander Apr 7, 2025
2c8c8a3
Merge branch 'security-first-aid' of https://github.com/UEDCommander/…
UEDCommander Apr 7, 2025
849c20a
Merge branch 'master' into pr/5352
Iajret May 9, 2025
c2267b9
Merge branch 'security-first-aid' of https://github.com/UEDCommander/…
Iajret May 9, 2025
822afe8
spring storage update
Iajret May 9, 2025
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
11 changes: 11 additions & 0 deletions tff_modular/modules/security_rearm/code/loadout.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/datum/loadout_item/pocket_items/synthetic_medkit
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_WARDEN, JOB_HEAD_OF_SECURITY)

/datum/loadout_item/pocket_items/medipen_pouch
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_WARDEN, JOB_HEAD_OF_SECURITY)
56 changes: 56 additions & 0 deletions tff_modular/modules/security_rearm/code/outfit.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,62 @@
/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
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/restraints/handcuffs = 1,
)

/datum/outfit/job/warden
l_pocket = /obj/item/storage/pouch/medical/tac_security/loaded
backpack_contents = list(
/obj/item/evidencebag = 1,
/obj/item/restraints/handcuffs = 1,
)

/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/restraints/handcuffs = 1,
)

/datum/outfit/synthetic
name = "Synthetic Crewmember Outfit"

/datum/outfit/synthetic/security
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/hos

/datum/job/warden
synthetic_outfit = /datum/outfit/synthetic/security/warden
76 changes: 76 additions & 0 deletions tff_modular/modules/security_rearm/code/security_first_aid.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/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"
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,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/applicator,
/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,
)

/datum/storage/pouch/medical/tac_sec/New()
. = ..()
set_holdable(pouch_holdables, pouch_unholdables)

/obj/item/storage/pouch/medical/tac_security/loaded/Initialize(mapload)
. = ..()
var/static/items_inside = list(
/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/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"
storage_type = /datum/storage/pouch/medical/tac_sec/synth

/datum/storage/pouch/medical/tac_sec/synth
var/static/list/synth_pouch_holdables = list(
/obj/item/stack/cable_coil,
/obj/item/weldingtool,
)
/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 = 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,
)
generate_items_inside(items_inside, src)
Binary file added tff_modular/modules/security_rearm/icons/pouches.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -9279,9 +9279,11 @@
#include "tff_modular\modules\redsec\code\cloth.dm"
#include "tff_modular\modules\redsec\code\vending.dm"
#include "tff_modular\modules\security_rearm\code\baton.dm"
#include "tff_modular\modules\security_rearm\code\loadout.dm"
#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"
Expand Down
Loading