Skip to content

Commit

Permalink
Фича
Browse files Browse the repository at this point in the history
  • Loading branch information
SSensum committed Nov 1, 2023
1 parent 184201f commit 7a100b7
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 6 deletions.
4 changes: 1 addition & 3 deletions modular_skyrat/modules/blueshield/code/blueshield.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
job_flags = STATION_JOB_FLAGS | JOB_CANNOT_OPEN_SLOTS

/datum/outfit/job/blueshield
// FLUFFY FRONTIER COMMENT: Любое добавленное крысами тут оружие - вырезайте и переносите в /obj/item/choice_beacon/blueshield!
name = "Blueshield"
jobtype = /datum/job/blueshield
uniform = /obj/item/clothing/under/rank/blueshield
Expand All @@ -52,9 +53,6 @@
shoes = /obj/item/clothing/shoes/jackboots
ears = /obj/item/radio/headset/headset_bs/alt
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
// FLUFFY FRONTIER EDIT: ADDITION
suit_store = /obj/item/storage/belt/holster/energy/blueshield
// FLUFFY FRONTIER EDIT END.
implants = list(/obj/item/implant/mindshield)
backpack = /obj/item/storage/backpack/blueshield
satchel = /obj/item/storage/backpack/satchel/blueshield
Expand Down
10 changes: 7 additions & 3 deletions modular_skyrat/modules/blueshield/code/closet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@
/obj/structure/closet/secure_closet/blueshield/New()
..()
// FLUFFY FRONTIER EDIT: ADDITION
// Sometimes blueshields don't want to have tackler gloves,
// So i gave him same gloves, but without tackler ability.
// ВАЖНО!! ДАБЫ НЕ ПЕРЕНАСЫЩАТЬ БЩ ОРУЖИЕМ, ЛЮБЫЕ НОВЫЕ ПУШКИ СТОИТ ПЕРЕНОСИТЬ СЮДА:
// ПУТЬ ОБЪЕКТА: /obj/item/choice_beacon/blueshield
// ПУТЬ ДО ФАЙЛА: tff_modular/modules/blueshield-rearm/code/weapon_beacon.dm


// Выдал БЩ дополнительные перчатки, аналогичные их стандартным, просто без эффекта рывка.
new /obj/item/clothing/gloves/combat(src)
// FLUFFY FRONTIER EDIT END.
new /obj/item/storage/secure/briefcase(src)
Expand All @@ -34,6 +38,6 @@
new /obj/item/restraints/handcuffs(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/storage/medkit/tactical/blueshield(src)
new /obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/sindano(src)
// FF EDIT: DELETION. DELETED LINE: new /obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/sindano(src)
new /obj/item/storage/bag/garment/blueshield(src)
new /obj/item/mod/control/pre_equipped/blueshield(src)
32 changes: 32 additions & 0 deletions tff_modular/modules/blueshield-rearm/code/weapon_beacon.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/obj/item/choice_beacon/blueshield
name = "bodyguard weapon delivery beacon"
desc = "Weapon delivery beacon designed specially for picky Blueshield Agents."
icon_state = "gangtool-red"
w_class = WEIGHT_CLASS_TINY

/obj/item/choice_beacon/blueshield/generate_display_names()
var/static/list/blueshield_weapons
if(!blueshield_weapons)
blueshield_weapons = list()
var/list/possible_weapons = list(
// Пример для своего значения:
// путь_оружия = путь_набор_с_оружием,
// При такой записи в списке будет отображаться название оружия,
// а доставкой прилетит набор с оружием.
/obj/item/gun/energy/blueshield = /obj/item/storage/belt/holster/energy/blueshield,
/obj/item/gun/ballistic/automatic/sol_smg = /obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/sindano,
)
for(var/obj/item/weapon as anything in possible_weapons)
blueshield_weapons[initial(weapon.name)] = possible_weapons[weapon]

return blueshield_weapons

// ОЧЕНЬ костыльный, но всё же модульный способ впихнуть это в сумку

/datum/outfit/job/blueshield/pre_equip(mob/living/carbon/human/H, visualsOnly)
if(!backpack_contents)
backpack_contents = list()
if(!(/obj/item/choice_beacon/blueshield in backpack_contents))
backpack_contents += /obj/item/choice_beacon/blueshield
. = ..()

1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7859,6 +7859,7 @@
#include "tff_modular\modules\blueshield-rearm\code\holster.dm"
#include "tff_modular\modules\blueshield-rearm\code\projectiles.dm"
#include "tff_modular\modules\blueshield-rearm\code\revolver.dm"
#include "tff_modular\modules\blueshield-rearm\code\weapon_beacon.dm"
#include "tff_modular\modules\clothing\suit\suit.dm"
#include "tff_modular\modules\cqd_holsters\code\holster.dm"
#include "tff_modular\modules\cqd_holsters\code\holster_injections.dm"
Expand Down

0 comments on commit 7a100b7

Please sign in to comment.