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

Adds White Webbing and fixes dueling vest #2944

Closed
wants to merge 4 commits into from
Closed

Adds White Webbing and fixes dueling vest #2944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a3a7fe
White Webbing and Unathi fix
realforest2001 Mar 24, 2023
4abd504
Placement and icon_state fix
realforest2001 Mar 24, 2023
9ba582b
rebase
realforest2001 Apr 4, 2023
a8a53b4
Merge branch 'master' into forest/webbing
realforest2001 Apr 12, 2023
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
14 changes: 14 additions & 0 deletions code/modules/clothing/under/ties.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,11 @@
desc = "Worn brownish synthcotton vest with lots of pockets to unload your hands."
icon_state = "vest_brown"

/obj/item/clothing/accessory/storage/black_vest/white_vest
name = "white webbing vest"
desc = "Pristine white synthcotton vest with lots of pockets to unload your hands."
icon_state = "vest_white"

/obj/item/clothing/accessory/storage/black_vest/waistcoat
name = "tactical waistcoat"
desc = "A stylish black waistcoat with plenty of discreet pouches, to be both utilitarian and fashionable without compromising looks."
Expand Down Expand Up @@ -587,6 +592,14 @@
/obj/item/clothing/accessory/storage/surg_vest/blue/equipped
hold = /obj/item/storage/internal/accessory/surg_vest/equipped

/obj/item/clothing/accessory/storage/surg_vest/white
name = "white surgical webbing vest"
desc = "A pristine white synthcotton vest purpose-made for holding surgical tools."
icon_state = "vest_white"

/obj/item/clothing/accessory/storage/surg_vest/white/equipped
hold = /obj/item/storage/internal/accessory/surg_vest/equipped

/obj/item/clothing/accessory/storage/knifeharness
name = "M272 pattern knife vest"
desc = "An older generation M272 pattern knife vest once employed by the USCM. Can hold up to 5 knives. It is made of synthcotton."
Expand All @@ -613,6 +626,7 @@
/obj/item/storage/internal/accessory/knifeharness/duelling
storage_slots = 2
max_storage_space = 2
max_w_class = 3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there weight class defines

can_hold = list(
/obj/item/weapon/unathiknife,
)
Expand Down
Binary file modified icons/mob/humans/onmob/ties.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/ties.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/ties_overlay.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45133,6 +45133,7 @@
/area/almayer/lifeboat_pumps/south2)
"kFk" = (
/obj/structure/closet/secure_closet/commander,
/obj/item/clothing/accessory/storage/black_vest/white_vest,
/turf/open/floor/wood/ship,
/area/almayer/living/commandbunks)
"kFq" = (
Expand Down Expand Up @@ -69947,6 +69948,7 @@
/obj/structure/machinery/light{
dir = 1
},
/obj/item/clothing/accessory/storage/surg_vest/white,
/turf/open/floor/almayer{
dir = 1;
icon_state = "sterile_green_corner"
Expand Down