mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-26 05:27:39 +01:00
Merge branch 'master' into kk-nanofix
This commit is contained in:
Heroman3003
@@ -48,4 +48,23 @@
|
||||
name = "purple tennis ball"
|
||||
desc = "A purple tennis ball. Now you've seen everything. Purple, seriously?"
|
||||
icon_state = "tennis_purple"
|
||||
item_state = "tennis_purple"
|
||||
item_state = "tennis_purple"
|
||||
|
||||
/obj/item/toy/baseball
|
||||
name = "baseball"
|
||||
desc = "A classic baseball; a rubber core surrounded by yarn and covered by faux leather. Getting hit with one is akin to getting punched."
|
||||
icon = 'icons/obj/balls_vr.dmi'
|
||||
icon_state = "baseball"
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/righthand_balls_vr.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/lefthand_balls_vr.dmi',
|
||||
slot_wear_mask_str = 'icons/mob/mouthball_vr.dmi',
|
||||
)
|
||||
item_state = "baseball"
|
||||
slot_flags = SLOT_MASK
|
||||
throw_range = 16
|
||||
force = 2.0
|
||||
throwforce = 5.0
|
||||
throw_speed = 5
|
||||
throw_range = 5
|
||||
w_class = ITEMSIZE_SMALL
|
||||
@@ -23,6 +23,7 @@
|
||||
var/hitcost = 240
|
||||
var/use_external_power = FALSE //only used to determine if it's a cyborg baton
|
||||
var/grip_safety = TRUE
|
||||
var/taped_safety = FALSE
|
||||
|
||||
/obj/item/weapon/melee/baton/New()
|
||||
..()
|
||||
@@ -100,7 +101,7 @@
|
||||
|
||||
/obj/item/weapon/melee/baton/dropped()
|
||||
..()
|
||||
if(status && grip_safety)
|
||||
if(status && grip_safety && !taped_safety)
|
||||
status = 0
|
||||
visible_message("<span class='warning'>\The [src]'s grip safety engages!</span>")
|
||||
update_icon()
|
||||
@@ -109,6 +110,8 @@
|
||||
. = ..()
|
||||
|
||||
if(Adjacent(user))
|
||||
if(taped_safety)
|
||||
. += "<span class='warning'>Someone has wrapped tape around the grip!</span>"
|
||||
if(bcell)
|
||||
. += "<span class='notice'>The baton is [round(bcell.percent())]% charged.</span>"
|
||||
if(!bcell)
|
||||
@@ -129,6 +132,17 @@
|
||||
to_chat(user, "<span class='notice'>[src] already has a cell.</span>")
|
||||
else
|
||||
to_chat(user, "<span class='notice'>This cell is not fitted for [src].</span>")
|
||||
if(istype(W, /obj/item/weapon/tape_roll) || istype(W, /obj/item/taperoll))
|
||||
if(grip_safety && !taped_safety) //no point letting people wrap tape around the grips of batons without a safety
|
||||
to_chat(user, "<span class='notice'>You firmly wrap tape around the baton's grip, disabling the safety system.</span>")
|
||||
playsound(src, 'sound/effects/tape.ogg',25)
|
||||
taped_safety = TRUE
|
||||
else if(grip_safety && taped_safety)
|
||||
to_chat(user, "<span class='notice'>The grip safety has already been taped down.</span>")
|
||||
if(istype(W, /obj/item/weapon/tool/screwdriver))
|
||||
if(taped_safety)
|
||||
to_chat(user, "<span class='notice'>You painstakingly scrape away the tape over the grip safety.</span>")
|
||||
taped_safety = FALSE
|
||||
|
||||
/obj/item/weapon/melee/baton/attack_hand(mob/user as mob)
|
||||
if(user.get_inactive_hand() == src)
|
||||
|
||||
@@ -111,6 +111,7 @@ something, make sure it's not in one of the other lists.*/
|
||||
prob(2);/obj/item/toy/tennis/cyan,
|
||||
prob(2);/obj/item/toy/tennis/blue,
|
||||
prob(2);/obj/item/toy/tennis/purple,
|
||||
prob(1);/obj/item/toy/baseball,
|
||||
prob(1);/obj/item/pizzavoucher
|
||||
/* VOREStation Edit End */
|
||||
)
|
||||
|
||||
@@ -156,5 +156,6 @@
|
||||
prob(2);/obj/item/toy/tennis/blue,
|
||||
prob(2);/obj/item/toy/tennis/purple,
|
||||
prob(2);/obj/item/clothing/ears/earmuffs,
|
||||
prob(2);/obj/item/clothing/ears/earmuffs/headphones
|
||||
prob(2);/obj/item/clothing/ears/earmuffs/headphones,
|
||||
prob(2);/obj/item/toy/baseball
|
||||
)
|
||||
@@ -13,6 +13,7 @@
|
||||
/obj/item/clothing/under/rank/chief_engineer/skirt,
|
||||
/obj/item/clothing/under/rank/neo_chiefengi,
|
||||
/obj/item/clothing/under/rank/neo_chiefengi_skirt,
|
||||
/obj/item/clothing/under/rank/neo_ce_gorka,
|
||||
/obj/item/clothing/head/hardhat/white,
|
||||
///obj/item/clothing/head/welding, //VOREStation Removal: Locker bloat, grr. They get fancy goggles or can raid the welding supplies locker for one of these.
|
||||
/obj/item/clothing/gloves/heavy_engineer, //VOREStation Edit: chief gets the good shit
|
||||
|
||||
@@ -141,6 +141,7 @@
|
||||
/obj/item/clothing/under/rank/neo_cmo_skirt,
|
||||
/obj/item/clothing/under/rank/neo_cmo_turtle,
|
||||
/obj/item/clothing/under/rank/neo_cmo_turtle_skirt,
|
||||
/obj/item/clothing/under/rank/neo_cmo_gorka,
|
||||
/obj/item/device/radio/headset/heads/cmo,
|
||||
/obj/item/device/radio/headset/heads/cmo/alt,
|
||||
/obj/item/device/flash,
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
/obj/item/clothing/under/rank/neo_rd_turtle_skirt,
|
||||
/obj/item/clothing/under/rank/neo_rd_suit,
|
||||
/obj/item/clothing/under/rank/neo_rd_suit_skirt,
|
||||
/obj/item/clothing/under/rank/neo_rd_gorka,
|
||||
/obj/item/weapon/cartridge/rd,
|
||||
/obj/item/clothing/shoes/white,
|
||||
/obj/item/clothing/shoes/laceup/brown,
|
||||
|
||||
@@ -55,6 +55,7 @@
|
||||
/obj/item/clothing/under/rank/neo_hop_parade_fem,
|
||||
/obj/item/clothing/under/rank/neo_hop_turtle,
|
||||
/obj/item/clothing/under/rank/neo_hop_turtle_skirt,
|
||||
/obj/item/clothing/under/rank/neo_cmd_gorka,
|
||||
/obj/item/clothing/suit/storage/toggle/labcoat/neo_hopformal,
|
||||
/obj/item/clothing/suit/storage/toggle/labcoat/neo_civ_dep,
|
||||
/obj/item/clothing/shoes/brown,
|
||||
@@ -147,6 +148,9 @@
|
||||
/obj/item/clothing/suit/storage/vest/wardencoat/neo_armsco_trench,
|
||||
/obj/item/clothing/suit/storage/vest/wardencoat/neo_bluewarden,
|
||||
/obj/item/clothing/suit/storage/vest/wardencoat/neo_warden_heavy,
|
||||
/obj/item/clothing/under/rank/neo_sec_gorka,
|
||||
/obj/item/clothing/suit/neo_armsco_trench,
|
||||
/obj/item/clothing/suit/neo_warden_heavy,
|
||||
/obj/item/weapon/cartridge/security,
|
||||
/obj/item/device/radio/headset/headset_sec,
|
||||
/obj/item/device/radio/headset/headset_sec/alt,
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
/obj/item/clothing/under/rank/neo_hos_blackblue_skirt,
|
||||
/obj/item/clothing/under/rank/neo_hos_parade_blue,
|
||||
/obj/item/clothing/under/rank/neo_hos_parade_blue_fem,
|
||||
/obj/item/clothing/under/rank/neo_hos_gorka,
|
||||
/obj/item/clothing/suit/storage/toggle/labcoat/neo_hos_parade,
|
||||
/obj/item/clothing/suit/storage/toggle/labcoat/neo_hosformal_blue,
|
||||
/obj/item/clothing/suit/storage/vest/wardencoat/neo_armsco_trench,
|
||||
|
||||
@@ -242,6 +242,7 @@
|
||||
prob(2);/obj/item/toy/tennis/cyan,
|
||||
prob(2);/obj/item/toy/tennis/blue,
|
||||
prob(2);/obj/item/toy/tennis/purple,
|
||||
prob(1);/obj/item/toy/baseball,
|
||||
prob(1);/obj/item/weapon/storage/box/brainzsnax,
|
||||
prob(1);/obj/item/weapon/storage/box/brainzsnax/red,
|
||||
prob(1);/obj/item/clothing/glasses/sunglasses,
|
||||
|
||||
Reference in New Issue
Block a user