mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 21:12:24 +01:00
pumpkin fix and sprite improvement
This commit is contained in:
@@ -76,6 +76,7 @@
|
||||
name = "candle"
|
||||
icon = 'icons/obj/candle.dmi'
|
||||
icon_state = "candle4"
|
||||
drop_sound = 'sound/items/drop/gloves.ogg'
|
||||
|
||||
/obj/item/trash/liquidfood
|
||||
name = "\improper \"LiquidFood\" ration"
|
||||
|
||||
@@ -4,13 +4,14 @@
|
||||
icon = 'icons/obj/candle.dmi'
|
||||
icon_state = "candle1"
|
||||
item_state = "candle1"
|
||||
drop_sound = 'sound/items/drop/gloves.ogg'
|
||||
w_class = 1
|
||||
light_color = "#E09D37"
|
||||
var/wax = 2000
|
||||
|
||||
/obj/item/weapon/flame/candle/New()
|
||||
/obj/item/weapon/flame/candle/Initialize()
|
||||
. = ..()
|
||||
wax = rand(800, 1000) // Enough for 27-33 minutes. 30 minutes on average.
|
||||
..()
|
||||
|
||||
/obj/item/weapon/flame/candle/update_icon()
|
||||
var/i
|
||||
@@ -38,22 +39,26 @@
|
||||
|
||||
/obj/item/weapon/flame/candle/proc/light(var/flavor_text = "<span class='notice'>\The [usr] lights the [name].</span>")
|
||||
if(!src.lit)
|
||||
src.lit = 1
|
||||
src.lit = TRUE
|
||||
playsound(src.loc, 'sound/items/cigs_lighters/cig_light.ogg', 50, 1)
|
||||
//src.damtype = "fire"
|
||||
for(var/mob/O in viewers(usr, null))
|
||||
O.show_message(flavor_text, 1)
|
||||
set_light(CANDLE_LUM)
|
||||
update_icon()
|
||||
START_PROCESSING(SSprocessing, src)
|
||||
|
||||
/obj/item/weapon/flame/candle/process()
|
||||
/obj/item/weapon/flame/candle/process(mob/user as mob)
|
||||
if(!lit)
|
||||
return
|
||||
update_icon()
|
||||
wax--
|
||||
if(!wax)
|
||||
new/obj/item/trash/candle(src.loc)
|
||||
new /obj/item/trash/candle(src.loc)
|
||||
if(istype(src.loc, /mob))
|
||||
src.dropped()
|
||||
|
||||
to_chat(user, span("notice", "The candle burns out."))
|
||||
playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
qdel(src)
|
||||
update_icon()
|
||||
@@ -63,6 +68,8 @@
|
||||
|
||||
/obj/item/weapon/flame/candle/attack_self(mob/user as mob)
|
||||
if(lit)
|
||||
lit = 0
|
||||
lit = FALSE
|
||||
to_chat(user, span("notice", "You snuff out the flame."))
|
||||
playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
|
||||
update_icon()
|
||||
set_light(0)
|
||||
set_light(0)
|
||||
@@ -13,12 +13,15 @@
|
||||
* Cigarette Box
|
||||
*/
|
||||
|
||||
/obj/item/weapon/storage/fancy/
|
||||
/obj/item/weapon/storage/fancy
|
||||
name = "donut box"
|
||||
desc = "A box of half-a-dozen donuts."
|
||||
icon = 'icons/obj/food.dmi'
|
||||
icon_state = "donutbox6"
|
||||
name = "donut box"
|
||||
var/icon_type = "donut"
|
||||
var/storage_type = "box"
|
||||
drop_sound = 'sound/items/drop/box.ogg'
|
||||
use_sound = 'sound/items/storage/box.ogg'
|
||||
|
||||
/obj/item/weapon/storage/fancy/update_icon(var/itemremoved = 0)
|
||||
var/total_contents = src.contents.len - itemremoved
|
||||
@@ -43,11 +46,12 @@
|
||||
*/
|
||||
|
||||
/obj/item/weapon/storage/fancy/egg_box
|
||||
name = "egg box"
|
||||
desc = "A carton of eggs."
|
||||
icon = 'icons/obj/food.dmi'
|
||||
icon_state = "eggbox"
|
||||
center_of_mass = list("x" = 16,"y" = 7)
|
||||
icon_type = "egg"
|
||||
name = "egg box"
|
||||
center_of_mass = list("x" = 16,"y" = 7)
|
||||
storage_slots = 12
|
||||
can_hold = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg,
|
||||
@@ -79,8 +83,9 @@
|
||||
desc = "A box of crayons for all your rune drawing needs."
|
||||
icon = 'icons/obj/crayons.dmi'
|
||||
icon_state = "crayonbox"
|
||||
w_class = 2.0
|
||||
icon_type = "crayon"
|
||||
drop_sound = 'sound/items/drop/box.ogg'
|
||||
w_class = 2.0
|
||||
can_hold = list(
|
||||
/obj/item/weapon/pen/crayon
|
||||
)
|
||||
@@ -123,6 +128,8 @@
|
||||
icon = 'icons/obj/cigs_lighters.dmi'
|
||||
icon_state = "cigpacket"
|
||||
item_state = "cigpacket"
|
||||
drop_sound = 'sound/items/drop/gloves.ogg'
|
||||
use_sound = 'sound/items/storage/paper.ogg'
|
||||
w_class = 1
|
||||
throwforce = 2
|
||||
slot_flags = SLOT_BELT
|
||||
@@ -204,6 +211,8 @@
|
||||
icon_state = "cigarcase"
|
||||
item_state = "cigarcase"
|
||||
icon = 'icons/obj/cigs_lighters.dmi'
|
||||
drop_sound = 'sound/items/drop/gloves.ogg'
|
||||
use_sound = 'sound/items/storage/paper.ogg'
|
||||
w_class = 1
|
||||
throwforce = 2
|
||||
slot_flags = SLOT_BELT
|
||||
@@ -251,10 +260,11 @@
|
||||
*/
|
||||
|
||||
/obj/item/weapon/storage/fancy/vials
|
||||
name = "vial storage box"
|
||||
icon = 'icons/obj/vialbox.dmi'
|
||||
icon_state = "vialbox6"
|
||||
icon_type = "vial"
|
||||
name = "vial storage box"
|
||||
drop_sound = 'sound/items/drop/metalboots.ogg'
|
||||
storage_slots = 6
|
||||
can_hold = list(/obj/item/weapon/reagent_containers/glass/beaker/vial)
|
||||
starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/vial = 6)
|
||||
@@ -265,6 +275,7 @@
|
||||
icon = 'icons/obj/vialbox.dmi'
|
||||
icon_state = "vialbox0"
|
||||
item_state = "syringe_kit"
|
||||
drop_sound = 'sound/items/drop/metalboots.ogg'
|
||||
max_w_class = 2
|
||||
can_hold = list(/obj/item/weapon/reagent_containers/glass/beaker/vial)
|
||||
max_storage_space = 12 //The sum of the w_classes of all the items in this storage item.
|
||||
|
||||
Reference in New Issue
Block a user