cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update cigs_lighters.dm

Browse Source 
added extra chemicals to  free cigarettes except for rollies and space cigarettes
This commit is contained in:
Crashtest-LXXXIX
2020-08-21 22:58:59 +01:00
committed by GitHub
parent 57999bef68
commit a656d33246
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/objects/items/cigs_lighters.dm
View File

@@ -265,13 +265,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/dromedary
desc = "A DromedaryCo brand cigarette."
list_reagents = list("nicotine" = 7.5, "silicon" = 7.5)
/obj/item/clothing/mask/cigarette/uplift
desc = "An Uplift Smooth brand cigarette."
list_reagents = list("nicotine" = 7.5, "menthol" = 7.5)
/obj/item/clothing/mask/cigarette/robust
desc = "A Robust brand cigarette."
list_reagents = list("nicotine" = 7.5, "grenadine" = 7.5)
/obj/item/clothing/mask/cigarette/robustgold
desc = "A Robust Gold brand cigarette."
@@ -279,7 +280,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/carp
desc = "A Carp Classic brand cigarette."
list_reagents = list("nicotine" = 7.5, "water" = 7.25, "sodiumchloride" = 0.25)
/obj/item/clothing/mask/cigarette/syndicate
desc = "An unknown brand cigarette."
list_reagents = list("nicotine" = 15, "omnizine" = 15)
@@ -911,7 +912,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if (O.heat > 500)
if (reagents && reagents.total_volume) //if there's stuff in the bong
var/lighting_text = O.ignition_effect(src, user)
if(lighting_text)
if(lighting_text)
//Logic regarding igniting it on
if (firecharges == 0)
user.show_message("<span class='notice'>You light the [src] with the [O]!</span>", 1)
@@ -1020,7 +1021,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/datum/effect_system/smoke_spread/chem/smoke_machine/s = new
s.set_up(reagents, hit_strength, 18, user.loc)
s.start()
s.start()
reagents.reaction(user, INGEST, fraction)
if(!reagents.trans_to(user, fraction))
@@ -1058,4 +1059,4 @@ CIGARETTE PACKETS ARE IN FANCY.DM
name = "coconut bong"
icon_off = "coconut_bong"
icon_on = "coconut_bong_lit"
desc = "A water bong used for smoking dried plants. This one's made out of a coconut and some bamboo"
desc = "A water bong used for smoking dried plants. This one's made out of a coconut and some bamboo"