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

feat(custom items): adds KeepMan's custom item #10650

Merged
merged 5 commits into from
Oct 7, 2023
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
15 changes: 15 additions & 0 deletions code/game/objects/items/devices/modkit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,18 @@
parts[1] = 1
original[1] = /obj/item/gun/energy/gun
finished[1] = /obj/item/gun/energy/gun/nuclear

keepm4n marked this conversation as resolved.
Show resolved Hide resolved
/obj/item/device/modkit/assault_shield
name = "riot shield modkit"
desc = "A kit containing all the needed tools and parts to modify a riot shield into an assault shield."
icon_state = "modkit"

/obj/item/device/modkit/assault_shield/New()
..()
parts = new /list(1)
original = new /list(1)
finished = new /list(1)
parts[1] = 1
original[1] = /obj/item/shield/riot
finished[1] = /obj/item/shield/riot/assault

6 changes: 6 additions & 0 deletions code/game/objects/items/weapons/shields.dm
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@
else
..()

/obj/item/shield/riot/assault
name = "assault shield"
desc = "An assault composite shield, looks like one of the old Nova-Magnitka models."
icon_state = "assault"
item_state = "assault"

keepm4n marked this conversation as resolved.
Show resolved Hide resolved
/obj/item/shield/buckler
name = "buckler"
desc = "A wooden buckler used to block sharp things from entering your body back in the day.."
Expand Down
Binary file modified icons/inv_slots/back/mob.dmi
Binary file not shown.
Binary file modified icons/inv_slots/back/mob_fat.dmi
Binary file not shown.
Binary file modified icons/inv_slots/back/mob_slim.dmi
Binary file not shown.
Binary file modified icons/inv_slots/back/mob_slim_m.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/items/lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/items/lefthand_slim.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/items/righthand.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/items/righthand_slim.dmi
Binary file not shown.
Binary file modified icons/obj/weapons.dmi
Binary file not shown.