Skip to content

Commit

Permalink
Adds a loadout reskinned riot shield.
Browse files Browse the repository at this point in the history
Adds a shield to the loadout + beacons  that looks like a riot shield, with the same stats as the other loadout shields, for people that would prefer a slightly more modern take to protection compared to medieval stuff.
  • Loading branch information
RinPin committed Jun 22, 2023
1 parent c6cab66 commit f415c81
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 4 deletions.
8 changes: 5 additions & 3 deletions code/game/objects/items/loadout_beacons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2398,6 +2398,8 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
entry_class = LOADOUT_CAT_HOBO
spawn_thing = /obj/item/gun/ballistic/revolver/sling/staff




/datum/loadout_box/riotweathered
entry_tag = "Weathered Riot Shield"
entry_flags = LOADOUT_FLAG_WASTER
entry_class = LOADOUT_CAT_SHIELD
spawn_thing = /obj/item/shield/coyote/riotweathered
15 changes: 14 additions & 1 deletion code/game/objects/items/shields.dm
Original file line number Diff line number Diff line change
Expand Up @@ -873,4 +873,17 @@ The telescopic shields are legacy and don't fit, but the code might be of intere
resistance_flags = null



/obj/item/shield/coyote/riotweathered
name = "Weathered Riot Shield"
icon = 'icons/fallout/objects/melee/shields.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/shields_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/shields_righthand.dmi'
item_flags = ITEM_CAN_BLOCK | SLOWS_WHILE_IN_HAND
slowdown = 0
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
desc = "A heavily weathered riot shield that has seen much use, it seems to have been modified to be foldable for storage, at the cost of some protection."
icon_state = "shield_riot"
item_state = "shield_riot"
armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 0, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 40)
max_integrity = -1
resistance_flags = null
4 changes: 4 additions & 0 deletions modular_citadel/code/modules/client/loadout/hands.dm
Original file line number Diff line number Diff line change
Expand Up @@ -246,3 +246,7 @@
path = /obj/item/shield/coyote/pegasusshield
cost = 2

/datum/gear/hands/shield/riotweathered
name = "Weathered Riot Shield"
path = /obj/item/shield/coyote/riotweathered
cost = 2

0 comments on commit f415c81

Please sign in to comment.