shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6623 from Citadel-Station-13/upstream-merge-37615

Browse Source 
[MIRROR] Fixes Midori cigs having no nicotine
This commit is contained in:
LetterJay
2018-05-03 08:52:46 -05:00
committed by GitHub
parent e42cce26da 1eadb0a838
commit 71e7b461d5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/cigs_lighters.dm
+3
View File
@@ -314,6 +314,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
src.pixel_x = rand(-5, 5) src.pixel_x = rand(-5, 5)
src.pixel_y = rand(-5, 5) src.pixel_y = rand(-5, 5)
/obj/item/clothing/mask/cigarette/rollie/nicotine
list_reagents = list("nicotine" = 15)
/obj/item/clothing/mask/cigarette/rollie/trippy /obj/item/clothing/mask/cigarette/rollie/trippy
list_reagents = list("nicotine" = 15, "mushroomhallucinogen" = 35) list_reagents = list("nicotine" = 15, "mushroomhallucinogen" = 35)
starts_lit = TRUE starts_lit = TRUE
code/game/objects/items/storage/fancy.dm
+1 -1
View File
@@ -237,7 +237,7 @@
name = "\improper Midori Tabako packet" name = "\improper Midori Tabako packet"
desc = "You can't understand the runes, but the packet smells funny." desc = "You can't understand the runes, but the packet smells funny."
icon_state = "midori" icon_state = "midori"
spawn_type = /obj/item/clothing/mask/cigarette/rollie spawn_type = /obj/item/clothing/mask/cigarette/rollie/nicotine
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims /obj/item/storage/fancy/cigarettes/cigpack_shadyjims
name = "\improper Shady Jim's Super Slims packet" name = "\improper Shady Jim's Super Slims packet"