mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
Fixed some runtime errors.
Backporting from ss13.ru: - added trash: foor eaten food leaves empty картонный boxes and plates, husks. Janitors are doomed. - new sprite for Soylent Viridians - randomized pill sprite offset (as for fruits, tiles, papers). - now chemmaster first assign label to pill, then dispence it. - added sprite for trash bag. Wil be added to code soon. Code by Jack Rost, sprites by Farart. - added candle. Code by Balagi, sprites by Farart. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1879 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -0,0 +1,114 @@
|
||||
#define CANDLE_LUM 3
|
||||
|
||||
/obj/item/candle
|
||||
name = "red candle"
|
||||
desc = "a candle"
|
||||
icon = 'candle.dmi'
|
||||
icon_state = "candle1"
|
||||
item_state = "candle1"
|
||||
|
||||
var/wax = 100
|
||||
var/lit = 0
|
||||
|
||||
/obj/item/candle/update_icon()
|
||||
var/i
|
||||
if(wax>75)
|
||||
i = 1
|
||||
else if(wax>40)
|
||||
i = 2
|
||||
else i = 3
|
||||
icon_state = "candle[i][lit ? "_lit" : ""]"
|
||||
|
||||
/obj/item/candle/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
..()
|
||||
if(istype(W, /obj/item/weapon/weldingtool) && W:welding)
|
||||
light("\red [user] casually lights the [name] with [W], what a badass.")
|
||||
else if(istype(W, /obj/item/weapon/zippo) && W:lit)
|
||||
light()
|
||||
else if(istype(W, /obj/item/weapon/match) && W:lit)
|
||||
light()
|
||||
|
||||
|
||||
|
||||
/obj/item/candle/proc/light(var/flavor_text = "\red [usr] lights the [name].")
|
||||
if(!lit)
|
||||
lit = 1
|
||||
//src.damtype = "fire"
|
||||
for(var/mob/O in viewers(usr, null))
|
||||
O.show_message(flavor_text, 1)
|
||||
sd_SetLuminosity(CANDLE_LUM)
|
||||
spawn()
|
||||
src.process()
|
||||
|
||||
/obj/item/candle/process()
|
||||
if(!lit)
|
||||
return
|
||||
wax--
|
||||
if(!wax)
|
||||
new/obj/item/trash/candle(src.loc)
|
||||
if(istype(src.loc, /mob))
|
||||
src.dropped()
|
||||
del(src)
|
||||
update_icon()
|
||||
|
||||
if(istype(loc, /turf)) //start a fire if possible
|
||||
var/turf/T = loc
|
||||
T.hotspot_expose(700, 5)
|
||||
|
||||
spawn(60)
|
||||
process()
|
||||
|
||||
/obj/item/candle/attack_self(mob/user as mob)
|
||||
if(lit)
|
||||
lit = 0
|
||||
update_icon()
|
||||
sd_SetLuminosity(0)
|
||||
|
||||
/obj/item/candle/pickup(mob/user)
|
||||
if(lit)
|
||||
src.sd_SetLuminosity(0)
|
||||
user.sd_SetLuminosity(user.luminosity + CANDLE_LUM)
|
||||
|
||||
/obj/item/candle/dropped(mob/user)
|
||||
if(lit)
|
||||
user.sd_SetLuminosity(user.luminosity - CANDLE_LUM)
|
||||
src.sd_SetLuminosity(CANDLE_LUM)
|
||||
|
||||
|
||||
///////////////
|
||||
//CANDLE PACK//
|
||||
///////////////
|
||||
/obj/item/weapon/candlepack
|
||||
name = "Candle pack"
|
||||
//desc = "The most popular brand of Space Cigarettes, sponsors of the Space Olympics."
|
||||
icon = 'candle.dmi'
|
||||
icon_state = "pack5"
|
||||
item_state = "pack5"
|
||||
w_class = 1
|
||||
throwforce = 2
|
||||
var/candlecount = 5
|
||||
flags = ONBELT | TABLEPASS
|
||||
|
||||
|
||||
/obj/item/weapon/candlepack/update_icon()
|
||||
src.icon_state = text("pack[]", src.candlecount)
|
||||
src.desc = text("There are [] candles left!", src.candlecount)
|
||||
return
|
||||
|
||||
/obj/item/weapon/candlepack/attack_hand(mob/user as mob)
|
||||
if(user.r_hand == src || user.l_hand == src)
|
||||
if(src.candlecount == 0)
|
||||
//user << "\red You're out of cigs, shit! How you gonna get through the rest of the day..."
|
||||
return
|
||||
else
|
||||
src.candlecount--
|
||||
var/obj/item/candle/W = new /obj/item/candle(user)
|
||||
if(user.hand)
|
||||
user.l_hand = W
|
||||
else
|
||||
user.r_hand = W
|
||||
W.layer = 20
|
||||
else
|
||||
return ..()
|
||||
src.update_icon()
|
||||
return
|
||||
@@ -0,0 +1,48 @@
|
||||
//Added by Jack Rost
|
||||
/obj/item/trash
|
||||
icon = 'trash.dmi'
|
||||
w_class = 1.0
|
||||
desc = "It's \a trash"
|
||||
raisins
|
||||
name = "4no raisins"
|
||||
icon_state= "4no_raisins"
|
||||
candy
|
||||
name = "Candy"
|
||||
icon_state= "candy"
|
||||
cheesie
|
||||
name = "Cheesie honkers"
|
||||
icon_state = "cheesie_honkers"
|
||||
chips
|
||||
name = "Chips"
|
||||
icon_state = "chips"
|
||||
popcorn
|
||||
name = "Popcorn"
|
||||
icon_state = "popcorn"
|
||||
sosjerky
|
||||
name = "Sosjerky"
|
||||
icon_state = "sosjerky"
|
||||
syndi_cakes
|
||||
name = "Syndi cakes"
|
||||
icon_state = "syndi_cakes"
|
||||
waffles
|
||||
name = "Waffles"
|
||||
icon_state = "waffles"
|
||||
plate
|
||||
name = "Plate"
|
||||
icon_state = "plate"
|
||||
snack_bowl
|
||||
name = "Snack bowl"
|
||||
icon_state = "snack_bowl"
|
||||
pistachios
|
||||
name = "Pistachios pack"
|
||||
icon_state = "pistachios_pack"
|
||||
semki
|
||||
name = "Semki pack"
|
||||
icon_state = "semki_pack"
|
||||
tray
|
||||
name = "Tray"
|
||||
icon_state = "tray"
|
||||
candle
|
||||
name = "candle"
|
||||
icon = 'candle.dmi'
|
||||
icon_state = "candle4"
|
||||
Reference in New Issue
Block a user