cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

updates

Browse Source
This commit is contained in:
Fox-McCloud
2015-04-05 17:54:48 -04:00
parent f977b62724
commit fb03e1bc88
5 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/random_items.dm
+1 -1
View File
@@ -325,7 +325,7 @@
icon_state = "flashbang"
var/list/grenadelist = list(/obj/item/weapon/grenade/chem_grenade/metalfoam, /obj/item/weapon/grenade/chem_grenade/incendiary,
/obj/item/weapon/grenade/chem_grenade/antiweed, /obj/item/weapon/grenade/chem_grenade/cleaner, /obj/item/weapon/grenade/chem_grenade/teargas,
/obj/item/weapon/grenade/chem_grenade/holywater, /obj/item/weapon/grenade/chem_grenade/soap, /obj/item/weapon/grenade/chem_grenade/meat,
/obj/item/weapon/grenade/chem_grenade/holywater, /obj/item/weapon/grenade/chem_grenade/meat,
/obj/item/weapon/grenade/chem_grenade/dirt, /obj/item/weapon/grenade/chem_grenade/lube, /obj/item/weapon/grenade/smokebomb,
/obj/item/weapon/grenade/chem_grenade/drugs, /obj/item/weapon/grenade/chem_grenade/ethanol) // holy list batman
code/game/objects/items/weapons/grenades.dm
-20
View File
@@ -47,23 +47,6 @@
B.reagents.add_reagent("holywater",100)
beakers += B
/obj/item/weapon/grenade/chem_grenade/soap
payload_name = "soap"
desc = "Not necessarily as clean as the name implies."
stage = 2
New()
..()
var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("cornoil",60)
B2.reagents.add_reagent("enzyme",5)
B2.reagents.add_reagent("ammonia",30)
beakers += B1
beakers += B2
update_icon()
/obj/item/weapon/grenade/chem_grenade/drugs
payload_name = "miracle"
@@ -348,9 +331,6 @@
/obj/item/weapon/grenade/clusterbuster/xmas
name = "Christmas Miracle"
payload = /obj/item/weapon/a_gift
/obj/item/weapon/grenade/clusterbuster/soap
name = "Megamaid's Passive-Aggressive Soap-creation Grenade"
payload = /obj/item/weapon/grenade/chem_grenade/soap
/obj/item/weapon/grenade/clusterbuster/dirt
name = "Megamaid's Job Security Grenade"
payload = /obj/effect/decal/cleanable/random
code/modules/reagents/newchem/drugs.dm
+1 -1
View File
@@ -277,7 +277,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
name = "bath_salts"
id = "bath_salts"
result = "bath_salts"
required_reagents = list("????" = 1, "saltpetre" = 1, "nutriment" = 1, "cleaner" = 1, "enzyme" = 1, "mugwort" = 1, "mercury" = 1)
required_reagents = list("????" = 1, "saltpetre" = 1, "msg" = 1, "cleaner" = 1, "enzyme" = 1, "mugwort" = 1, "mercury" = 1)
result_amount = 6
required_temp = 374
mix_message = "Tiny cubic crystals precipitate out of the mixture. Huh."
code/modules/reagents/reagent_containers/food/drinks.dm
+2
View File
@@ -270,6 +270,8 @@
New()
..()
reagents.add_reagent("dry_ramen", 30)
if(prob(10))
reagents.add_reagent("enzyme", 3)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
code/modules/reagents/reagent_containers/food/snacks.dm
+2
View File
@@ -589,6 +589,7 @@
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("egg", 5)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent("blackpepper", 1)
bitesize = 1
@@ -602,6 +603,7 @@
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("egg", 5)
/obj/item/weapon/reagent_containers/food/snacks/flour
name = "flour"