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

Scrap helmet 2 #624

Closed
wants to merge 19 commits into from
Closed

Scrap helmet 2 #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f31dfed
Vox Scrap Helmet
Baneuus Sep 22, 2023
d76fc4e
Update onmob_head_vox.dmi
Baneuus Sep 30, 2023
4e5e84e
conflict
Baneuus Sep 30, 2023
5149f74
conflict 2
Baneuus Sep 30, 2023
4a88d50
conflict 3
Baneuus Sep 30, 2023
0f0ff63
conflict 4
Baneuus Sep 30, 2023
a1bf0ba
Conflict 5
Baneuus Sep 30, 2023
05d55f6
conflict 6
Baneuus Sep 30, 2023
a77784d
conflict 7
Baneuus Sep 30, 2023
d198471
conflict 8
Baneuus Sep 30, 2023
d35da82
conflict 9
Baneuus Sep 30, 2023
ee12236
conflict 10
Baneuus Sep 30, 2023
77e7ff2
Conflict 11
Baneuus Sep 30, 2023
aa73cad
The end?
Baneuus Sep 30, 2023
c642bb0
conflict 13
Baneuus Sep 30, 2023
21fef07
Merge branch 'master220' into ScrapHelmet
Baneuus Sep 30, 2023
3ea9b47
the end?
Baneuus Sep 30, 2023
e0b993b
Merge branch 'ScrapHelmet' of https://github.com/Baneuus/Baystation12…
Baneuus Sep 30, 2023
12bd75f
the end
Baneuus Sep 30, 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
2 changes: 1 addition & 1 deletion code/modules/clothing/head/helmet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,4 +247,4 @@
)
flags_inv = BLOCKHAIR
body_parts_covered = 0
siemens_coefficient = 0.9
siemens_coefficient = 0.9
25 changes: 24 additions & 1 deletion code/modules/clothing/suits/alien.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,27 @@

/obj/item/clothing/suit/armor/vox_scrap/New()
..()
slowdown_per_slot[slot_wear_suit] = 3
slowdown_per_slot[slot_wear_suit] = 2

/obj/item/clothing/head/helmet/vox_scrap
name = "rusted metal helmet"
desc = "A hodgepodge of various pieces of unknown heavy metal scrapped together into a rudimentary vox-shaped helmet."
icon = 'icons/obj/clothing/obj_head.dmi'
item_icons = list(slot_head_str = 'icons/mob/species/vox/onmob_head_vox.dmi')
icon_state = "vox_scrap"
armor = list(
melee = ARMOR_MELEE_VERY_HIGH,
bullet = ARMOR_BALLISTIC_RIFLE,
laser = ARMOR_LASER_MAJOR,
bomb = ARMOR_BOMB_PADDED
)
item_flags = ITEM_FLAG_THICKMATERIAL
flags_inv = HIDEEARS|BLOCKHEADHAIR
body_parts_covered = HEAD|FACE
species_restricted = list(SPECIES_VOX)
siemens_coefficient = 1
tint = 4

/obj/item/clothing/head/helmet/vox_scrap/New()
..()
slowdown_per_slot[slot_head] = 0.7
Binary file modified icons/mob/species/vox/head.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/species/vox/onmob_head_vox.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/obj_head.dmi
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions maps/away/voxship/voxship-2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,11 @@
/obj/item/clothing/suit/armor/vox_scrap,
/obj/item/clothing/suit/armor/vox_scrap,
/obj/item/clothing/suit/armor/vox_scrap,
/obj/item/clothing/head/helmet/vox_scrap,
/obj/item/clothing/head/helmet/vox_scrap,
/obj/item/clothing/head/helmet/vox_scrap,
/obj/item/clothing/head/helmet/vox_scrap,
/obj/item/clothing/head/helmet/vox_scrap,
/obj/item/clothing/under/vox/vox_casual,
/obj/item/clothing/under/vox/vox_casual,
/obj/item/clothing/under/vox/vox_casual,
Expand Down