cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed custom rollies having nicotine by default (#20757)

Browse Source
This commit is contained in:
Livi
2023-04-22 09:27:52 +02:00
committed by GitHub
parent e250959bc7
commit 1a10d9a569
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/cigs.dm
+3 -3
View File
@@ -271,8 +271,8 @@ LIGHTERS ARE IN LIGHTERS.DM
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
/obj/item/clothing/mask/cigarette/rollie/nicotine
list_reagents = list("nicotine" = 40)
/obj/item/clothing/mask/cigarette/rollie/custom
list_reagents = list()
/obj/item/cigbutt/roach
@@ -448,7 +448,7 @@ LIGHTERS ARE IN LIGHTERS.DM
if(O.dry)
user.unEquip(target, 1)
user.unEquip(src, 1)
var/obj/item/clothing/mask/cigarette/rollie/R = new /obj/item/clothing/mask/cigarette/rollie(user.loc)
var/obj/item/clothing/mask/cigarette/rollie/custom/R = new /obj/item/clothing/mask/cigarette/rollie/custom(user.loc)
R.chem_volume = target.reagents.total_volume
target.reagents.trans_to(R, R.chem_volume)
user.put_in_active_hand(R)
code/game/objects/items/weapons/storage/fancy.dm
+1 -1
View File
@@ -292,7 +292,7 @@
desc = "You can't understand the runes, but the packet smells funny."
icon_state = "midoripacket"
item_state = "midoripacket"
cigarette_type = /obj/item/clothing/mask/cigarette/rollie/nicotine
cigarette_type = /obj/item/clothing/mask/cigarette/rollie
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims
name ="\improper Shady Jim's Super Slims"