Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Updates the "Slim" belt reskin and code cleanup of no longer used "peacekeeper" belts #1725

Merged
merged 1 commit into from
Jan 31, 2024
Merged

[MIRROR] Updates the "Slim" belt reskin and code cleanup of no longer used "peacekeeper" belts #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 0 additions & 17 deletions code/game/objects/items/storage/belt.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,23 +354,6 @@
inhand_icon_state = "security"//Could likely use a better one.
worn_icon_state = "security"
content_overlays = TRUE
// NOVA EDIT ADDITION START
uses_advanced_reskins = TRUE
unique_reskin = list(
"Basic Security" = list(
RESKIN_ICON = 'icons/obj/clothing/belts.dmi',
RESKIN_ICON_STATE = "security",
RESKIN_WORN_ICON = 'icons/mob/clothing/belt.dmi',
RESKIN_WORN_ICON_STATE = "security"
),
"Peacekeeper" = list(
RESKIN_ICON = 'modular_nova/master_files/icons/obj/clothing/belts.dmi',
RESKIN_ICON_STATE = "peacekeeperbelt",
RESKIN_WORN_ICON = 'modular_nova/master_files/icons/mob/clothing/belt.dmi',
RESKIN_WORN_ICON_STATE = "peacekeeperbelt"
)
)
// NOVA EDIT ADDITION END

/obj/item/storage/belt/security/Initialize(mapload)
. = ..()
Expand Down
Binary file modified modular_nova/master_files/icons/mob/clothing/belt.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_nova/master_files/icons/obj/clothing/belts.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion modular_nova/modules/customization/modules/clothing/storage/belts.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
name = "storage pouch"
desc = span_notice("Click on this to open your belt's inventory!")
icon_state = "storage_pouch_icon"
worn_icon_state = "no_name" //Intentionally sets the worn icon to an error
worn_icon_state = "storage_pouch_icon"
w_class = WEIGHT_CLASS_BULKY //Still cant put it in your bags, its technically a belt
anchored = 1 //Dont want people taking it out with their hands

Expand Down
18 changes: 13 additions & 5 deletions modular_nova/modules/goofsec/code/sec_clothing_overrides.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,29 @@
RESKIN_ICON_STATE = "belt_white",
RESKIN_WORN_ICON_STATE = "belt_white"
),
"Slim Variant" = list(
RESKIN_ICON_STATE = "belt_slim",
RESKIN_WORN_ICON_STATE = "belt_slim"
"Basic Variant" = list(
RESKIN_ICON = 'icons/obj/clothing/belts.dmi',
RESKIN_ICON_STATE = "security",
RESKIN_WORN_ICON = 'icons/mob/clothing/belt.dmi',
RESKIN_WORN_ICON_STATE = "security"
),
)

/obj/item/storage/belt/security/webbing
icon = 'icons/obj/clothing/belts.dmi'
worn_icon = 'icons/mob/clothing/belt.dmi'
uses_advanced_reskins = FALSE
unique_reskin = NONE
current_skin = "securitywebbing" //Prevents reskinning

/obj/item/storage/belt/security/webbing/peacekeeper //did I mention this codebase is fucking awful
/obj/item/storage/belt/security/webbing/peacekeeper
icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
current_skin = "peacekeeper_webbing"

/obj/item/storage/belt/security/webbing/peacekeeper/armadyne
/obj/item/storage/belt/security/webbing/armadyne
icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
current_skin = "armadyne_webbing"

///Enables you to quickdraw weapons from security holsters
Expand Down
24 changes: 11 additions & 13 deletions modular_nova/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,21 @@
inhand_icon_state = "jackboots"
worn_icon_state = "armadyne_boots"


/obj/item/storage/belt/security/webbing/peacekeeper/armadyne
name = "armadyne webbing"
desc = "Unique and versatile chest rig, can hold security gear."
icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
icon_state = "armadyne_webbing"
worn_icon_state = "armadyne_webbing"

/obj/item/storage/belt/security/peacekeeper/armadyne
/obj/item/storage/belt/security/armadyne
name = "armadyne belt"
desc = "Can hold security gear like handcuffs and flashes. Has a holster for a gun."
icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
icon_state = "armadyne_belt"
worn_icon_state = "armadyne_belt"

/obj/item/storage/belt/security/webbing/armadyne
name = "armadyne webbing"
icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
icon_state = "armadyne_webbing"
worn_icon_state = "armadyne_webbing"

/datum/outfit/armadyne_rep
name = "Armadyne Corporate Representative"

Expand All @@ -102,7 +100,7 @@
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper/armadyne
suit = /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne
shoes = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne
belt = /obj/item/storage/belt/security/peacekeeper/armadyne
belt = /obj/item/storage/belt/security/armadyne
r_pocket = /obj/item/assembly/flash/handheld
backpack_contents = list(
/obj/item/melee/baton/telescopic,
Expand Down Expand Up @@ -149,7 +147,7 @@
suit = /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne/armor
suit_store = /obj/item/gun/ballistic/automatic/sol_rifle
shoes = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne
belt = /obj/item/storage/belt/security/webbing/peacekeeper/armadyne
belt = /obj/item/storage/belt/security/webbing/armadyne
backpack_contents = list(
/obj/item/storage/toolbox/guncase/nova/pistol/trappiste_small_case/wespe,
/obj/item/storage/box/handcuffs,
Expand All @@ -164,7 +162,7 @@

/datum/outfit/armadyne_security/high_alert
name = "Armadyne Corporate Security (High Alert)"
belt = /obj/item/storage/belt/security/webbing/peacekeeper/armadyne
belt = /obj/item/storage/belt/security/webbing/armadyne
suit_store = /obj/item/gun/ballistic/automatic/sol_rifle
backpack_contents = list(
/obj/item/melee/baton/telescopic,
Expand Down
73 changes: 1 addition & 72 deletions modular_nova/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,84 +177,13 @@
worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.dmi'
icon_state = "peacekeeper_gripper_gloves"

//PEACEKEEPER BELTS
/obj/item/storage/belt/security/peacekeeper
name = "peacekeeper belt"
desc = "This belt can hold security gear like handcuffs and flashes. It has a holster for a gun."
icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
icon_state = "peacekeeperbelt"
worn_icon_state = "peacekeeperbelt"
content_overlays = FALSE

/obj/item/storage/belt/security/peacekeeper/Initialize(mapload)
. = ..()
atom_storage.max_slots = 5
atom_storage.set_holdable(list(
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/gun/ballistic/revolver,
/obj/item/gun/energy/disabler,
/obj/item/melee/baton,
/obj/item/melee/baton,
/obj/item/grenade,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash/handheld,
/obj/item/clothing/glasses,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_box,
/obj/item/food/donut,
/obj/item/knife/combat,
/obj/item/flashlight/seclite,
/obj/item/melee/baton/telescopic,
/obj/item/radio,
/obj/item/clothing/gloves,
/obj/item/restraints/legcuffs/bola,
/obj/item/holosign_creator/security
))

/obj/item/storage/belt/security/peacekeeper/full/PopulateContents()
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/assembly/flash/handheld(src)
update_icon()

//PEACEKEEPER WEBBING
/obj/item/storage/belt/security/webbing/peacekeeper
name = "peacekeeper webbing"
desc = "A tactical chest rig issued to peacekeepers; slow is smooth, smooth is fast. Has a notable lack of a holster that fits energy-based weapons."
icon = 'modular_nova/master_files/icons/obj/clothing/belts.dmi'
worn_icon = 'modular_nova/master_files/icons/mob/clothing/belt.dmi'
icon_state = "peacekeeper_webbing"
worn_icon_state = "peacekeeper_webbing"
content_overlays = FALSE
custom_premium_price = PAYCHECK_CREW * 3

/obj/item/storage/belt/security/webbing/peacekeeper/Initialize(mapload)
. = ..()
atom_storage.max_slots = 7
atom_storage.set_holdable(list(
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/gun/ballistic/revolver,
/obj/item/melee/baton,
/obj/item/melee/baton,
/obj/item/grenade,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash/handheld,
/obj/item/clothing/glasses,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_box,
/obj/item/food/donut,
/obj/item/knife/combat,
/obj/item/flashlight/seclite,
/obj/item/melee/baton/telescopic,
/obj/item/radio,
/obj/item/clothing/gloves,
/obj/item/restraints/legcuffs/bola,
/obj/item/holosign_creator/security
))


//BOOTS
/obj/item/clothing/shoes/jackboots/peacekeeper
Expand Down
Loading