cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Annihilates the blackbox (#15132)

Browse Source 
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
This commit is contained in:
AffectedArc07
2020-12-24 16:06:48 -05:00
committed by GitHub
parent 0358ff3644
commit 8f72d7556e
130 changed files with 1907 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/holder.dm
+1 -1
View File
@@ -439,7 +439,7 @@
var/created_volume = C.result_amount*multiplier
if(C.result)
feedback_add_details("chemical_reaction","[C.result]|[C.result_amount*multiplier]")
SSblackbox.record_feedback("tally", "chemical_reaction", C.result_amount * multiplier, C.result)
multiplier = max(multiplier, 1) //this shouldnt happen ...
add_reagent(C.result, C.result_amount*multiplier)
set_data(C.result, preserved_data)
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+39 -39
View File
@@ -10,7 +10,7 @@
required_other = 1
/datum/chemical_reaction/slimespawn/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/mob/living/simple_animal/slime/S = new(get_turf(holder.my_atom), "grey")
S.visible_message("<span class='danger'>Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!</span>")
@@ -24,7 +24,7 @@
required_container = /obj/item/slime_extract/grey
/datum/chemical_reaction/slimeinaprov/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
/datum/chemical_reaction/slimemonkey
name = "Slime Monkey"
@@ -36,7 +36,7 @@
required_other = 1
/datum/chemical_reaction/slimemonkey/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
for(var/i = 1, i <= 3, i++)
var/obj/item/reagent_containers/food/snacks/monkeycube/M = new /obj/item/reagent_containers/food/snacks/monkeycube
M.forceMove(get_turf(holder.my_atom))
@@ -52,7 +52,7 @@
required_container = /obj/item/slime_extract/green
/datum/chemical_reaction/slimemutate/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
//Metal
/datum/chemical_reaction/slimemetal
@@ -65,7 +65,7 @@
required_other = 1
/datum/chemical_reaction/slimemetal/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/turf/location = get_turf(holder.my_atom)
new /obj/item/stack/sheet/plasteel (location, 5)
new /obj/item/stack/sheet/metal (location, 15)
@@ -80,7 +80,7 @@
required_other = 1
/datum/chemical_reaction/slimeglass/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/turf/location = get_turf(holder.my_atom)
new /obj/item/stack/sheet/rglass (location, 5)
new /obj/item/stack/sheet/glass (location, 15)
@@ -96,7 +96,7 @@
required_other = TRUE
/datum/chemical_reaction/slimemobspawn/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used", "[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/turf/T = get_turf(holder.my_atom)
summon_mobs(holder, T)
@@ -134,7 +134,7 @@
/datum/chemical_reaction/slimebork/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/list/blocked = list(/obj/item/reagent_containers/food/snacks,
/obj/item/reagent_containers/food/snacks/breadslice,
/obj/item/reagent_containers/food/snacks/sliceable,
@@ -180,7 +180,7 @@
/datum/chemical_reaction/slimebork2/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/list/borks = subtypesof(/obj/item/reagent_containers/food/drinks)
var/list/blocked = list(/obj/item/reagent_containers/food/drinks/cans/adminbooze,
/obj/item/reagent_containers/food/drinks/cans/madminmalt,
@@ -225,7 +225,7 @@
required_other = 1
/datum/chemical_reaction/slimefrost/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
/datum/chemical_reaction/slimestabilizer
name = "Slime Stabilizer"
@@ -237,7 +237,7 @@
required_other = 1
/datum/chemical_reaction/slimestabilizer/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/slimepotion/slime/stabilizer/P = new /obj/item/slimepotion/slime/stabilizer
P.forceMove(get_turf(holder.my_atom))
@@ -252,7 +252,7 @@
required_other = 1
/datum/chemical_reaction/slimefreeze/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='danger'>The slime extract begins to vibrate adorably !</span>")
spawn(50)
@@ -273,7 +273,7 @@
required_other = 1
/datum/chemical_reaction/slimefireproof/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/slimepotion/fireproof/P = new /obj/item/slimepotion/fireproof
P.forceMove(get_turf(holder.my_atom))
@@ -288,7 +288,7 @@
required_other = 1
/datum/chemical_reaction/slimecasp/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
/datum/chemical_reaction/slimefire
name = "Slime fire"
@@ -300,7 +300,7 @@
required_other = 1
/datum/chemical_reaction/slimefire/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/turf/TU = get_turf(holder.my_atom)
TU.visible_message("<span class='danger'>The slime extract begins to vibrate adorably !</span>")
spawn(50)
@@ -321,7 +321,7 @@
required_other = 1
/datum/chemical_reaction/slimeoverload/on_reaction(datum/reagents/holder, created_volume)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
empulse(get_turf(holder.my_atom), 3, 7, 1)
@@ -335,7 +335,7 @@
required_other = 1
/datum/chemical_reaction/slimecell/on_reaction(datum/reagents/holder, created_volume)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/stock_parts/cell/high/slime/P = new /obj/item/stock_parts/cell/high/slime
P.forceMove(get_turf(holder.my_atom))
@@ -349,7 +349,7 @@
required_other = 1
/datum/chemical_reaction/slimeglow/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='danger'>The slime begins to emit a soft light. Squeezing it will cause it to grow brightly.</span>")
var/obj/item/flashlight/slime/F = new /obj/item/flashlight/slime
@@ -367,7 +367,7 @@
required_other = 1
/datum/chemical_reaction/slimepsteroid/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/slimepotion/slime/steroid/P = new /obj/item/slimepotion/slime/steroid
P.forceMove(get_turf(holder.my_atom))
@@ -381,7 +381,7 @@
required_other = 1
/datum/chemical_reaction/slimejam/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
//Dark Purple
@@ -395,7 +395,7 @@
required_other = 1
/datum/chemical_reaction/slimeplasma/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/turf/location = get_turf(holder.my_atom)
new /obj/item/stack/sheet/mineral/plasma (location, 3)
@@ -410,7 +410,7 @@
required_other = 1
/datum/chemical_reaction/slimemutator/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/slimepotion/slime/mutator/P = new /obj/item/slimepotion/slime/mutator
P.forceMove(get_turf(holder.my_atom))
@@ -424,7 +424,7 @@
required_other = 1
/datum/chemical_reaction/slimebloodlust/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null))
if(slime.docile) //Undoes docility, but doesn't make rabid.
slime.visible_message("<span class='danger'>[slime] forgets its training, becoming wild once again!</span>")
@@ -445,7 +445,7 @@
required_other = 1
/datum/chemical_reaction/slimespeed/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/slimepotion/speed/P = new /obj/item/slimepotion/speed
P.forceMove(get_turf(holder.my_atom))
@@ -461,7 +461,7 @@
required_other = 1
/datum/chemical_reaction/docility/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/slimepotion/slime/docility/P = new /obj/item/slimepotion/slime/docility
P.forceMove(get_turf(holder.my_atom))
@@ -477,7 +477,7 @@
required_container = /obj/item/slime_extract/black
/datum/chemical_reaction/slimemutate2/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
//Oil
/datum/chemical_reaction/slimeexplosion
@@ -490,7 +490,7 @@
required_other = 1
/datum/chemical_reaction/slimeexplosion/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='danger'>The slime extract begins to vibrate violently !</span>")
spawn(50)
@@ -508,7 +508,7 @@
required_other = 1
/datum/chemical_reaction/slimepotion2/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/slimepotion/sentience/P = new /obj/item/slimepotion/sentience
P.forceMove(get_turf(holder.my_atom))
@@ -523,7 +523,7 @@
required_other = 1
/datum/chemical_reaction/slimegolem/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
new /obj/item/stack/sheet/mineral/adamantine(get_turf(holder.my_atom))
//Bluespace
@@ -537,7 +537,7 @@
required_other = 1
/datum/chemical_reaction/slimefloor2/on_reaction(datum/reagents/holder, created_volume)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/stack/tile/bluespace/P = new /obj/item/stack/tile/bluespace
P.amount = 25
P.forceMove(get_turf(holder.my_atom))
@@ -553,7 +553,7 @@
required_other = 1
/datum/chemical_reaction/slimecrystal/on_reaction(datum/reagents/holder, created_volume)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
if(holder.my_atom)
var/obj/item/stack/ore/bluespace_crystal/BC = new(get_turf(holder.my_atom))
BC.visible_message("<span class='notice'>The [BC.name] appears out of thin air!</span>")
@@ -569,7 +569,7 @@
required_other = 1
/datum/chemical_reaction/slimepsteroid2/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/slimepotion/enhancer/P = new /obj/item/slimepotion/enhancer
P.forceMove(get_turf(holder.my_atom))
@@ -585,7 +585,7 @@
required_other = 1
/datum/chemical_reaction/slime_territory/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/areaeditor/blueprints/slime/P = new /obj/item/areaeditor/blueprints/slime
P.forceMove(get_turf(holder.my_atom))
@@ -600,7 +600,7 @@
required_other = 1
/datum/chemical_reaction/slimestop/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/mob/mob = get_mob_by_key(holder.my_atom.fingerprintslast)
var/obj/effect/timestop/T = new /obj/effect/timestop
T.forceMove(get_turf(holder.my_atom))
@@ -618,7 +618,7 @@
required_other = 1
/datum/chemical_reaction/slimecamera/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/camera/P = new /obj/item/camera
P.forceMove(get_turf(holder.my_atom))
var/obj/item/camera_film/Z = new /obj/item/camera_film
@@ -634,7 +634,7 @@
required_other = 1
/datum/chemical_reaction/slimefloor/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/stack/tile/sepia/P = new /obj/item/stack/tile/sepia
P.amount = 25
P.forceMove(get_turf(holder.my_atom))
@@ -653,7 +653,7 @@
required_other = 1
/datum/chemical_reaction/slimepaint/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/list/paints = subtypesof(/obj/item/reagent_containers/glass/paint)
var/chosen = pick(paints)
var/obj/P = new chosen
@@ -671,7 +671,7 @@
required_container = /obj/item/slime_extract/rainbow
/datum/chemical_reaction/slimeRNG/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/mob/living/simple_animal/slime/random/S = new (get_turf(holder.my_atom))
S.visible_message("<span class='danger'>Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!</span>")
@@ -685,6 +685,6 @@
required_container = /obj/item/slime_extract/rainbow
/datum/chemical_reaction/slime_transfer/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/obj/item/slimepotion/transference/P = new /obj/item/slimepotion/transference
P.forceMove(get_turf(holder.my_atom))