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

Jump to bottom

marine helmets no longer spawn with squad optics. #4618

Closed
wants to merge 3 commits into from
Closed

marine helmets no longer spawn with squad optics. #4618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e006f1
Squad Optics no longer built into marine helmets
private-tristan Oct 9, 2023
4d018c0
adds to vendors
private-tristan Oct 9, 2023
9d04992
Update code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
private-tristan Oct 9, 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
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@
list("Rebreather", round(scale * 10), /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),

list("MISCELLANEOUS", -1, null, null, null),
list("Squad Optics", round(scale * 10), /obj/item/device/helmet_visor, VENDOR_ITEM_REGULAR),
list("Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles, VENDOR_ITEM_REGULAR),
list("M1A1 Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/v2, VENDOR_ITEM_REGULAR),
list("Prescription ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR),
Expand Down
16 changes: 6 additions & 10 deletions code/modules/clothing/head/helmet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
var/helmet_overlay_icon = 'icons/mob/humans/onmob/head_1.dmi'

///Any visors built into the helmet
var/list/built_in_visors = list(new /obj/item/device/helmet_visor)
var/list/built_in_visors = list()

///Any visors that have been added into the helmet
var/list/inserted_visors = list()
Expand Down Expand Up @@ -514,11 +514,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
inserted_visors = list()
to_chat(user, SPAN_NOTICE("You remove the inserted visors."))

var/datum/action/item_action/cycle_helmet_huds/cycle_action = locate() in actions
cycle_action.set_default_overlay()
if(!length(built_in_visors))
cycle_action.remove_from(user)

Comment on lines -517 to -521
Copy link
Contributor

Choose a reason for hiding this comment

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

?

return

..()
Expand Down Expand Up @@ -718,6 +713,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
icon_state = "tech_helmet"
specialty = "M10 technician"
built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/welding_visor)
built_in_visors = list(new /obj/item/device/helmet_visor/welding_visor)
Comment on lines 715 to +716
Copy link
Contributor

Choose a reason for hiding this comment

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

?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

must have accidentally copied that instead of removing helmet visor, oops.


/obj/item/clothing/head/helmet/marine/grey
desc = "A standard M10 Pattern Helmet. This one has not had a camouflage pattern applied to it yet. There is a built-in camera on the right side."
Expand Down Expand Up @@ -751,14 +747,14 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDETOPHAIR
specialty = "M50 tanker"
built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/welding_visor/tanker)
built_in_visors = list(new /obj/item/device/helmet_visor/welding_visor/tanker)

/obj/item/clothing/head/helmet/marine/medic
name = "\improper M10 corpsman helmet"
desc = "An M10 marine helmet version worn by marine hospital corpsmen. Has red cross painted on its front."
icon_state = "med_helmet"
specialty = "M10 pattern medic"
built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced)
built_in_visors = list(new /obj/item/device/helmet_visor/medical/advanced)
start_down_visor_type = /obj/item/device/helmet_visor/medical/advanced

/obj/item/clothing/head/helmet/marine/covert
Expand Down Expand Up @@ -901,7 +897,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
specialty = "M10 pattern captain"
flags_atom = NO_SNOW_TYPE
built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced, new /obj/item/device/helmet_visor/security)
built_in_visors = list(new /obj/item/device/helmet_visor/medical/advanced, new /obj/item/device/helmet_visor/security)

/obj/item/clothing/head/helmet/marine/MP
name = "\improper M10 pattern MP helmet"
Expand All @@ -925,7 +921,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
icon_state = "helmet"
item_state = "helmet"
specialty = "M10 pattern officer"
built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced)
built_in_visors = list(new /obj/item/device/helmet_visor/medical/advanced)

/obj/item/clothing/head/helmet/marine/mp/provost/marshal
name = "\improper Provost Marshal Cap"
Expand Down