cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-14 01:18:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Adds k'ois contaminated phoron (1)" (#15719)

Browse Source
This commit is contained in:
Sniblet
2023-02-03 21:05:29 -05:00
committed by GitHub
parent 7a739a464a
commit e7b5f5fc38
20 changed files with 113 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/cigs_lighters.dm
+3 -3
View File
@@ -200,9 +200,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
playsound(src, 'sound/items/cigs_lighters/cig_light.ogg', 75, 1, -1)
src.reagents.set_temperature(T0C + 45)
damtype = "fire"
if(REAGENT_VOLUME(reagents, /singleton/reagent/toxin/phoron/pure)) // the phoron explodes when exposed to fire
if(REAGENT_VOLUME(reagents, /singleton/reagent/toxin/phoron)) // the phoron explodes when exposed to fire
var/datum/effect/effect/system/reagents_explosion/e = new()
e.set_up(round(REAGENT_VOLUME(reagents, /singleton/reagent/toxin/phoron/pure) / 2.5, 1), get_turf(src), 0, 0)
e.set_up(round(REAGENT_VOLUME(reagents, /singleton/reagent/toxin/phoron) / 2.5, 1), get_turf(src), 0, 0)
e.start()
qdel(src)
return
@@ -300,7 +300,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS | SLOT_MASK
attack_verb = list("burnt", "singed")
icon_on = "cigon"
icon_on = "cigon"
icon_off = "cigoff"
has_blood_overlay = FALSE
type_butt = /obj/item/trash/cigbutt
code/game/objects/items/weapons/grenades/chem_grenade.dm
+1 -1
View File
@@ -224,7 +224,7 @@
B1.reagents.add_reagent(/singleton/reagent/aluminum, 15)
B1.reagents.add_reagent(/singleton/reagent/fuel,20)
B2.reagents.add_reagent(/singleton/reagent/toxin/phoron/pure, 15)
B2.reagents.add_reagent(/singleton/reagent/toxin/phoron, 15)
B2.reagents.add_reagent(/singleton/reagent/acid, 15)
B1.reagents.add_reagent(/singleton/reagent/fuel,20)