mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 20:48:56 +01:00
Split security gloves from black gloves, gave sprites to those and tackling gloves, moves tackling to right-click (#84909)
## About The Pull Request Added security gloves, which have the fast cuff trait. Normal black gloves no longer have them. Adds sprites for security and tackling gloves, moves tackling to right-click! Also added blue security gloves for the blue sec PR. Whoever merges it first will, assumedly, add it then. Sprites here:  Moved tackling to right click. ## Why It's Good For The Game > Added security gloves, which have the fast cuff trait. Normal black gloves no longer have them. Didn't make any sense that normie gloves had these. It was an undocumented feature! Why can jannies fast cuff! > Adds sprites for security and tackling gloves, moves tackling to right-click! Really smells that these don't have sprites so I quickly slapped some up, edited from tackler and CE insuls. > Also added blue security gloves for the blue sec PR. Whoever merges it first will, assumedly, add it then. We can't have blue sec with red gloves!!! > Moved tackling to right click. It's so fuckin annoying to accidentally tackle when you're trying to throw something. It's the biggest thing that prevents me from putting on gloves. Now it'll rarely, if ever, be a problem: Pressing right click while thowing mode is on is unlikely to ever happen accidentally. ## Changelog 🆑 add: Added security gloves, which have the fast cuff trait. Normal black gloves no longer have them. imageadd: Adds sprites for security and tackling gloves, moves tackling to right-click! imageadd: Also added blue security gloves for the blue sec PR. Whoever merges it first will, assumedly, add it then. qol: Moved tackling to right click. /🆑
This commit is contained in:
@@ -312,7 +312,7 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items
|
||||
list(//equipment
|
||||
/obj/item/clothing/glasses/hud/security = 1,
|
||||
/obj/item/clothing/glasses/sunglasses = 1,
|
||||
/obj/item/clothing/gloves/color/black = 1,
|
||||
/obj/item/clothing/gloves/color/black/security = 1,
|
||||
/obj/item/clothing/gloves/color/yellow = 1,
|
||||
/obj/item/clothing/gloves/tackler/combat = 1,
|
||||
/obj/item/clothing/head/helmet/toggleable/justice = 1,
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
src.min_distance = min_distance
|
||||
|
||||
var/mob/P = parent
|
||||
to_chat(P, span_notice("You are now able to launch tackles! You can do so by activating throw mode, and clicking on your target with an empty hand."))
|
||||
to_chat(P, span_notice("You are now able to launch tackles! You can do so by activating throw mode, and ") + span_boldnotice("RIGHT-CLICKING on your target with an empty hand."))
|
||||
|
||||
addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE)
|
||||
|
||||
@@ -74,6 +74,9 @@
|
||||
if(modifiers[ALT_CLICK] || modifiers[SHIFT_CLICK] || modifiers[CTRL_CLICK] || modifiers[MIDDLE_CLICK])
|
||||
return
|
||||
|
||||
if(!modifiers[RIGHT_CLICK])
|
||||
return
|
||||
|
||||
if(!user.throw_mode || user.get_active_held_item() || user.pulling || user.buckled || user.incapacitated())
|
||||
return
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
|
||||
DYE_QM = /obj/item/clothing/gloves/color/brown,
|
||||
DYE_CAPTAIN = /obj/item/clothing/gloves/captain,
|
||||
DYE_HOP = /obj/item/clothing/gloves/color/grey,
|
||||
DYE_HOS = /obj/item/clothing/gloves/color/black,
|
||||
DYE_HOS = /obj/item/clothing/gloves/color/black/security,
|
||||
DYE_CE = /obj/item/clothing/gloves/chief_engineer,
|
||||
DYE_RD = /obj/item/clothing/gloves/color/grey,
|
||||
DYE_CMO = /obj/item/clothing/gloves/latex/nitrile,
|
||||
|
||||
@@ -267,7 +267,7 @@
|
||||
|
||||
if(KIT_MR_FREEZE)
|
||||
new /obj/item/clothing/glasses/cold(src)
|
||||
new /obj/item/clothing/gloves/color/black(src)
|
||||
new /obj/item/clothing/gloves/color/black/security/blu(src)
|
||||
new /obj/item/clothing/mask/chameleon(src)
|
||||
new /obj/item/clothing/suit/hooded/wintercoat(src)
|
||||
new /obj/item/clothing/shoes/winterboots(src)
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
|
||||
resistance_flags = NONE
|
||||
cut_type = /obj/item/clothing/gloves/fingerless
|
||||
clothing_traits = list(TRAIT_FAST_CUFFING)
|
||||
|
||||
/obj/item/clothing/gloves/color/black/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -20,6 +19,15 @@
|
||||
slapcraft_recipes = slapcraft_recipe_list,\
|
||||
)
|
||||
|
||||
/obj/item/clothing/gloves/color/black/security
|
||||
name = "security gloves"
|
||||
desc = "These security gloves come with microchips that help the user quickly restrain suspects."
|
||||
icon_state = "sec"
|
||||
clothing_traits = list(TRAIT_FAST_CUFFING)
|
||||
|
||||
/obj/item/clothing/gloves/color/black/security/blu
|
||||
icon_state = "sec_blu"
|
||||
|
||||
/obj/item/clothing/gloves/fingerless
|
||||
name = "fingerless gloves"
|
||||
desc = "Plain black gloves without fingertips for the hard-working."
|
||||
|
||||
@@ -59,9 +59,8 @@
|
||||
/obj/item/clothing/gloves/tackler/combat
|
||||
name = "gorilla gloves"
|
||||
desc = "Premium quality combative gloves, heavily reinforced to give the user an edge in close combat tackles, though they are more taxing to use than normal gripper gloves. Fireproof to boot!"
|
||||
icon_state = "black"
|
||||
inhand_icon_state = "greyscale_gloves"
|
||||
greyscale_colors = "#2f2e31"
|
||||
icon_state = "gorilla"
|
||||
inhand_icon_state = null
|
||||
|
||||
tackle_stam_cost = 30
|
||||
base_knockdown = 1.25 SECONDS
|
||||
@@ -77,6 +76,7 @@
|
||||
/obj/item/clothing/gloves/tackler/combat/insulated
|
||||
name = "guerrilla gloves"
|
||||
desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks."
|
||||
icon_state = "guerrilla"
|
||||
siemens_coefficient = 0
|
||||
armor_type = /datum/armor/combat_insulated
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
desc = "Ratty looking fingerless gloves wrapped with sticky tape. Beware anyone wearing these, for they clearly have no shame and nothing to lose."
|
||||
icon_state = "fingerless"
|
||||
inhand_icon_state = null
|
||||
|
||||
clothing_traits = list(TRAIT_FINGERPRINT_PASSTHROUGH)
|
||||
tackle_stam_cost = 30
|
||||
base_knockdown = 1.75 SECONDS
|
||||
min_distance = 2
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
belt = /obj/item/modular_computer/pda/heads/hos
|
||||
ears = /obj/item/radio/headset/heads/hos/alt
|
||||
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
|
||||
gloves = /obj/item/clothing/gloves/color/black
|
||||
gloves = /obj/item/clothing/gloves/color/black/security
|
||||
head = /obj/item/clothing/head/hats/hos/beret
|
||||
shoes = /obj/item/clothing/shoes/jackboots/sec
|
||||
l_pocket = /obj/item/restraints/handcuffs
|
||||
|
||||
@@ -218,7 +218,7 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
|
||||
)
|
||||
belt = /obj/item/modular_computer/pda/security
|
||||
ears = /obj/item/radio/headset/headset_sec/alt
|
||||
gloves = /obj/item/clothing/gloves/color/black
|
||||
gloves = /obj/item/clothing/gloves/color/black/security
|
||||
head = /obj/item/clothing/head/helmet/sec
|
||||
shoes = /obj/item/clothing/shoes/jackboots/sec
|
||||
l_pocket = /obj/item/restraints/handcuffs
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
belt = /obj/item/modular_computer/pda/warden
|
||||
ears = /obj/item/radio/headset/headset_sec/alt
|
||||
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
|
||||
gloves = /obj/item/clothing/gloves/color/black
|
||||
gloves = /obj/item/clothing/gloves/color/black/security
|
||||
head = /obj/item/clothing/head/hats/warden/red
|
||||
shoes = /obj/item/clothing/shoes/jackboots/sec
|
||||
l_pocket = /obj/item/restraints/handcuffs
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
name = "Mafia Security Officer"
|
||||
|
||||
uniform = /obj/item/clothing/under/rank/security/officer
|
||||
gloves = /obj/item/clothing/gloves/color/black
|
||||
gloves = /obj/item/clothing/gloves/color/black/security
|
||||
head = /obj/item/clothing/head/helmet/sec
|
||||
suit = /obj/item/clothing/suit/armor/vest/alt
|
||||
shoes = /obj/item/clothing/shoes/jackboots
|
||||
@@ -116,7 +116,7 @@
|
||||
uniform = /obj/item/clothing/under/rank/security/head_of_security
|
||||
shoes = /obj/item/clothing/shoes/jackboots
|
||||
suit = /obj/item/clothing/suit/armor/hos/trenchcoat
|
||||
gloves = /obj/item/clothing/gloves/color/black
|
||||
gloves = /obj/item/clothing/gloves/color/black/security
|
||||
head = /obj/item/clothing/head/hats/hos/beret
|
||||
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
uniform = /obj/item/clothing/under/rank/security/warden
|
||||
shoes = /obj/item/clothing/shoes/jackboots
|
||||
suit = /obj/item/clothing/suit/armor/vest/warden/alt
|
||||
gloves = /obj/item/clothing/gloves/color/black
|
||||
gloves = /obj/item/clothing/gloves/color/black/security
|
||||
head = /obj/item/clothing/head/hats/warden/red
|
||||
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
|
||||
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
/obj/item/storage/belt/security/webbing = 5,
|
||||
/obj/item/coin/antagtoken = 1,
|
||||
/obj/item/clothing/head/helmet/blueshirt = 1,
|
||||
/obj/item/clothing/gloves/color/black/security/blu = 1,
|
||||
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
|
||||
/obj/item/grenade/stingbang = 1,
|
||||
/obj/item/watertank/pepperspray = 2,
|
||||
|
||||
@@ -50,10 +50,11 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
|
||||
/obj/item/clothing/under/rank/security/officer/grey = 3,
|
||||
/obj/item/clothing/under/pants/slacks = 3,
|
||||
/obj/item/clothing/under/rank/security/officer/blueshirt = 3,
|
||||
/obj/item/clothing/gloves/color/black/security/blu = 3,
|
||||
/obj/item/clothing/suit/armor/vest/secjacket = 3,
|
||||
/obj/item/clothing/suit/hooded/wintercoat/security = 3,
|
||||
/obj/item/clothing/suit/armor/vest = 3,
|
||||
/obj/item/clothing/gloves/color/black = 3,
|
||||
/obj/item/clothing/gloves/color/black/security = 3,
|
||||
/obj/item/clothing/shoes/jackboots/sec = 3,
|
||||
/obj/item/storage/backpack/security = 3,
|
||||
/obj/item/storage/backpack/satchel/sec = 3,
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 31 KiB |
Reference in New Issue
Block a user