Skip to content

Commit

Permalink
aki_zapros (BlueMoon-Labs#1364)
Browse files Browse the repository at this point in the history
Запрос от акинайта.
  • Loading branch information
Oni328 authored Nov 4, 2024
1 parent 24f1066 commit 4902a5a
Show file tree
Hide file tree
Showing 18 changed files with 202 additions and 4 deletions.
Binary file modified icons/obj/clothing/belt_overlays.dmi
Binary file not shown.
40 changes: 40 additions & 0 deletions modular_bluemoon/fluffs/code/accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@
icon_state = "dogtag"
item_state = "dogtag"

////////////////////////

/obj/item/clothing/neck/tie/dread_neck
name = "Наплечники судьи"
desc = "Довольно большой полу-жилет что крепится на тонкую ткань, на плечах большие и довольно массивные словно отлитые из золота регалии, где на правом плече красовался Орёл, и на втором уже простое покрытие брусками, и на левой стороне передней части жилетки виднеется массивный значок с потертым именем Дредд что кажется вам знакомым. Одевая эти регалии вас переполняет чуство груза за решения что вы принимаете вынося вердикт."
Expand Down Expand Up @@ -145,3 +147,41 @@
icon = 'icons/obj/clothing/uniforms.dmi'
mob_overlay_icon = 'icons/mob/clothing/uniform_digi.dmi'
taur_mob_worn_overlay = 'modular_sand/icons/mob/suits_taur.dmi'

///////////////////////////

/obj/item/storage/belt/scabbard
name = "Scabbard for a officer's cleaver"
desc = "The special scabbard is well suited for the officer's cleaver issued to high-ranking Adler officers and their officials. You could call it superfluous, it is made of the skin of some rare creature and perhaps even intelligent, the scabbard itself is attached to the belt in the belt area at the back for the convenience of sharply removing the blade and striking, which is taught to officers when they learn how to use this specialized cleaver. For ordinary people, they are inconvenient and difficult to use."
icon = 'modular_bluemoon/fluffs/icons/obj/clothing/belts.dmi'
mob_overlay_icon = 'modular_bluemoon/fluffs/icons/mob/clothing/belts.dmi'
icon_state = "scabbard"
item_state = "scabbard"
w_class = WEIGHT_CLASS_BULKY
content_overlays = TRUE
onmob_overlays = TRUE
var/list/fitting_swords = list(/obj/item/melee/sabre/cleaver)

/obj/item/storage/belt/scabbard/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 1
STR.rustle_sound = FALSE
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.can_hold = typecacheof(fitting_swords)
STR.quickdraw = TRUE

/obj/item/storage/belt/scabbard/examine(mob/user)
. = ..()
if(length(contents))
. += "<span class='notice'>Alt-click it to quickly draw the blade.</span>"

////////////////////////

/obj/item/clothing/neck/tie/shoulder_coat
name = "Officer's shoulder coat"
desc = "The officer's raincoat is also usually worn by Adler's officers as an additional identification mark, it is made of nanofibers of light fabric, it is usually given to officers who have passed advanced training and have at least the second rank in the hierarchy of officers. For officials and senior officers, it is usually not used since their rank is much higher. But for tactical designation in the officer corps, it is necessary to wear. Even a second-rank officer can already give full orders to a first-rank officer, despite the small gap in ranks. White stripes can also be applied to the cloak as a rank identifier, but this practice is usually used only in regular forces."
icon = 'modular_bluemoon/fluffs/icons/obj/clothing/accessories.dmi'
mob_overlay_icon = 'modular_bluemoon/fluffs/icons/mob/clothing/accessories.dmi'
icon_state = "shoulder_coat"
item_state = "shoulder_coat"
83 changes: 79 additions & 4 deletions modular_bluemoon/fluffs/code/donator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@
name = "Acrador kit"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/storage/box/acrador_kit
ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius", "trora", "siamant", "mihana964")
ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius", "trora", "siamant", "mihana964", "wangig")
subcategory = LOADOUT_SUBCATEGORIES_DON02

/datum/gear/donator/bm/goal
Expand All @@ -790,7 +790,7 @@
name = "R-HSA-12"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/clothing/head/helmet/sec/rhsa12
ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius", "trora", "siamant", "mihana964")
ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius", "trora", "siamant", "mihana964", "wangig")
subcategory = LOADOUT_SUBCATEGORIES_DON02
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")
Expand All @@ -799,7 +799,7 @@
name = "R-SA-12"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/clothing/suit/armor/rsa12
ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius", "trora", "siamant", "mihana964")
ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius", "trora", "siamant", "mihana964", "wangig")
subcategory = LOADOUT_SUBCATEGORIES_DON02
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")
Expand All @@ -808,7 +808,7 @@
name = "Underarmor suit"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/clothing/under/rank/security/officer/acradorsuit
ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius", "trora", "siamant", "mihana964")
ckeywhitelist = list("someoldvg", "enigma418", "flippingtable", "allazarius", "trora", "siamant", "mihana964", "wangig")
subcategory = LOADOUT_SUBCATEGORIES_DON02
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")
Expand Down Expand Up @@ -959,3 +959,78 @@
path = /obj/item/modkit/dreadmk3_kit
ckeywhitelist = list("stasdvrz", "mrsko", "akinight")
subcategory = LOADOUT_SUBCATEGORIES_DON02

/datum/gear/donator/bm/dedication_kit
name = "Dedication kit"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/modkit/dedication_kit
ckeywhitelist = list("akinight")
subcategory = LOADOUT_SUBCATEGORIES_DON02

/datum/gear/donator/bm/cleaver_kit
name = "Cleaver kit"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/modkit/cleaver_kit
ckeywhitelist = list("akinight")
subcategory = LOADOUT_SUBCATEGORIES_DON02

/datum/gear/donator/bm/scabbard
name = "Scabbard belt"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/storage/belt/scabbard
ckeywhitelist = list("akinight")
subcategory = LOADOUT_SUBCATEGORIES_DON02
restricted_desc = "Captain"
restricted_roles = list("Captain")

/datum/gear/donator/bm/shoulder_coat
name = "Shoulder coat"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/clothing/neck/tie/shoulder_coat
ckeywhitelist = list("akinight")
subcategory = LOADOUT_SUBCATEGORIES_DON02

/datum/gear/donator/bm/renegat
name = "Renegat armor"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/clothing/suit/armor/renegat
ckeywhitelist = list("akinight")
subcategory = LOADOUT_SUBCATEGORIES_DON02
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")

/datum/gear/donator/bm/renegat_helmet
name = "Renegat helmet"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/clothing/head/helmet/sec/renegat
ckeywhitelist = list("akinight")
subcategory = LOADOUT_SUBCATEGORIES_DON02
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")

/datum/gear/donator/bm/armor_shield
name = "Shield armor"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/clothing/suit/armor/armor_shield
ckeywhitelist = list("akinight")
subcategory = LOADOUT_SUBCATEGORIES_DON02
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")

/datum/gear/donator/bm/helmet_shield
name = "Shield helmet"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/clothing/head/helmet/sec/helmet_shield
ckeywhitelist = list("akinight")
subcategory = LOADOUT_SUBCATEGORIES_DON02
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")

/datum/gear/donator/bm/adler_skull
name = "Skull helmet"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/clothing/head/helmet/sec/adler_skull
ckeywhitelist = list("akinight")
subcategory = LOADOUT_SUBCATEGORIES_DON02
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")
35 changes: 35 additions & 0 deletions modular_bluemoon/fluffs/code/guns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -730,3 +730,38 @@
desc = "A modkit for making a Heavy crowbar into Heavy pocket hammer."
product = /obj/item/crowbar/large/heavy/hammercrowbar
fromitem = list(/obj/item/crowbar/large/heavy)

////////////////////////////////////////////////////////////////////////////////////////

/obj/item/modkit/dedication_kit
name = "Magnetic Pistol Dedication Kit"
desc = "A modkit for making an Enforcer into a Magnetic Pistol Dedication."
product = /obj/item/gun/ballistic/automatic/pistol/enforcer/dedication
fromitem = list(/obj/item/gun/ballistic/automatic/pistol/enforcer/nomag, /obj/item/gun/ballistic/automatic/pistol/enforcer, /obj/item/gun/ballistic/automatic/pistol/enforcerred, /obj/item/gun/ballistic/automatic/pistol/enforcergold)

/obj/item/gun/ballistic/automatic/pistol/enforcer/dedication
name = "\improper Magnetic Pistol Dedication"
desc = "A magnetic pistol used in all units of Adler's armed peacekeepers. It is mass-produced by the Adler military-industrial complex and has already entered the space trade market. It includes several advantages, for example, an identifier built into the handle, which transmits the remaining ammunition to the interface of the helmet or glasses, which allows better control of the weapon, as well as an integrated sight, which, however, is effective only at close ranges. He usually has a badge corresponding to his military rank, but this one doesn't seem to have any identification marks on it. Most often, because the owner belongs to Adler's foreign armed formations, which are not controlled by the general directorate of corporate officials. For example, he is assigned to a high-ranking officer."
icon = 'modular_bluemoon/fluffs/icons/obj/guns.dmi'
icon_state = "dedication"

////////////////////////////////////////////////////////////////////////////////////////

/obj/item/modkit/cleaver_kit
name = "Light Officer's Cleaver Kit"
desc = "A modkit for making an Enforcer into a Light Officer's Cleaver."
product = /obj/item/melee/sabre/cleaver
fromitem = list(/obj/item/melee/sabre)

/obj/item/melee/sabre/cleaver
name = "\improper Light Officer's Cleaver"
desc = "The blade is made of nanoalloys, sharpened with a high-precision laser, a handle with a winding made of special synthetic leather and, of course, an engraving on the blade corresponding to a personal identification code. This is a weapon of the composition of corporate officials and high-ranking military officers of Adler, in order to earn it, each officer must go a long way in the hierarchy or earn high trust from the highest ranks of Adler. There are only 10,000 such swords produced."
icon = 'modular_bluemoon/fluffs/icons/obj/guns.dmi'
lefthand_file = 'modular_bluemoon/fluffs/icons/mob/guns_left.dmi'
righthand_file = 'modular_bluemoon/fluffs/icons/mob/guns_right.dmi'
icon_state = "cleaver"

/obj/item/melee/sabre/cleaver/get_belt_overlay()
if(istype(loc, /obj/item/storage/belt/scabbard))
return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "cleaver")
return ..()
48 changes: 48 additions & 0 deletions modular_bluemoon/fluffs/code/suit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -217,3 +217,51 @@
item_state = "dread_armor"
icon = 'modular_bluemoon/fluffs/icons/obj/clothing/suit.dmi'
mob_overlay_icon = 'modular_bluemoon/fluffs/icons/mob/clothing/suit.dmi'

/obj/item/clothing/suit/armor/renegat
name = "Peacekeeper Officer's Armor Renegat"
desc = "The armor of the Adler peacekeepers. There are several patches indicating rank, it looks like it's a uniform for commanders. It is produced by the Adler Military-Industrial complex of the same name. It seems that it can only be worn by high-ranking officials and it is marked with an appropriate alphanumeric code."
icon = 'modular_bluemoon/fluffs/icons/obj/clothing/suit.dmi'
mob_overlay_icon = 'modular_bluemoon/fluffs/icons/mob/clothing/suit.dmi'
lefthand_file = 'modular_bluemoon/fluffs/icons/mob/inhands/clothing_left.dmi'
righthand_file = 'modular_bluemoon/fluffs/icons/mob/inhands/clothing_right.dmi'
icon_state = "renegat"
item_state = "renegat"
blood_overlay_type = "armor"
body_parts_covered = CHEST
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON

/obj/item/clothing/head/helmet/sec/renegat
name = "Peacekeeper Officer's Helmet Renegat"
desc = "The helmet of the Adler peacekeepers. There are several patches indicating rank, it looks like it's a uniform for commanders. It is produced by the Adler Military-Industrial complex of the same name. It seems that it can only be worn by high-ranking officials, it looks like it has a special friend-foe identification interface built into it."
icon = 'modular_bluemoon/fluffs/icons/obj/clothing/hats.dmi'
mob_overlay_icon = 'modular_bluemoon/fluffs/icons/mob/clothing/hats.dmi'
icon_state = "renegat"
item_state = "renegat"

/obj/item/clothing/suit/armor/armor_shield
name = "Heavy Peacekeeper Armor Shield"
desc = "The heavy armored suit of the Adler peacekeepers. It is more durable than the regular version, the identification code is indicated under one of the plates on the armor, each plate seems to be designed to reflect the impact, signaling the force on several accompanying plates, reducing the force of impact and damage inflicted. The armor fits well on the body, but it is relatively heavy for an ordinary person, wearing it without implants and training does not seem to be the best option. The Adler encoding on the armor also makes it easier for their owners to identify them using the same access code and poses a danger to opponents and looters."
icon = 'modular_bluemoon/fluffs/icons/obj/clothing/suit.dmi'
mob_overlay_icon = 'modular_bluemoon/fluffs/icons/mob/clothing/suit.dmi'
icon_state = "shield"
item_state = "shield"
blood_overlay_type = "armor"
body_parts_covered = CHEST
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON

/obj/item/clothing/head/helmet/sec/helmet_shield
name = "Heavy Peacekeeper Helmet Shield"
desc = "The heavy, armored helmet of Adler's Peacekeepers. It seems to be adapted for long and complex operations, inside there is a soft lining under the armor, outside there are durable plates and a friend-foe identification system. Additional plates are located on the front to protect the head."
icon = 'modular_bluemoon/fluffs/icons/obj/clothing/hats.dmi'
mob_overlay_icon = 'modular_bluemoon/fluffs/icons/mob/clothing/hats.dmi'
icon_state = "shield"
item_state = "shield"

/obj/item/clothing/head/helmet/sec/adler_skull
name = "Tactical Skull Helmet"
desc = "The tactical helmet of desert hunters from the Russian Empire planet Tyrana-1, a lightweight helmet for action in hot conditions, relatively protects against sandstorms, bullets and monster strikes, but slightly narrows the view. It seems that this option is more like an anthropomorphic, but it is also suitable for an ordinary person. Usually the hunters themselves scratch their initials on them, but this one is not marked in any way."
icon = 'modular_bluemoon/fluffs/icons/obj/clothing/hats.dmi'
mob_overlay_icon = 'modular_bluemoon/fluffs/icons/mob/clothing/hats.dmi'
icon_state = "adler_skull"
item_state = "adler_skull"
Binary file modified modular_bluemoon/fluffs/icons/mob/clothing/accessories.dmi
Binary file not shown.
Binary file added modular_bluemoon/fluffs/icons/mob/clothing/belts.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/mob/clothing/hats.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/mob/guns_left.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/mob/guns_right.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/mob/inhands/clothing_left.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/mob/inhands/clothing_right.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/obj/clothing/accessories.dmi
Binary file not shown.
Binary file added modular_bluemoon/fluffs/icons/obj/clothing/belts.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/obj/clothing/suit.dmi
Binary file not shown.
Binary file modified modular_bluemoon/fluffs/icons/obj/guns.dmi
Binary file not shown.

0 comments on commit 4902a5a

Please sign in to comment.