Skip to content
Open
Show file tree
Hide file tree
Changes from 5 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
4 changes: 3 additions & 1 deletion code/modules/research/designs/weapon_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@
name = "Telescopic Riot Shield"
desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."
id = "tele_shield"
build_type = PROTOLATHE | AWAY_LATHE
//DOPPLER EDIT removes this design from any player accessible lathe in favor of a modularly added shield gauntlet
build_type = null //was: build_type = PROTOLATHE | AWAY_LATHE
//END DOPPLER EDIT
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2, /datum/material/silver =SMALL_MATERIAL_AMOUNT * 3, /datum/material/titanium =SMALL_MATERIAL_AMOUNT * 2)
build_path = /obj/item/shield/riot/tele
category = list(
Expand Down
3 changes: 3 additions & 0 deletions code/modules/research/techweb/nodes/security_nodes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
"ballistic_shield",
"handcuffs_s",
"bola_energy",
//DOPPLER ADDITION makes a new shield recipe accessible
"platillo",
//END DOPPLER ADDITION
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
announce_channels = list(RADIO_CHANNEL_SECURITY)
Expand Down
41 changes: 41 additions & 0 deletions modular_doppler/modular_cosmetics/code/hands/special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,44 @@
icon_state = "janitor_doppler"
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi'
inhand_icon_state = null


/*
* a gauntlet shield meant to replace the telescopic riot shield
*/

/obj/item/clothing/gloves/platillo //instead of being a backpack riot shield, it's a glove with much more modest block
name = "\improper PA-4N Platillo shield gauntlets" //"little plate"
desc = "An armored gauntlet augmented with a thick buckler of plastitanium, from which it takes its officially designated name 'platillo'. \
Meant primarily for melee combatants to wield two handed weapons without encumberance, the light coverage fares poorly under fire."
icon = 'modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi'
icon_state = "platillo"
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi'
worn_icon_state = "platillo"
armor_type = /datum/armor/platillo
block_chance = 25
block_sound = 'sound/items/weapons/block_shield.ogg'
body_parts_covered = HANDS | ARMS

/// we can't block when we hold a shield.

/obj/item/clothing/gloves/platillo/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text, final_block_chance, damage, attack_type, damage_type)
. = ..()
for(var/obj/item/shield/held_shield in owner.held_items) //since only a shield would block these gauntlets in theory
if(held_shield.block_chance > 0)
final_block_chance -= 25

/obj/item/clothing/gloves/platillo/examine_more(mob/user)
. = ..()
. += span_notice("It doesn't seem like it would do much good to wear this while holding another shield.")

/datum/armor/platillo
melee = ARMOR_LEVEL_MID
bullet = ARMOR_LEVEL_WEAK
laser = ARMOR_LEVEL_WEAK
energy = ARMOR_LEVEL_WEAK
bomb = ARMOR_LEVEL_WEAK
bio = ARMOR_LEVEL_TINY
fire = ARMOR_LEVEL_WEAK
acid = ARMOR_LEVEL_TINY
wound = WOUND_ARMOR_STANDARD
Binary file modified modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi
Binary file not shown.
21 changes: 21 additions & 0 deletions modular_doppler/modular_crafting/code/lathe_recipes.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* for lathe recipes that aren't part of the colony kit stuff
*/

/datum/design/platillo_gauntlets
name = "\improper PA-4N Platillo shield gauntlets"
desc = "An armored gauntlet augmented with a thick buckler of plastitanium, from which it takes its officially designated name 'platillo'. \
Meant primarily for melee combatants to wield two handed weapons without encumberance, the light coverage fares poorly under fire."
id = "platillo"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(
/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
/datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3,
/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 3,
)
build_path = /obj/item/clothing/gloves/platillo
category = list(
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_MELEE
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
autolathe_exportable = FALSE
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7197,6 +7197,7 @@
#include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_weapons.dm"
#include "modular_doppler\modular_crafting\code\crafting_extended.dm"
#include "modular_doppler\modular_crafting\code\crafting_melee.dm"
#include "modular_doppler\modular_crafting\code\lathe_recipes.dm"
#include "modular_doppler\modular_crafting\code\sheet_types.dm"
#include "modular_doppler\modular_crusher_ahabs_spear\code\trophies_misc.dm"
#include "modular_doppler\modular_customization\accessories\code\hair.dm"
Expand Down
Loading