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

sg harness name fix #268

Merged
merged 4 commits into from
Sep 6, 2024
Merged

sg harness name fix #268

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b07a7e
Update marine_armor.dm
AndroBetel May 23, 2024
e3683c6
Merge branch 'master' of https://github.com/cmss13-devs/cmss13-pve in…
AndroBetel Aug 24, 2024
cab542d
Update marine_armor.dm
AndroBetel Aug 24, 2024
35eaa3d
1
AndroBetel Aug 24, 2024
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
7 changes: 4 additions & 3 deletions code/modules/clothing/suits/marine_armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@
storage_slots = 2
slowdown = SLOWDOWN_ARMOR_LIGHT
flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS
flags_atom = NO_NAME_OVERRIDE
allowed = list(
/obj/item/tank/emergency_oxygen,
/obj/item/device/flashlight,
Expand All @@ -402,7 +403,7 @@

/obj/item/clothing/suit/storage/marine/smartgunner/Initialize()
. = ..()
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD] && name == "M56 combat harness")
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD] && name == "\improper M56 combat harness" && !(flags_atom & NO_SNOW_TYPE))
name = "M56 snow combat harness"

/obj/item/clothing/suit/storage/marine/smartgunner/mob_can_equip(mob/equipping_mob, slot, disable_warning = FALSE)
Expand Down Expand Up @@ -439,10 +440,10 @@
UnregisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP)

/obj/item/clothing/suit/storage/marine/smartgunner/standard
flags_atom = NO_SNOW_TYPE
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE

/obj/item/clothing/suit/storage/marine/smartgunner/black
flags_atom = NO_SNOW_TYPE
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
icon_state = "8fancy"

/obj/item/clothing/suit/storage/marine/smartgunner/upp
Expand Down
Loading