Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit a347276

Browse files
authored
Makes the kinetic javelin bulky, but can be stored on the back or belt slot (#22516)
1 parent bbf9c28 commit a347276

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

code/__DEFINES/inventory.dm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,4 +222,7 @@ GLOBAL_LIST_INIT(mining_allowed, typecacheof(list(
222222
/obj/item/gun/energy/kinetic_accelerator,
223223
/obj/item/pickaxe,
224224
/obj/item/organ/regenerative_core/legion,
225-
/obj/item/kitchen/knife/combat)))
225+
/obj/item/kitchen/knife/combat,
226+
/obj/item/storage/bag/ore,
227+
/obj/item/storage/bag/gem
228+
)))

code/modules/clothing/spacesuits/hardsuit.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@
321321
heat_protection = HEAD
322322
armor = list(MELEE = 30, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 75, WOUND = 15, ELECTRIC = 100)
323323
light_range = 7
324-
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator)
325324

326325
/obj/item/clothing/head/helmet/space/hardsuit/mining/Initialize(mapload)
327326
. = ..()
@@ -335,12 +334,12 @@
335334
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
336335
resistance_flags = FIRE_PROOF
337336
armor = list(MELEE = 30, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 75, WOUND = 15, ELECTRIC = 100)
338-
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe)
339337
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining
340338
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
341339

342340
/obj/item/clothing/suit/space/hardsuit/mining/Initialize(mapload)
343341
. = ..()
342+
allowed |= GLOB.mining_allowed
344343
AddComponent(/datum/component/armor_plate)
345344

346345
//Syndicate hardsuit
@@ -1168,7 +1167,7 @@
11681167
item_state = "advpa1_hardsuit"
11691168
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/powerarmor_advanced
11701169
hardsuit_type = "advancedpa1"
1171-
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/kinetic_crusher, /obj/item/pickaxe, /obj/item/pickaxe/drill/jackhammer, /obj/item/shield/riot/goliath, /obj/item/shield/riot/roman)
1170+
allowed = list(/obj/item/kinetic_crusher, /obj/item/shield/riot/goliath, /obj/item/shield/riot/roman, /obj/item/kinetic_javelin)
11721171
armor = list(MELEE = 50, BULLET = 10, LASER = 25, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 10, WOUND = 0, ELECTRIC = 100)
11731172
slowdown = 0
11741173
strip_delay = 180
@@ -1178,6 +1177,7 @@
11781177

11791178
/obj/item/clothing/suit/space/hardsuit/powerarmor_advanced/Initialize(mapload)
11801179
. = ..()
1180+
allowed |= GLOB.mining_allowed
11811181
AddComponent(/datum/component/armor_plate,10,/obj/item/stack/sheet/animalhide/weaver_chitin, list(MELEE = 0.5, BULLET = 3, LASER = 0.5, ENERGY = 2.5, BOMB = 5, BIO = 10, RAD = 8, FIRE = 10, ACID = 9, WOUND = 0.1))
11821182

11831183
/obj/item/clothing/head/helmet/space/hardsuit/powerarmor_advanced/Initialize(mapload)

yogstation/code/modules/jungleland/kinetic_javelin.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
force = 10
3333
throw_range = 7
3434
throw_speed = 1.5
35-
w_class = WEIGHT_CLASS_NORMAL
35+
w_class = WEIGHT_CLASS_BULKY
36+
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT
3637
/// Base damage before any multipliers
3738
var/unmodified_throwforce = 15
3839
/// Extra damage in exotic environments

0 commit comments

Comments
 (0)