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

modules misc (#18315)

Browse Source
This commit is contained in:
KalevTait
2022-07-20 22:56:34 +02:00
committed by GitHub
parent 234a471cf9
commit 938135f3d8
48 changed files with 214 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/pandemic.dm
+2 -2
View File
@@ -1,8 +1,8 @@
/obj/machinery/computer/pandemic
name = "PanD.E.M.I.C 2200"
desc = "Used to work with viruses."
density = 1
anchored = 1
density = TRUE
anchored = TRUE
icon = 'icons/obj/chemical.dmi'
icon_state = "mixer0"
circuit = /obj/item/circuitboard/pandemic
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+6 -6
View File
@@ -3,13 +3,13 @@
icon = 'icons/obj/kitchen.dmi'
icon_state = "juicer1"
layer = 2.9
anchored = 1
anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 100
pass_flags = PASSTABLE
resistance_flags = ACID_PROOF
var/operating = 0
var/operating = FALSE
var/obj/item/reagent_containers/beaker = new /obj/item/reagent_containers/glass/beaker/large
var/limit = null
var/efficiency = null
@@ -375,11 +375,11 @@
playsound(src.loc, 'sound/machines/juicer.ogg', 20, 1)
var/offset = prob(50) ? -2 : 2
animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) //start shaking
operating = 1
operating = TRUE
updateUsrDialog()
spawn(50)
pixel_x = initial(pixel_x) //return to its spot after shaking
operating = 0
operating = FALSE
updateUsrDialog()
//Snacks
@@ -413,11 +413,11 @@
playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
var/offset = prob(50) ? -2 : 2
animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) //start shaking
operating = 1
operating = TRUE
updateUsrDialog()
spawn(60)
pixel_x = initial(pixel_x) //return to its spot after shaking
operating = 0
operating = FALSE
updateUsrDialog()
//Snacks and Plants
code/modules/reagents/chemistry/recipes.dm
+1 -1
View File
@@ -8,7 +8,7 @@
// Both of these variables are mostly going to be used with slime cores - but if you want to, you can use them for other things
var/atom/required_container = null // the container required for the reaction to happen
var/required_other = 0 // an integer required for the reaction to happen
var/required_other = FALSE // extra requirements for the reaction to happen
var/result_amount = 0
var/list/secondary_results = list() //additional reagents produced by the reaction
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+39 -39
View File
@@ -7,7 +7,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/grey
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimespawn/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -20,7 +20,7 @@
result = "epinephrine"
required_reagents = list("water" = 5)
result_amount = 3
required_other = 1
required_other = TRUE
required_container = /obj/item/slime_extract/grey
/datum/chemical_reaction/slimeinaprov/on_reaction(datum/reagents/holder)
@@ -33,7 +33,7 @@
required_reagents = list("blood" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/grey
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimemonkey/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -48,7 +48,7 @@
result = "mutationtoxin"
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_other = 1
required_other = TRUE
required_container = /obj/item/slime_extract/green
/datum/chemical_reaction/slimemutate/on_reaction(datum/reagents/holder)
@@ -62,7 +62,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/metal
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimemetal/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -77,7 +77,7 @@
required_reagents = list("water" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/metal
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimeglass/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -142,7 +142,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/silver
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimebork/on_reaction(datum/reagents/holder)
@@ -188,7 +188,7 @@
required_reagents = list("water" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/silver
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimebork2/on_reaction(datum/reagents/holder)
@@ -234,7 +234,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 10
required_container = /obj/item/slime_extract/blue
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimefrost/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -246,7 +246,7 @@
required_reagents = list("blood" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/blue
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimestabilizer/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -261,7 +261,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/darkblue
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimefreeze/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -282,7 +282,7 @@
required_reagents = list("water" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/darkblue
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimefireproof/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -297,7 +297,7 @@
required_reagents = list("blood" = 1)
result_amount = 10
required_container = /obj/item/slime_extract/orange
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimecasp/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -309,7 +309,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/orange
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimefire/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -330,7 +330,7 @@
required_reagents = list("blood" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/yellow
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimeoverload/on_reaction(datum/reagents/holder, created_volume)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -344,7 +344,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/yellow
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimecell/on_reaction(datum/reagents/holder, created_volume)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -358,7 +358,7 @@
required_reagents = list("water" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/yellow
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimeglow/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -376,7 +376,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/purple
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimepsteroid/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -390,7 +390,7 @@
required_reagents = list("sugar" = 1)
result_amount = 10
required_container = /obj/item/slime_extract/purple
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimejam/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -404,7 +404,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/darkpurple
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimeplasma/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -419,7 +419,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/red
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimemutator/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -433,7 +433,7 @@
required_reagents = list("blood" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/red
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimebloodlust/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -443,7 +443,7 @@
slime.docile = FALSE
slime.update_name()
continue
slime.rabid = 1
slime.rabid = TRUE
slime.visible_message("<span class='danger'>[slime] is driven into a frenzy!</span>")
@@ -454,7 +454,7 @@
required_reagents = list("water" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/red
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimespeed/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -470,7 +470,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/pink
required_other = 1
required_other = TRUE
/datum/chemical_reaction/docility/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -485,7 +485,7 @@
result = "amutationtoxin"
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_other = 1
required_other = TRUE
required_container = /obj/item/slime_extract/black
/datum/chemical_reaction/slimemutate2/on_reaction(datum/reagents/holder)
@@ -499,7 +499,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/oil
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slime_explosion/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -524,7 +524,7 @@
result_amount = 1
required_container = /obj/item/slime_extract/lightpink
required_reagents = list("plasma_dust" = 1)
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimepotion2/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -539,7 +539,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/adamantine
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimegolem/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -553,7 +553,7 @@
required_reagents = list("blood" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/bluespace
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimefloor2/on_reaction(datum/reagents/holder, created_volume)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -569,7 +569,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/bluespace
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimecrystal/on_reaction(datum/reagents/holder, created_volume)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -585,7 +585,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/cerulean
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimepsteroid2/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -601,7 +601,7 @@
required_reagents = list("blood" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/cerulean
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slime_territory/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -616,7 +616,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/sepia
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimestop/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -634,7 +634,7 @@
required_reagents = list("water" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/sepia
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimecamera/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -650,7 +650,7 @@
required_reagents = list("blood" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/sepia
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimefloor/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -669,7 +669,7 @@
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_container = /obj/item/slime_extract/pyrite
required_other = 1
required_other = TRUE
/datum/chemical_reaction/slimepaint/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
@@ -686,7 +686,7 @@
result = null
required_reagents = list("plasma_dust" = 1)
result_amount = 1
required_other = 1
required_other = TRUE
required_container = /obj/item/slime_extract/rainbow
/datum/chemical_reaction/slimeRNG/on_reaction(datum/reagents/holder)
@@ -700,7 +700,7 @@
result = null
required_reagents = list("blood" = 1)
result_amount = 1
required_other = 1
required_other = TRUE
required_container = /obj/item/slime_extract/rainbow
/datum/chemical_reaction/slime_transfer/on_reaction(datum/reagents/holder)