mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-03 05:52:43 +00:00
Adds umbrellas to loadout, for 3 points
This commit is contained in:
@@ -20,6 +20,7 @@
|
|||||||
desc = "To keep the rain off you. Use with caution on windy days."
|
desc = "To keep the rain off you. Use with caution on windy days."
|
||||||
icon = 'icons/obj/items.dmi'
|
icon = 'icons/obj/items.dmi'
|
||||||
icon_state = "umbrella_closed"
|
icon_state = "umbrella_closed"
|
||||||
|
addblends = "umbrella_closed_a"
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
force = 5
|
force = 5
|
||||||
@@ -29,7 +30,6 @@
|
|||||||
|
|
||||||
/obj/item/weapon/melee/umbrella/New()
|
/obj/item/weapon/melee/umbrella/New()
|
||||||
..()
|
..()
|
||||||
color = "#"+get_random_colour()
|
|
||||||
update_icon()
|
update_icon()
|
||||||
|
|
||||||
/obj/item/weapon/melee/umbrella/attack_self()
|
/obj/item/weapon/melee/umbrella/attack_self()
|
||||||
@@ -38,10 +38,16 @@
|
|||||||
/obj/item/weapon/melee/umbrella/proc/toggle_umbrella()
|
/obj/item/weapon/melee/umbrella/proc/toggle_umbrella()
|
||||||
open = !open
|
open = !open
|
||||||
icon_state = "umbrella_[open ? "open" : "closed"]"
|
icon_state = "umbrella_[open ? "open" : "closed"]"
|
||||||
|
addblends = icon_state + "_a"
|
||||||
item_state = icon_state
|
item_state = icon_state
|
||||||
update_icon()
|
update_icon()
|
||||||
if(ishuman(src.loc))
|
if(ishuman(src.loc))
|
||||||
var/mob/living/carbon/human/H = src.loc
|
var/mob/living/carbon/human/H = src.loc
|
||||||
H.update_inv_l_hand(0)
|
H.update_inv_l_hand(0)
|
||||||
H.update_inv_r_hand()
|
H.update_inv_r_hand()
|
||||||
|
..()
|
||||||
|
|
||||||
|
// Randomizes color
|
||||||
|
/obj/item/weapon/melee/umbrella/random/New()
|
||||||
|
color = "#"+get_random_colour()
|
||||||
..()
|
..()
|
||||||
@@ -137,3 +137,12 @@
|
|||||||
/datum/gear/utility/wheelchair/color/New()
|
/datum/gear/utility/wheelchair/color/New()
|
||||||
..()
|
..()
|
||||||
gear_tweaks = list(gear_tweak_free_color_choice)
|
gear_tweaks = list(gear_tweak_free_color_choice)
|
||||||
|
|
||||||
|
/datum/gear/utility/umbrella
|
||||||
|
display_name = "Umbrella"
|
||||||
|
path = /obj/item/weapon/melee/umbrella
|
||||||
|
cost = 3
|
||||||
|
|
||||||
|
/datum/gear/utility/umbrella/New()
|
||||||
|
..()
|
||||||
|
gear_tweaks = list(gear_tweak_free_color_choice)
|
||||||
4
html/changelogs/Atermonera_umbrelloadout.yml
Normal file
4
html/changelogs/Atermonera_umbrelloadout.yml
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
author: Atermonera
|
||||||
|
delete-after: True
|
||||||
|
changes:
|
||||||
|
- rscadd: "Adds umbrellas to the loadout, for 3 points. Colorable!"
|
||||||
Reference in New Issue
Block a user