Skip to content

Commit

Permalink
Adds Sords For PGF (#3571)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
As title
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
It's fluff stuff for the PGF.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: Imaginos, Erika
add: The Pan Gezenan Federation has sent out shipments of boarding
cutlasses to the Frontier. Expect cool doohickeys on your friendly
neighborhood PGF Vessel
imageadd: Imaginos: PGF sord sprites
code: sabres now take up less space in code
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: Erika Fox <[email protected]>
  • Loading branch information
Erikafox and Erikafox authored Oct 21, 2024
1 parent 0be25e6 commit c152aae
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 63 deletions.
7 changes: 7 additions & 0 deletions code/game/objects/items/melee/sword.dm
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@
icon_state = "suns-swordstick"
item_state = "suns-swordstick"

/obj/item/melee/sword/sabre/pgf
name = "\improper boarding cutlass"
desc = "When beam and bullet puncture the hull, a trustworthy blade will carry you through the fight"
icon_state = "pgf-sabre"
block_chance = 30
force = 22

/obj/item/melee/sword/sabre/suns/telescopic
name = "telescopic sabre"
desc = "A telescopic and retractable blade given to SUNS peacekeepers for easy concealment and carry. It's design makes it slightly less effective than normal sabres sadly, however it is still excelent at piercing armor."
Expand Down
77 changes: 14 additions & 63 deletions code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,7 @@
item_state = "sheath"
base_icon_state = "sheath"
w_class = WEIGHT_CLASS_BULKY
var/sabre_type = /obj/item/melee/sword/sabre

/obj/item/storage/belt/sabre/ComponentInitialize()
. = ..()
Expand All @@ -760,7 +761,7 @@
STR.use_sound = null //if youre wondering why this is null, its so you can look in your sheath to prepare to draw, without letting anyone know youre preparing to draw it
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.set_holdable(list(
/obj/item/melee/sword/sabre
sabre_type
))

/obj/item/storage/belt/sabre/examine(mob/user)
Expand Down Expand Up @@ -788,7 +789,7 @@
return ..()

/obj/item/storage/belt/sabre/PopulateContents()
new /obj/item/melee/sword/sabre(src)
new sabre_type(src)
update_appearance()

/obj/item/storage/belt/sabre/solgov
Expand All @@ -798,21 +799,7 @@
icon_state = "sheath-solgov"
item_state = "sheath-solgov"
w_class = WEIGHT_CLASS_BULKY

/obj/item/storage/belt/sabre/solgov/ComponentInitialize()
AddComponent(component_type)
AddElement(/datum/element/update_icon_updates_onmob)
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 1
STR.use_sound = null
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.set_holdable(list(
/obj/item/melee/sword/sabre/solgov
))

/obj/item/storage/belt/sabre/solgov/PopulateContents()
new /obj/item/melee/sword/sabre/solgov(src)
update_appearance()
sabre_type = /obj/item/melee/sword/sabre/solgov

/obj/item/storage/belt/sabre/suns
name = "SUNS sabre sheath"
Expand All @@ -827,22 +814,7 @@
icon_state = "suns-sheath"
item_state = "suns-sheath"
w_class = WEIGHT_CLASS_BULKY

/obj/item/storage/belt/sabre/suns/ComponentInitialize()
AddComponent(component_type)
AddElement(/datum/element/update_icon_updates_onmob)
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 1
STR.use_sound = null
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.set_holdable(list(
/obj/item/melee/sword/sabre/suns
))

/obj/item/storage/belt/sabre/suns/PopulateContents()
new /obj/item/melee/sword/sabre/suns(src)
update_appearance()

sabre_type = /obj/item/melee/sword/sabre/suns

/obj/item/storage/belt/sabre/suns/captain
name = "SUNS captain's sabre sheath"
Expand All @@ -852,21 +824,7 @@
icon_state = "suns-capsheath"
item_state = "suns-capsheath"
w_class = WEIGHT_CLASS_BULKY

/obj/item/storage/belt/sabre/suns/captain/ComponentInitialize()
AddComponent(component_type)
AddElement(/datum/element/update_icon_updates_onmob)
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 1
STR.use_sound = null
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.set_holdable(list(
/obj/item/melee/sword/sabre/suns/captain
))

/obj/item/storage/belt/sabre/suns/captain/PopulateContents()
new /obj/item/melee/sword/sabre/suns/captain(src)
update_appearance()
sabre_type = /obj/item/melee/sword/sabre/suns/captain

/obj/item/storage/belt/sabre/suns/cmo
name = "SUNS cane sheath"
Expand All @@ -882,21 +840,14 @@
icon_state = "suns-cane"
item_state = "suns-cane"
w_class = WEIGHT_CLASS_BULKY

/obj/item/storage/belt/sabre/suns/cmo/ComponentInitialize()
AddComponent(component_type)
AddElement(/datum/element/update_icon_updates_onmob)
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 1
STR.use_sound = null
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.set_holdable(list(
/obj/item/melee/sword/sabre/suns/cmo
))

/obj/item/storage/belt/sabre/suns/cmo/PopulateContents()
new /obj/item/melee/sword/sabre/suns/cmo(src)
update_appearance()
sabre_type = /obj/item/melee/sword/sabre/suns/cmo

/obj/item/storage/belt/sabre/pgf
name = "cutlass sheath"
desc = "A mass produced thermoplastic-leather sheath made to hold a boarding cutlass."
base_icon_state = "sheath-pgf"
icon_state = "sheath-pgf"
item_state = "sheath-pgf"

/obj/item/storage/belt/security/webbing/inteq
name = "inteq webbing"
Expand Down
Binary file modified icons/obj/clothing/belts.dmi
Binary file not shown.
Binary file modified icons/obj/weapon/sword.dmi
Binary file not shown.

0 comments on commit c152aae

Please sign in to comment.