mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2026-01-03 23:10:58 +00:00
Bolas, Leather Drying Thing, Holster Crafting, and Lances
This commit is contained in:
@@ -375,3 +375,79 @@
|
||||
tools = list(TOOL_WIRECUTTER)
|
||||
time = 20
|
||||
*/
|
||||
|
||||
//Holsters
|
||||
/datum/crafting_recipe/holster_shoulder
|
||||
name = "Holster (Shoulder)"
|
||||
result = /obj/item/clothing/accessory/holster
|
||||
time = 35
|
||||
tools = list(TOOL_WIRECUTTER,
|
||||
TOOL_SCREWDRIVER)
|
||||
reqs = list(/obj/item/stack/material/plastic = 2,
|
||||
/obj/item/stack/material/cloth = 1,
|
||||
/obj/item/stack/material/leather = 5)
|
||||
category = CAT_CLOTHING
|
||||
|
||||
/datum/crafting_recipe/holster_armpit
|
||||
name = "Holster (Armpit)"
|
||||
result = /obj/item/clothing/accessory/holster/armpit
|
||||
time = 35
|
||||
tools = list(TOOL_WIRECUTTER,
|
||||
TOOL_SCREWDRIVER)
|
||||
reqs = list(/obj/item/stack/material/plastic = 2,
|
||||
/obj/item/stack/material/cloth = 1,
|
||||
/obj/item/stack/material/leather = 5)
|
||||
category = CAT_CLOTHING
|
||||
|
||||
/datum/crafting_recipe/holster_waist
|
||||
name = "Holster (Waist)"
|
||||
result = /obj/item/clothing/accessory/holster/waist
|
||||
time = 35
|
||||
tools = list(TOOL_WIRECUTTER,
|
||||
TOOL_SCREWDRIVER)
|
||||
reqs = list(/obj/item/stack/material/plastic = 2,
|
||||
/obj/item/stack/material/cloth = 1,
|
||||
/obj/item/stack/material/leather = 5)
|
||||
category = CAT_CLOTHING
|
||||
|
||||
/datum/crafting_recipe/holster_hip
|
||||
name = "Holster (Hip)"
|
||||
result = /obj/item/clothing/accessory/holster/hip
|
||||
time = 35
|
||||
tools = list(TOOL_WIRECUTTER,
|
||||
TOOL_SCREWDRIVER)
|
||||
reqs = list(/obj/item/stack/material/plastic = 2,
|
||||
/obj/item/stack/material/cloth = 1,
|
||||
/obj/item/stack/material/leather = 5)
|
||||
category = CAT_CLOTHING
|
||||
|
||||
/datum/crafting_recipe/holster_leg
|
||||
name = "Holster (Leg))"
|
||||
result = /obj/item/clothing/accessory/holster/leg
|
||||
time = 35
|
||||
tools = list(TOOL_WIRECUTTER,
|
||||
TOOL_SCREWDRIVER)
|
||||
reqs = list(/obj/item/stack/material/plastic = 2,
|
||||
/obj/item/stack/material/cloth = 1,
|
||||
/obj/item/stack/material/leather = 5)
|
||||
category = CAT_CLOTHING
|
||||
|
||||
/datum/crafting_recipe/holster_machete
|
||||
name = "Holster (Machete)"
|
||||
result = /obj/item/clothing/accessory/holster/machete
|
||||
time = 35
|
||||
tools = list(TOOL_WIRECUTTER,
|
||||
TOOL_SCREWDRIVER)
|
||||
reqs = list(/obj/item/stack/material/plastic = 4,
|
||||
/obj/item/stack/material/leather = 6)
|
||||
category = CAT_CLOTHING
|
||||
|
||||
/datum/crafting_recipe/holster_kineticaccel
|
||||
name = "Holster (Kinetic Accelerator)"
|
||||
result = /obj/item/clothing/accessory/holster/waist/kinetic_accelerator
|
||||
time = 35
|
||||
tools = list(TOOL_WIRECUTTER,
|
||||
TOOL_SCREWDRIVER)
|
||||
reqs = list(/obj/item/stack/material/steel = 3,
|
||||
/obj/item/stack/material/leather = 8)
|
||||
category = CAT_CLOTHING
|
||||
|
||||
@@ -333,14 +333,9 @@ var/last_chew = 0
|
||||
breakouttime = 30
|
||||
cuff_sound = 'sound/weapons/towelwipe.ogg' //Is there anything this sound can't do?
|
||||
|
||||
/obj/item/handcuffs/legcuffs/bola/can_place(var/mob/target, var/mob/user)
|
||||
if(user) //A ranged legcuff, until proper implementation as items it remains a projectile-only thing.
|
||||
return 1
|
||||
|
||||
/obj/item/handcuffs/legcuffs/bola/dropped()
|
||||
/obj/item/handcuffs/legcuffs/bola/throw_impact(var/mob/living/carbon/target)
|
||||
. = ..()
|
||||
visible_message("<span class='notice'>\The [src] falls apart!</span>")
|
||||
qdel(src)
|
||||
place_legcuffs()
|
||||
|
||||
/obj/item/handcuffs/legcuffs/bola/place_legcuffs(var/mob/living/carbon/target, var/mob/user)
|
||||
playsound(src.loc, cuff_sound, 30, 1, -2)
|
||||
|
||||
@@ -214,8 +214,10 @@
|
||||
user.say("[war_cry]")
|
||||
explosive.detonate()
|
||||
|
||||
/obj/item/material/twohanded/spear/proc/grenade_prime_react(obj/item/grenade/nade) //Citadel edit, removes throw_impact because memes
|
||||
nade.forceMove(get_turf(src))
|
||||
/obj/item/material/twohanded/spear/throw_impact(atom/hit_atom)
|
||||
. = ..()
|
||||
if(explosive)
|
||||
explosive.detonate()
|
||||
qdel(src)
|
||||
|
||||
/obj/item/material/twohanded/spear/AltClick(mob/user)
|
||||
|
||||
@@ -150,7 +150,7 @@
|
||||
if (S.dried_type)
|
||||
return 1
|
||||
if(istype(O, /obj/item/stack/wetleather))
|
||||
var/obj/item/stack/wetleather/WL = 0
|
||||
var/obj/item/stack/wetleather/WL = O
|
||||
if (WL.wetness == 30)
|
||||
return 1
|
||||
return 0
|
||||
@@ -182,8 +182,12 @@
|
||||
|
||||
/obj/machinery/smartfridge/drying_rack/attackby(var/obj/item/O as obj, mob/user)
|
||||
. = ..()
|
||||
if(istype(O, /obj/item/stack/wetleather))
|
||||
if(istype(O, /obj/item/stack/wetleather/))
|
||||
var/obj/item/stack/wetleather/WL = O
|
||||
if(WL.amount > 2)
|
||||
to_chat("<span class='notice'>The rack can only fit one sheet at a time!</span>")
|
||||
return 1
|
||||
else
|
||||
user.remove_from_mob(WL)
|
||||
stock(WL)
|
||||
user.visible_message("<span class='notice'>[user] has added \the [WL] to \the [src].</span>", "<span class='notice'>You add \the [WL] to \the [src].</span>")
|
||||
@@ -204,8 +208,10 @@
|
||||
qdel(S)
|
||||
return
|
||||
for(var/obj/item/stack/wetleather/WL in I.instances)
|
||||
WL.wetness = 0
|
||||
WL.fire_act()
|
||||
WL.use(1)
|
||||
I.instances -= WL
|
||||
var/L = /obj/item/stack/material/leather
|
||||
new L(get_turf(src))
|
||||
return
|
||||
|
||||
/obj/machinery/smartfridge/process(delta_time)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 86 KiB |
Reference in New Issue
Block a user