cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds Combat Gloves Plus for operatives at 5tc (#42250)

Browse Source 
* Combatgovesplus 1

* Combatglovesplus 2

* Combatglovesplus 3

* Combatglovesplus 4

* Combatglovesplus 5

* Combatglovesplus 6

* i have good england grammar I swaer

* fixed a slight english fucky wucky

* Allright done coiax

* I am probably retarded coiax not gonna lie

* you got me convinced GuyonBroadway
This commit is contained in:
Dangerous dingidy doo
2019-01-07 17:49:32 +01:00
committed by yogstation13-bot
parent 7d20f56a28
commit 10d58326ab
5 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/datums/martial/krav_maga.dm
View File

@@ -192,3 +192,18 @@
heat_protection = HANDS heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = NONE resistance_flags = NONE
/obj/item/clothing/gloves/krav_maga/combatglovesplus
name = "combat gloves plus"
desc = "These tactical gloves are fireproof and shock resistant, and using nanochip technology it teaches you the powers of krav maga."
icon_state = "black"
item_state = "blackglovesplus"
siemens_coefficient = 0
permeability_coefficient = 0.05
strip_delay = 80
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = NONE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)

1
code/game/gamemodes/clown_ops/clown_ops.dm
View File

@@ -56,5 +56,6 @@
/datum/outfit/syndicate/clownop/leader /datum/outfit/syndicate/clownop/leader
name = "Clown Operative Leader - Basic" name = "Clown Operative Leader - Basic"
id = /obj/item/card/id/syndicate/nuke_leader id = /obj/item/card/id/syndicate/nuke_leader
gloves = /obj/item/clothing/gloves/krav_maga/combatglovesplus
r_hand = /obj/item/nuclear_challenge/clownops r_hand = /obj/item/nuclear_challenge/clownops
command_radio = TRUE command_radio = TRUE

1
code/game/gamemodes/nuclear/nuclear.dm
View File

@@ -132,6 +132,7 @@
/datum/outfit/syndicate/leader /datum/outfit/syndicate/leader
name = "Syndicate Leader - Basic" name = "Syndicate Leader - Basic"
id = /obj/item/card/id/syndicate/nuke_leader id = /obj/item/card/id/syndicate/nuke_leader
gloves = /obj/item/clothing/gloves/krav_maga/combatglovesplus
r_hand = /obj/item/nuclear_challenge r_hand = /obj/item/nuclear_challenge
command_radio = TRUE command_radio = TRUE

1
code/modules/clothing/gloves/miscellaneous.dm
View File

@@ -40,7 +40,6 @@
resistance_flags = NONE resistance_flags = NONE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
/obj/item/clothing/gloves/bracer /obj/item/clothing/gloves/bracer
name = "bone bracers" name = "bone bracers"
desc = "For when you're expecting to get slapped on the wrist. Offers modest protection to your arms." desc = "For when you're expecting to get slapped on the wrist. Offers modest protection to your arms."

8
code/modules/uplink/uplink_items.dm
View File

@@ -1611,6 +1611,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
category = "(Pointless) Badassery" category = "(Pointless) Badassery"
surplus = 0 surplus = 0
/datum/uplink_item/badass/combatglovesplus
name = "Combat Gloves Plus"
desc = "A pair of gloves that are fireproof and shock resistant, however unlike the regular Combat Gloves this one uses nanotechnology \
to learn the abilities of krav maga to the wearer."
item = /obj/item/clothing/gloves/krav_maga/combatglovesplus
cost = 5
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/badass/costumes/obvious_chameleon /datum/uplink_item/badass/costumes/obvious_chameleon
name = "Broken Chameleon Kit" name = "Broken Chameleon Kit"
desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \ desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \