cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

attachable knuckledusters and force transfer

Browse Source
This commit is contained in:
Killian
2024-11-07 03:06:56 +00:00
parent 90497326d6
commit 9fff34e6ad
14 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/autolathe/arms.dm
+1 -1
View File
@@ -443,7 +443,7 @@
/datum/category_item/autolathe/arms/knuckledusters
name = "knuckle dusters"
path =/obj/item/clothing/gloves/knuckledusters
path =/obj/item/clothing/accessory/knuckledusters
hidden = 1
/datum/category_item/autolathe/arms/tacknife
code/game/objects/items/weapons/material/shards.dm
+1 -2
View File
@@ -65,8 +65,7 @@
var/light_glove_d = rand(2, 4)
var/no_glove_d = rand(4, 6)
var/list/forbidden_gloves = list(
/obj/item/clothing/gloves/sterile,
/obj/item/clothing/gloves/knuckledusters
/obj/item/clothing/gloves/sterile
)
if(src == user.l_hand)
code/game/objects/random/misc.dm
+1 -1
View File
@@ -263,7 +263,7 @@
prob(6);/obj/item/material/butterflyblade,
prob(6);/obj/item/material/butterflyhandle,
prob(2);/obj/item/material/butterfly/switchblade,
prob(2);/obj/item/clothing/gloves/knuckledusters,
prob(2);/obj/item/clothing/accessory/knuckledusters,
prob(1);/obj/item/material/knife/tacknife,
prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,
prob(1);/obj/item/beartrap,
code/game/objects/random/mob_vr.dm
+1 -1
View File
@@ -154,7 +154,7 @@
prob(4);/obj/item/storage/pill_bottle/zoom,
prob(4);/obj/item/material/butterfly,
prob(2);/obj/item/material/butterfly/switchblade,
prob(2);/obj/item/clothing/gloves/knuckledusters,
prob(2);/obj/item/clothing/accessory/knuckledusters,
prob(2);/obj/item/reagent_containers/syringe/drugs,
prob(1);/obj/item/material/knife/tacknife,
prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,
code/game/objects/structures/trash_pile_vr.dm
+1 -1
View File
@@ -292,7 +292,7 @@
prob(3);/obj/item/cracker,
prob(3);/obj/item/material/butterfly,
prob(3);/obj/item/material/butterfly/switchblade,
prob(3);/obj/item/clothing/gloves/knuckledusters,
prob(3);/obj/item/clothing/accessory/knuckledusters,
prob(3);/obj/item/clothing/gloves/heavy_engineer,
prob(3);/obj/item/reagent_containers/syringe/drugs,
prob(2);/obj/item/implanter/sizecontrol,
code/modules/clothing/accessories/accessory.dm
+9
View File
@@ -82,6 +82,11 @@
src.forceMove(S)
has_suit.add_overlay(get_inv_overlay())
has_suit.force += force
if(istype(S,/obj/item/clothing/gloves))
var/obj/item/clothing/gloves/has_gloves = S
has_gloves.punch_force += force
if(user)
to_chat(user, span_notice("You attach \the [src] to \the [has_suit]."))
add_fingerprint(user)
@@ -90,6 +95,10 @@
if(!has_suit)
return
has_suit.cut_overlay(get_inv_overlay())
has_suit.force = initial(has_suit.force)
if(istype(has_suit,/obj/item/clothing/gloves))
var/obj/item/clothing/gloves/has_gloves = has_suit
has_gloves.punch_force = initial(has_gloves.punch_force)
has_suit = null
if(user)
usr.put_in_hands(src)
code/modules/clothing/accessories/hands.dm
+13
View File
@@ -0,0 +1,13 @@
/obj/item/clothing/accessory/knuckledusters
name = "knuckle dusters"
desc = "A pair of brass knuckles. Generally used to enhance the user's punches."
icon_state = "knuckledusters"
slot = ACCESSORY_SLOT_RING
slot_flags = SLOT_GLOVES
matter = list(MAT_STEEL = 500)
attack_verb = list("punched", "beaten", "struck")
siemens_coefficient = 1
force = 5
icon = 'icons/inventory/hands/item.dmi'
drop_sound = 'sound/items/drop/metalboots.ogg'
pickup_sound = 'sound/items/pickup/toolbox.ogg'
code/modules/clothing/accessories/rings.dm
+2
View File
@@ -16,6 +16,8 @@
icon = 'icons/inventory/hands/item.dmi'
drop_sound = 'sound/items/drop/ring.ogg'
pickup_sound = 'sound/items/pickup/ring.ogg'
force = 2
siemens_coefficient = 1
/////////////////////////////////////////
//Standard Rings
code/modules/clothing/gloves/miscellaneous.dm
-15
View File
@@ -121,21 +121,6 @@
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
/obj/item/clothing/gloves/knuckledusters
name = "knuckle dusters"
desc = "A pair of brass knuckles. Generally used to enhance the user's punches."
icon_state = "knuckledusters"
matter = list(MAT_STEEL = 500)
attack_verb = list("punched", "beaten", "struck")
flags = THICKMATERIAL // Stops rings from increasing hit strength
siemens_coefficient = 1
fingerprint_chance = 100
overgloves = 1
force = 5
punch_force = 5
drop_sound = 'sound/items/drop/metalboots.ogg'
pickup_sound = 'sound/items/pickup/toolbox.ogg'
/obj/item/clothing/gloves/ranger
var/glovecolor = "white"
name = "ranger gloves"
maps/redgate/cybercity.dmm
+1 -1
View File
@@ -9085,7 +9085,7 @@
/turf/simulated/floor/tiled/white,
/area/redgate/city/supermarket)
"lXc" = (
/obj/item/clothing/gloves/knuckledusters,
/obj/item/clothing/accessory/knuckledusters,
/turf/simulated/floor/wood/alt/tile,
/area/redgate/city/fightclub)
"lXi" = (
maps/redgate/fantasy.dmm
+1 -1
View File
@@ -5126,7 +5126,7 @@
/area/redgate/fantasy/house)
"FQ" = (
/obj/structure/table/woodentable,
/obj/item/clothing/gloves/knuckledusters,
/obj/item/clothing/accessory/knuckledusters,
/turf/simulated/floor/wood/alt,
/area/redgate/fantasy/house)
"FS" = (
maps/submaps/admin_use_vr/kk_mercship.dmm
+2 -2
View File
@@ -9996,8 +9996,8 @@
/obj/machinery/recharger/wallcharger{
pixel_y = 20
},
/obj/item/clothing/gloves/knuckledusters,
/obj/item/clothing/gloves/knuckledusters,
/obj/item/clothing/accessory/knuckledusters,
/obj/item/clothing/accessory/knuckledusters,
/obj/item/flash,
/obj/item/flash,
/obj/item/laser_pointer/upgraded,
maps/submaps/depreciated_vr/mercbase.dmm
+5 -5
View File
@@ -2463,11 +2463,11 @@
},
/area/antag/antag_base)
"dM" = (
/obj/item/clothing/gloves/knuckledusters,
/obj/item/clothing/gloves/knuckledusters,
/obj/item/clothing/gloves/knuckledusters,
/obj/item/clothing/gloves/knuckledusters,
/obj/item/clothing/gloves/knuckledusters,
/obj/item/clothing/accessory/knuckledusters,
/obj/item/clothing/accessory/knuckledusters,
/obj/item/clothing/accessory/knuckledusters,
/obj/item/clothing/accessory/knuckledusters,
/obj/item/clothing/accessory/knuckledusters,
/obj/structure/table/steel,
/obj/effect/floor_decal/borderfloorblack{
dir = 6
vorestation.dme
+1
View File
@@ -2137,6 +2137,7 @@
#include "code\modules\clothing\accessories\badges_vr.dm"
#include "code\modules\clothing\accessories\clothing.dm"
#include "code\modules\clothing\accessories\clothing_vr.dm"
#include "code\modules\clothing\accessories\hands.dm"
#include "code\modules\clothing\accessories\holster.dm"
#include "code\modules\clothing\accessories\holster_vr.dm"
#include "code\modules\clothing\accessories\lockets.dm"