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.

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] Adds floortile camouflage equipment as hidden cargo crate #2122

Merged
merged 1 commit into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 17 additions & 0 deletions code/modules/cargo/packs/imports.dm
Original file line number Diff line number Diff line change
Expand Up @@ -319,3 +319,20 @@
)
crate_name = "materials market crate"
crate_type = /obj/structure/closet/crate/cargo

/datum/supply_pack/imports/floortilecamo
name = "Floor-tile Camouflage Uniform"
desc = "Thank you for shopping from Camo-J's, our uniquely designed \
floor-tile 'NT SCUM' styled camouflage fatigues is the ultimate \
espionage uniform used by the very best. Providing the best \
flexibility, with our latest Camo-tech threads. Perfect for \
risky espionage hallway operations. Enjoy our product!"
hidden = TRUE
cost = CARGO_CRATE_VALUE * 6
contains = list(/obj/item/clothing/under/syndicate/floortilecamo = 4,
/obj/item/clothing/mask/floortilebalaclava = 4,
/obj/item/clothing/gloves/combat/floortile = 4,
/obj/item/clothing/shoes/jackboots/floortile = 4
)
crate_name = "floortile camouflauge crate"
crate_type = /obj/structure/closet/crate/secure/weapon
6 changes: 6 additions & 0 deletions code/modules/clothing/gloves/combat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,9 @@
icon_state = "wizard"
greyscale_colors = null
inhand_icon_state = null

/obj/item/clothing/gloves/combat/floortile
name = "floortile camouflage gloves"
desc = "Is it just me or is there a pair of gloves on the floor?"
icon_state = "ftc_gloves"
inhand_icon_state = "greyscale_gloves"
15 changes: 15 additions & 0 deletions code/modules/clothing/masks/boxing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,21 @@
/obj/item/clothing/mask/balaclava/attack_self(mob/user)
adjustmask(user)

/obj/item/clothing/mask/floortilebalaclava
name = "floortile balaclava"
desc = "The newest floortile camouflage balaclava used for hallway warfare. \
The best breathability, flexibility and comfort. Designed by Camo-J's."
icon_state = "floortile_balaclava"
inhand_icon_state = "balaclava"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
visor_flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT
alternate_worn_layer = LOW_FACEMASK_LAYER
w_class = WEIGHT_CLASS_SMALL
actions_types = list(/datum/action/item_action/adjust)

/obj/item/clothing/mask/floortilebalaclava/attack_self(mob/user)
adjustmask(user)

/obj/item/clothing/mask/luchador
name = "Luchador Mask"
desc = "Worn by robust fighters, flying high to defeat their foes!"
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/shoes/boots.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@
/obj/item/clothing/shoes/jackboots/sec
icon_state = "jackboots_sec"

/obj/item/clothing/shoes/jackboots/floortile
name = "floortile camouflage jackboots"
desc = "Is it just me or is there a pair of jackboots on the floor?"
icon_state = "ftc_boots"
inhand_icon_state = null

/obj/item/clothing/shoes/winterboots
name = "winter boots"
desc = "Boots lined with 'synthetic' animal fur."
Expand Down
9 changes: 9 additions & 0 deletions code/modules/clothing/under/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,15 @@
can_adjust = FALSE
supports_variations_flags = NONE

/obj/item/clothing/under/syndicate/floortilecamo
name = "floortile camouflage fatigues"
desc = "The newest floortile camouflage fatigues used for hallway warfare. \
The best breathability, flexibility and comfort. Designed by Camo-J's."
icon_state = "camofloortile"
inhand_icon_state = "gy_suit"
can_adjust = FALSE
supports_variations_flags = NONE

/obj/item/clothing/under/syndicate/soviet
name = "Ratnik 5 tracksuit"
desc = "Badly translated labels tell you to clean this in Vodka. Great for squatting in."
Expand Down
Binary file modified icons/mob/clothing/feet.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/hands.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/mask.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/under/syndicate.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/gloves.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/masks.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/shoes.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/syndicate.dmi
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions modular_nova/modules/Syndie_edits/code/syndie_edits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@
icon_state = "combat"
worn_icon_teshari = TESHARI_HANDS_ICON

// Remove the override for these subtypes
/obj/item/clothing/gloves/combat/floortile
icon = 'icons/obj/clothing/gloves.dmi'
worn_icon = null

/obj/item/clothing/gloves/combat/wizard
icon = 'icons/obj/clothing/gloves.dmi'
worn_icon = null
Expand Down
Loading