cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

THERE WILL BE BLOOD. SHED.

Browse Source
This commit is contained in:
Casey
2022-02-26 04:11:17 -05:00
committed by CHOMPStation2
parent 5595f511c6
commit 0eaeb0f368
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/structures/trash_pile_vr.dm
View File

@@ -24,7 +24,8 @@
/obj/item/weapon/gun/energy/netgun, /obj/item/weapon/gun/energy/netgun,
/obj/item/weapon/gun/projectile/pirate, /obj/item/weapon/gun/projectile/pirate,
/obj/item/clothing/accessory/permit/gun, /obj/item/clothing/accessory/permit/gun,
/obj/item/weapon/gun/projectile/dartgun /obj/item/weapon/gun/projectile/dartgun,
/obj/item/clothing/gloves/black/bloodletter
) )
var/global/list/allocated_gamma = list() var/global/list/allocated_gamma = list()

14
code/modules/clothing/gloves/miscellaneous_vr.dm
View File

@@ -34,7 +34,7 @@
heat_protection = HANDS heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/gloves/combat/knight/brown /obj/item/clothing/gloves/combat/knight/brown
desc = "ye olde armored gauntlets" desc = "ye olde armored gauntlets"
name = "knight gauntlets" name = "knight gauntlets"
@@ -54,13 +54,13 @@
heat_protection = HANDS heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/gloves/combat/knight_costume/brown /obj/item/clothing/gloves/combat/knight_costume/brown
desc = "ye olde armored gauntlets" desc = "ye olde armored gauntlets"
name = "knight gauntlets" name = "knight gauntlets"
icon_state = "brown" icon_state = "brown"
item_state = "brown" item_state = "brown"
/obj/item/clothing/gloves/heavy_engineer /obj/item/clothing/gloves/heavy_engineer
desc = "Elbow-length insulated gloves, with added reinforcement. They'll keep your fingers and forearms just that little bit safer from things that might try to melt, mangle, or burn them. A tag on the inside of each glove reads \'PROPERTY OF ENGINEERING, RETURN IF FOUND\'." desc = "Elbow-length insulated gloves, with added reinforcement. They'll keep your fingers and forearms just that little bit safer from things that might try to melt, mangle, or burn them. A tag on the inside of each glove reads \'PROPERTY OF ENGINEERING, RETURN IF FOUND\'."
name = "heavy-duty engineering gloves" name = "heavy-duty engineering gloves"
@@ -81,3 +81,11 @@
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HANDS heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
<<<<<<< HEAD
=======
/obj/item/clothing/gloves/black/bloodletter
desc = "A pair of ordinary looking black gloves. On closer examination, they seem somewhat well-made, with an almost metallic sheen to them."
description_fluff = "A prohibited concealed weapon, the Melee Grip Reinforcement system is the product of the military applications of nanotechnology. The striking face of the glove hardens in response to impact, producing monofilament blades from the knuckles to greatly enhance the wearer's close-combat lethality."
special_attack_type = /datum/unarmed_attack/hardclaws
>>>>>>> 0a41e6fed8f... Merge pull request #12330 from Screemonster/YoushouldtryfightingforwhatyoubelieveinsometimeJack