cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-icon merge conflicts

Browse Source
This commit is contained in:
DZD
2015-07-10 19:57:59 -04:00
parent d4cf433e7c 43ebf2445d
commit 412443dbf1
412 changed files with 3631 additions and 3603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Holder.dm
+13 -17
View File
@@ -257,7 +257,8 @@ datum
var/matching_container = 0
var/matching_other = 0
var/list/multipliers = new/list()
var/required_temp = C.required_temp
var/min_temp = C.min_temp //Minimum temperature required for the reaction to occur (heat to/above this)
var/max_temp = C.max_temp //Maximum temperature allowed for the reaction to occur (cool to/below this)
for(var/B in C.required_reagents)
if(!has_reagent(B, C.required_reagents[B])) break
total_matching_reagents++
@@ -288,10 +289,10 @@ datum
if(M.Uses > 0) // added a limit to slime cores -- Muskets requested this
matching_other = 1
if(required_temp == 0)
required_temp = chem_temp
if(min_temp == 0)
min_temp = chem_temp
if(total_matching_reagents == total_required_reagents && total_matching_catalysts == total_required_catalysts && matching_container && matching_other && chem_temp >= required_temp)
if(total_matching_reagents == total_required_reagents && total_matching_catalysts == total_required_catalysts && matching_container && matching_other && chem_temp <= max_temp && chem_temp >= min_temp)
var/multiplier = min(multipliers)
var/preserved_data = null
for(var/B in C.required_reagents)
@@ -356,7 +357,7 @@ datum
var/mob/living/M = my_atom
R.reagent_deleted(M)
reagent_list -= A
del(A)
qdel(A)
update_total()
my_atom.on_reagent_change()
check_ignoreslow(my_atom)
@@ -601,12 +602,6 @@ datum
//world << "reagent data set ([reagent_id])"
D.data = new_data
delete()
for(var/datum/reagent/R in reagent_list)
R.holder = null
if(my_atom)
my_atom.reagents = null
copy_data(var/datum/reagent/current_reagent)
if (!current_reagent || !current_reagent.data) return null
if (!istype(current_reagent.data, /list)) return current_reagent.data
@@ -636,10 +631,11 @@ atom/proc/create_reagents(var/max_vol)
reagents.my_atom = src
/datum/reagents/Destroy()
for(var/datum/reagent/reagent in reagent_list)
qdel(reagent)
if(my_atom)
my_atom = null
processing_objects.Remove(src)
for(var/datum/reagent/R in reagent_list)
qdel(R)
reagent_list.Cut()
reagent_list = null
if(my_atom && my_atom.reagents == src)
my_atom.reagents = null
return ..()
code/modules/reagents/Chemistry-Machinery.dm
+3 -3
View File
@@ -95,7 +95,7 @@
/obj/machinery/chem_dispenser/blob_act()
if (prob(50))
del(src)
qdel(src)
/**
* The ui_interact proc is used to open and update Nano UIs
@@ -209,7 +209,7 @@
S.use(1)
else
user.drop_item()
del(B)
qdel(B)
return
if(src.beaker)
@@ -970,7 +970,7 @@
/obj/machinery/reagentgrinder/proc/remove_object(var/obj/item/O)
holdingitems -= O
del(O)
qdel(O)
/obj/machinery/reagentgrinder/proc/juice()
power_change()
code/modules/reagents/Chemistry-Reagents.dm
+6 -9
View File
@@ -428,7 +428,7 @@ datum
M.invisibility = 101
for(var/obj/item/W in M)
if(istype(W, /obj/item/weapon/implant)) //TODO: Carn. give implants a dropped() or something
del(W)
qdel(W)
continue
W.layer = initial(W.layer)
W.loc = M.loc
@@ -440,7 +440,7 @@ datum
M.mind.transfer_to(new_mob)
else
new_mob.key = M.key
del(M)
qdel(M)
..()
return
@@ -834,7 +834,7 @@ datum
I.desc = "Looks like this was \an [O] some time ago."
for(var/mob/M in viewers(5, O))
M << "\red \the [O] melts."
del(O)
qdel(O)
glycerol
name = "Glycerol"
@@ -1118,7 +1118,7 @@ datum
reaction_obj(var/obj/O, var/volume)
if(istype(O,/obj/effect/decal/cleanable))
del(O)
qdel(O)
else
if(O)
O.clean_blood()
@@ -1127,7 +1127,7 @@ datum
T.overlays.Cut()
T.clean_blood()
for(var/obj/effect/decal/cleanable/C in src)
del(C)
qdel(C)
for(var/mob/living/carbon/slime/M in T)
M.adjustToxLoss(rand(5,10))
@@ -3235,8 +3235,5 @@ datum
/datum/reagent/Destroy()
if(holder)
holder.reagent_list -= src
holder = null
holder = null
return ..()
code/modules/reagents/Chemistry-Recipes.dm
+13 -2
View File
@@ -14,7 +14,8 @@ datum
var/result_amount = 0
var/secondary = 0 // set to nonzero if secondary reaction
var/list/secondary_results = list() //additional reagents produced by the reaction
var/required_temp = 0
var/min_temp = 0 //Minimum temperature required for the reaction to occur (heat to/above this). min_temp = 0 means no requirement
var/max_temp = 9999 //Maximum temperature allowed for the reaction to occur (cool to/below this).
var/mix_message = "The solution begins to bubble."
var/mix_sound = 'sound/effects/bubbles.ogg'
var/no_message = 0
@@ -64,6 +65,16 @@ datum
result_amount = 3
*/
ice
name = "Ice"
id = "ice"
result = "ice"
required_reagents = list("water" = 1)
result_amount = 1
max_temp = 273
mix_message = "Ice forms as the water freezes."
mix_sound = null
sterilizine
name = "Sterilizine"
id = "sterilizine"
@@ -352,7 +363,7 @@ datum
result = "diethylamine"
required_reagents = list ("ammonia" = 1, "ethanol" = 1)
result_amount = 2
required_temp = 374
min_temp = 374
mix_message = "A horrible smell pours forth from the mixture."
space_cleaner
code/modules/reagents/dartgun.dm
+4 -4
View File
@@ -155,7 +155,7 @@
cartridge.darts--
src.update_icon()
S.reagents.trans_to(D, S.reagents.total_volume)
del(S)
qdel(S)
D.icon_state = "syringeproj"
D.name = "syringe"
D.flags |= NOREACT
@@ -194,16 +194,16 @@
D.reagents.trans_to(M, 15)
M << "<span class='danger'>You feel a slight prick.</span>"
del(D)
qdel(D)
break
if(D)
for(var/atom/A in D.loc)
if(A == user) continue
if(A.density) del(D)
if(A.density) qdel(D)
sleep(1)
if (D) spawn(10) del(D)
if (D) spawn(10) qdel(D)
return
code/modules/reagents/newchem/drinks.dm
+34 -2
View File
@@ -1,4 +1,4 @@
datum/reagent/ginsonic
/datum/reagent/ginsonic
name = "Gin and sonic"
id = "ginsonic"
description = "GOTTA GET CRUNK FAST BUT LIQUOR TOO SLOW"
@@ -13,7 +13,7 @@ datum/reagent/ginsonic
result_amount = 2
mix_message = "The drink turns electric blue and starts quivering violently."
datum/reagent/ginsonic/on_mob_life(var/mob/living/M as mob)
/datum/reagent/ginsonic/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(prob(10))
M.reagents.add_reagent("methamphetamine",1.2)
@@ -30,3 +30,35 @@ datum/reagent/ginsonic/on_mob_life(var/mob/living/M as mob)
M << "<span class='notice'>Way Past Cool!</span>"
..()
return
/datum/reagent/ethanol/applejack
name = "Applejack"
id = "applejack"
description = "A highly concentrated alcoholic beverage made by repeatedly freezing cider and removing the ice."
color = "#997A00"
slur_start = 30
brawl_start = 40
confused_start = 100
/datum/chemical_reaction/applejack
name = "applejack"
id = "applejack"
result = "applejack"
required_reagents = list("cider" = 2)
max_temp = 270
result_amount = 1
mix_message = "The drink darkens as the water freezes, leaving the concentrated cider behind."
mix_sound = null
/datum/reagent/ethanol/jackrose
name = "Jack Rose"
id = "jackrose"
description = "A classic cocktail that had fallen out of fashion, but never out of taste,"
color = "#664300"
/datum/chemical_reaction/jackrose
name = "jackrose"
id = "jackrose"
result = "jackrose"
required_reagents = list("applejack" = 4, "lemonjuice" = 1)
result_amount = 5
code/modules/reagents/newchem/drugs.dm
+4 -4
View File
@@ -85,7 +85,7 @@
required_reagents = list("diphenhydramine" = 1, "ammonia" = 1, "lithium" = 1, "sacid" = 1, "fuel" = 1)
result_amount = 5
mix_message = "The mixture violently reacts, leaving behind a few crystalline shards."
required_temp = 390
min_temp = 390
/datum/chemical_reaction/crank/on_reaction(var/datum/reagents/holder, var/created_volume)
var/turf/T = get_turf(holder.my_atom)
@@ -150,7 +150,7 @@
required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, "fuel" = 1)
result_amount = 6
mix_message = "The mixture dries into a pale blue powder."
required_temp = 380
min_temp = 380
/datum/reagent/methamphetamine
name = "Methamphetamine"
@@ -228,7 +228,7 @@
result = "methamphetamine"
required_reagents = list("ephedrine" = 1, "iodine" = 1, "phosphorus" = 1, "hydrogen" = 1)
result_amount = 4
required_temp = 374
min_temp = 374
/datum/chemical_reaction/saltpetre
name = "saltpetre"
@@ -279,7 +279,7 @@
result = "bath_salts"
required_reagents = list("????" = 1, "saltpetre" = 1, "msg" = 1, "cleaner" = 1, "enzyme" = 1, "mugwort" = 1, "mercury" = 1)
result_amount = 6
required_temp = 374
min_temp = 374
mix_message = "Tiny cubic crystals precipitate out of the mixture. Huh."
/datum/reagent/bath_salts/overdose_process(var/mob/living/M as mob)
code/modules/reagents/newchem/food.dm
+3 -3
View File
@@ -61,7 +61,7 @@ datum/reagent/corn_starch
result = "corn_syrup"
required_reagents = list("corn_starch" = 1, "sacid" = 1)
result_amount = 2
required_temp = 374
min_temp = 374
mix_message = "The mixture forms a viscous, clear fluid!"
datum/reagent/corn_syrup
@@ -391,7 +391,7 @@ datum/reagent/ectoplasm/reaction_turf(var/turf/T, var/volume)
result = "hydrogenated_soybeanoil"
required_reagents = list("soybeanoil" = 1, "hydrogen" = 1)
result_amount = 2
required_temp = 520
min_temp = 520
mix_message = "The mixture emits a burnt, oily smell."
/datum/reagent/meatslurry
@@ -430,7 +430,7 @@ datum/reagent/ectoplasm/reaction_turf(var/turf/T, var/volume)
result = "gravy"
required_reagents = list("porktonium" = 1, "corn_starch" = 1, "milk" = 1)
result_amount = 3
required_temp = 374
min_temp = 374
mix_message = "The substance thickens and takes on a meaty odor."
/datum/reagent/beff
code/modules/reagents/newchem/medicine.dm
+5 -5
View File
@@ -124,7 +124,7 @@ datum/reagent/charcoal/on_mob_life(var/mob/living/M as mob)
required_reagents = list("ash" = 1, "sodiumchloride" = 1)
result_amount = 2
mix_message = "The mixture yields a fine black powder."
required_temp = 380
min_temp = 380
/datum/chemical_reaction/silver_sulfadiazine
name = "Silver Sulfadiazine"
@@ -210,7 +210,7 @@ datum/reagent/calomel/on_mob_life(var/mob/living/M as mob)
result = "calomel"
required_reagents = list("mercury" = 1, "chlorine" = 1)
result_amount = 2
required_temp = 374
min_temp = 374
mix_message = "Stinging vapors rise from the solution."
datum/reagent/potass_iodide
@@ -349,7 +349,7 @@ datum/reagent/perfluorodecalin/on_mob_life(var/mob/living/carbon/human/M as mob)
result = "perfluorodecalin"
required_reagents = list("hydrogen" = 1, "fluorine" = 1, "oil" = 1)
result_amount = 3
required_temp = 370
min_temp = 370
mix_message = "The mixture rapidly turns into a dense pink liquid."
datum/reagent/ephedrine
@@ -687,7 +687,7 @@ datum/reagent/life
result = null
required_reagents = list("strange_reagent" = 1, "synthflesh" = 1, "blood" = 1)
result_amount = 3
required_temp = 374
min_temp = 374
/datum/chemical_reaction/life/on_reaction(var/datum/reagents/holder, var/created_volume)
chemical_mob_spawn(holder, 1, "Life")
@@ -1007,5 +1007,5 @@ datum/reagent/haloperidol/on_mob_life(var/mob/living/M as mob)
result = "liquid_solder"
required_reagents = list("ethanol" = 1, "copper" = 1, "silver" = 1)
result_amount = 3
required_temp = 370
min_temp = 370
mix_message = "The solution gently swirls with a metallic sheen."
code/modules/reagents/newchem/other.dm
+3 -3
View File
@@ -100,7 +100,7 @@ datum/reagent/acetone
result = "ash"
required_reagents = list("oil" = 1)
result_amount = 0.5
required_temp = 480
min_temp = 480
mix_sound = null
no_message = 1
@@ -142,7 +142,7 @@ datum/reagent/colorful_reagent/reaction_turf(var/turf/T, var/volume)
result = null
required_reagents = list("nutriment" = 1, "colorful_reagent" = 1, "strange_reagent" = 1, "blood" = 1)
result_amount = 3
required_temp = 374
min_temp = 374
datum/reagent/corgium
name = "Corgium"
@@ -164,7 +164,7 @@ datum/reagent/corgium
result = null
required_reagents = list("egg" = 1, "colorful_reagent" = 1, "chicken_soup" = 1, "strange_reagent" = 1, "blood" = 1)
result_amount = 5
required_temp = 374
min_temp = 374
mix_message = "The substance turns an airy sky-blue and foams up into a new shape."
/datum/chemical_reaction/flaptonium/on_reaction(var/datum/reagents/holder, var/created_volume)
code/modules/reagents/newchem/pyro.dm
+7 -7
View File
@@ -34,7 +34,7 @@
result = "clf3"
required_reagents = list("chlorine" = 1, "fluorine" = 3)
result_amount = 2
required_temp = 424
min_temp = 424
/datum/reagent/clf3/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -94,7 +94,7 @@
id = "sorium_vortex"
result = null
required_reagents = list("sorium" = 1)
required_temp = 474
min_temp = 474
/datum/chemical_reaction/sorium_vortex/on_reaction(var/datum/reagents/holder, var/created_volume)
var/turf/simulated/T = get_turf(holder.my_atom)
@@ -126,7 +126,7 @@
id = "ldm_vortex"
result = null
required_reagents = list("liquid_dark_matter" = 1)
required_temp = 474
min_temp = 474
/datum/chemical_reaction/ldm_vortex/on_reaction(var/datum/reagents/holder, var/created_volume)
var/turf/simulated/T = get_turf(holder.my_atom)
@@ -177,7 +177,7 @@
result = null
required_reagents = list("blackpowder" = 1)
result_amount = 1
required_temp = 474
min_temp = 474
no_message = 1
mix_sound = null
@@ -240,7 +240,7 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
id = "flash_powder_flash"
result = null
required_reagents = list("flash_powder" = 1)
required_temp = 374
min_temp = 374
/datum/chemical_reaction/flash_powder_flash/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
@@ -324,7 +324,7 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
name = "smoke_powder_smoke"
id = "smoke_powder_smoke"
required_reagents = list("smoke_powder" = 1)
required_temp = 374
min_temp = 374
secondary = 1
result_amount = 1
forbidden_reagents = list()
@@ -350,7 +350,7 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
id = "sonic_powder_deafen"
result = null
required_reagents = list("sonic_powder" = 1)
required_temp = 374
min_temp = 374
/datum/chemical_reaction/sonic_powder_deafen/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
code/modules/reagents/newchem/toxins.dm
+11 -9
View File
@@ -80,7 +80,7 @@ datum/reagent/formaldehyde/on_mob_life(var/mob/living/M as mob)
result = "formaldehyde"
required_reagents = list("ethanol" = 1, "oxygen" = 1, "silver" = 1)
result_amount = 3
required_temp = 420
min_temp = 420
mix_message = "Ugh, it smells like the morgue in here."
datum/reagent/venom
@@ -141,7 +141,7 @@ datum/reagent/neurotoxin2/on_mob_life(var/mob/living/M as mob)
result = "neurotoxin2"
required_reagents = list("space_drugs" = 1)
result_amount = 1
required_temp = 674
min_temp = 674
mix_sound = null
no_message = 1
@@ -175,7 +175,7 @@ datum/reagent/cyanide/on_mob_life(var/mob/living/M as mob)
result = "cyanide"
required_reagents = list("oil" = 1, "ammonia" = 1, "oxygen" = 1)
result_amount = 3
required_temp = 380
min_temp = 380
mix_message = "The mixture gives off a faint scent of almonds."
@@ -249,7 +249,7 @@ datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
if(method == TOUCH)
if(H.wear_mask)
if(!H.wear_mask.unacidable)
qdel (H.wear_mask)
qdel(H.wear_mask)
H.update_inv_wear_mask()
H << "\red Your mask melts away but protects you from the acid!"
else
@@ -287,7 +287,7 @@ datum/reagent/facid/reaction_obj(var/obj/O, var/volume)
result = "facid"
required_reagents = list("sacid" = 1, "fluorine" = 1, "hydrogen" = 1, "potassium" = 1)
result_amount = 4
required_temp = 380
min_temp = 380
mix_message = "The mixture deepens to a dark blue, and slowly begins to corrode its container."
datum/reagent/initropidril
@@ -519,7 +519,7 @@ datum/reagent/tabun
required_reagents = list("phenol" = 1, "diethylamine" = 1, "phosphorus" = 1, "oxygen" = 1, "chlorine" = 1, "sodiumchloride" = 1, "ethanol" = 1, "cyanide" = 1)
result_amount = 8
mix_message = "The mixture yields a colorless, odorless liquid."
required_temp = 374
min_temp = 374
datum/reagent/tabun/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -574,7 +574,9 @@ datum/reagent/atrazine/reaction_turf(var/turf/T, var/volume)
var/turf/simulated/wall/W = T
if(W.rotting)
W.rotting = 0
for(var/obj/effect/E in W) if(E.name == "Wallrot") del E
for(var/obj/effect/E in W)
if(E.name == "Wallrot")
qdel(E)
for(var/mob/O in viewers(W, null))
O.show_message(text("\blue The fungi are completely dissolved by the solution!"), 1)
@@ -585,9 +587,9 @@ datum/reagent/atrazine/reaction_obj(var/obj/O, var/volume)
alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
alien_weeds.healthcheck()
else if(istype(O,/obj/effect/glowshroom)) //even a small amount is enough to kill it
del(O)
qdel(O)
else if(istype(O,/obj/effect/plant))
if(prob(50)) del(O) //Kills kudzu too.
if(prob(50)) qdel(O) //Kills kudzu too.
// Damage that is done to growing plants is separately at code/game/machinery/hydroponics at obj/item/hydroponics
datum/reagent/atrazine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
code/modules/reagents/reagent_containers.dm
-4
View File
@@ -27,10 +27,6 @@
R.my_atom = src
processing_objects.Add(src)
/obj/item/weapon/reagent_containers/Destroy()
processing_objects.Remove(src)
return ..()
/obj/item/weapon/reagent_containers/process()
if(reagents)
reagents.reagent_on_tick()
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+1 -1
View File
@@ -30,7 +30,7 @@
user.put_in_active_hand(B)
src.transfer_fingerprints_to(B)
del(src)
qdel(src)
/obj/item/weapon/reagent_containers/food/drinks/bottle/attack(mob/living/target as mob, mob/living/user as mob)
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+9 -1
View File
@@ -19,7 +19,7 @@
user.put_in_active_hand(S)
src.transfer_fingerprints_to(S)
del(src)
qdel(src)
attack(mob/living/target as mob, mob/living/user as mob)
@@ -556,6 +556,14 @@
icon_state = "rewriter"
name = "Rewriter"
desc = "The secert of the sanctuary of the Libarian..."
if("applejack")
icon_state = "cognacglass"
name = "Glass of applejack"
desc = "When cider isn't strong enough, you gotta jack it."
if("jackrose")
icon_state = "patronglass"
name = "Jack Rose"
desc = "Drinking this makes you feel like you belong in a luxury hotel bar during the 1920s."
else
icon_state ="glass_brown"
name = "Glass of ..what?"
code/modules/reagents/reagent_containers/food/snacks.dm
+14 -14
View File
@@ -30,7 +30,7 @@
usr.put_in_hands(TrashItem)
else if(istype(trash,/obj/item))
usr.put_in_hands(trash)
del(src)
qdel(src)
return
/obj/item/weapon/reagent_containers/food/snacks/attack_self(mob/user as mob)
@@ -40,7 +40,7 @@
if(!reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it.
user << "\red None of [src] left, oh no!"
M.unEquip(src) //so icons update :[
del(src)
qdel(src)
return 0
if(istype(M, /mob/living/carbon))
@@ -169,7 +169,7 @@
reagents.trans_to(U,min(reagents.total_volume,5))
if (reagents.total_volume <= 0)
del(src)
qdel(src)
return
if((slices_num <= 0 || !slices_num) || !slice_path)
@@ -227,7 +227,7 @@
for(var/i=1 to (slices_num-slices_lost))
var/obj/slice = new slice_path (src.loc)
reagents.trans_to(slice,reagents_per_slice)
del(src)
qdel(src)
return
@@ -246,7 +246,7 @@
playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
var/mob/living/simple_animal/pet/corgi/C = M
C.health = min(C.health + 5, C.maxHealth)
del(src)
qdel(src)
else
M.visible_message("[M] takes a bite of \the [src].","<span class=\"notice\">You take a bite of \the [src].")
playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
@@ -541,7 +541,7 @@
new/obj/effect/decal/cleanable/egg_smudge(src.loc)
src.reagents.reaction(hit_atom, TOUCH)
src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
del(src)
qdel(src)
attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype( W, /obj/item/toy/crayon ))
@@ -1019,7 +1019,7 @@
..()
new/obj/effect/decal/cleanable/pie_smudge(src.loc)
src.visible_message("\red [src.name] splats.","\red You hear a splat.")
del(src)
qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/berryclafoutis
name = "Berry Clafoutis"
@@ -1731,7 +1731,7 @@
M << "\red \The [src] expands!"
var/mob/living/carbon/human/H = new (src)
H.set_species(monkey_type)
del(src)
qdel(src)
proc/Unwrap(mob/user as mob)
icon_state = "monkeycube"
@@ -2308,7 +2308,7 @@
"\blue You flatten the dough with your rolling pin!" \
)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough(src.loc)
del(src)
qdel(src)
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
@@ -3253,16 +3253,16 @@
if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/egg))
new /obj/item/weapon/reagent_containers/food/snacks/dough(src)
user << "You make some dough."
del(W)
del(src)
qdel(W)
qdel(src)
// Egg + flour = dough
/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/flour))
new /obj/item/weapon/reagent_containers/food/snacks/dough(src)
user << "You make some dough."
del(W)
del(src)
qdel(W)
qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/dough
name = "dough"
@@ -3382,7 +3382,7 @@
if(istype(W,/obj/item/weapon/kitchen/utensil/knife))
new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(src)
user << "You cut the potato."
del(src)
qdel(src)
else
..()
code/modules/reagents/reagent_containers/food/snacks/meat.dm
+1 -1
View File
@@ -15,7 +15,7 @@
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
user << "You cut the meat in thin strips."
del(src)
qdel(src)
else
..()
code/modules/reagents/reagent_containers/glass_containers.dm
+1 -1
View File
@@ -346,7 +346,7 @@
attackby(var/obj/D, mob/user as mob, params)
if(isprox(D))
user << "You add [D] to [src]."
del(D)
qdel(D)
user.put_in_hands(new /obj/item/weapon/bucket_sensor)
user.unEquip(src)
qdel(src)
code/modules/reagents/reagent_containers/spray.dm
+2 -2
View File
@@ -71,7 +71,7 @@
for(var/atom/T in get_turf(D))
D.reagents.reaction(T)
sleep(3)
del(D)
qdel(D)
/obj/item/weapon/reagent_containers/spray/attack_self(var/mob/user)
@@ -200,7 +200,7 @@
for(var/atom/t in get_turf(D))
D.reagents.reaction(t)
sleep(2)
del(D)
qdel(D)
code/modules/reagents/reagent_containers/syringes.dm
+1 -1
View File
@@ -305,7 +305,7 @@
for(var/mob/O in viewers(world.view, user))
O.show_message(text("\red <B>[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!</B>"), 1)
user.unEquip(src)
del(src)
qdel(src)
return
for(var/mob/O in viewers(world.view, user))
code/modules/reagents/syringe_gun.dm
+1 -1
View File
@@ -25,7 +25,7 @@
in_chamber.name = S.name
syringes.Remove(S)
del(S)
qdel(S)
return 1
/obj/item/weapon/gun/syringe/examine()