mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
TG: Minor cigarette fixes, and added the DromedaryCo cigarette crate as a new
contraband crate. Also added WJohnston's new rolled up poster sprite. Revision: r3566 Author: petethegoat
This commit is contained in:
@@ -4,6 +4,7 @@ MATCHES
|
||||
MATCHBOXES
|
||||
CIGARETTES
|
||||
CIGARS
|
||||
SMOKING PIPES
|
||||
CIG PACKET
|
||||
ZIPPO
|
||||
*/
|
||||
@@ -329,7 +330,7 @@ ZIPPO
|
||||
//CIG PACK//
|
||||
////////////
|
||||
/obj/item/weapon/cigpacket
|
||||
name = "Cigarette packet"
|
||||
name = "cigarette packet"
|
||||
desc = "The most popular brand of Space Cigarettes, sponsors of the Space Olympics."
|
||||
icon = 'cigarettes.dmi'
|
||||
icon_state = "cigpacket"
|
||||
@@ -342,23 +343,23 @@ ZIPPO
|
||||
|
||||
|
||||
update_icon()
|
||||
src.icon_state = text("cigpacket[]", src.cigcount)
|
||||
src.desc = text("There are [] cigs\s left!", src.cigcount)
|
||||
icon_state = "[initial(icon_state)][cigcount]"
|
||||
desc = "There's [cigcount] cig\s left!"
|
||||
return
|
||||
|
||||
|
||||
attack_hand(mob/user as mob)
|
||||
if(user.r_hand == src || user.l_hand == src)
|
||||
if(src.cigcount == 0)
|
||||
if(cigcount == 0)
|
||||
user << "\red You're out of cigs, shit! How you gonna get through the rest of the day..."
|
||||
return
|
||||
else
|
||||
src.cigcount--
|
||||
cigcount--
|
||||
var/obj/item/clothing/mask/cigarette/W = new /obj/item/clothing/mask/cigarette(user)
|
||||
user.put_in_hand(W)
|
||||
else
|
||||
return ..()
|
||||
src.update_icon()
|
||||
update_icon()
|
||||
return
|
||||
|
||||
/obj/item/weapon/cigpacket/dromedaryco
|
||||
|
||||
Reference in New Issue
Block a user