mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-17 09:07:10 +01:00
515 Compatibility (#19636)
* 515 compat * double spaces * Callback documentation, aa review * spacing * NAMEOF_STATIC * big beta
This commit is contained in:
@@ -1355,7 +1355,7 @@
|
||||
|
||||
var/minimum_name_percent = 0.35
|
||||
name = ""
|
||||
var/list/names_in_order = sortTim(names, /proc/cmp_numeric_dsc, TRUE)
|
||||
var/list/names_in_order = sortTim(names, GLOBAL_PROC_REF(cmp_numeric_dsc), TRUE)
|
||||
var/named = FALSE
|
||||
for(var/fruit_name in names)
|
||||
if(names[fruit_name] >= minimum_name_percent)
|
||||
@@ -1719,7 +1719,7 @@
|
||||
|
||||
if(current_cycle % 10 != 0 || !isplasmaman(M))
|
||||
return ..()
|
||||
|
||||
|
||||
if(prob(30))
|
||||
var/mob/living/carbon/human/H = M
|
||||
to_chat(M, "<span class='warning'>You expell flaming substance from within your suit.</span>")
|
||||
@@ -1729,7 +1729,7 @@
|
||||
H.adjust_fire_stacks(1)
|
||||
H.IgniteMob()
|
||||
on_fire = TRUE
|
||||
|
||||
|
||||
return ..()
|
||||
|
||||
/datum/reagent/consumable/ethanol/howler
|
||||
@@ -1746,11 +1746,11 @@
|
||||
/datum/reagent/consumable/ethanol/howler/on_mob_life(mob/living/M)
|
||||
if(!isvulpkanin(M))
|
||||
return ..()
|
||||
|
||||
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(H.health > 0)
|
||||
H.adjustToxLoss(-0.5)
|
||||
|
||||
|
||||
return ..()
|
||||
|
||||
/datum/reagent/consumable/ethanol/diona_smash
|
||||
@@ -1772,5 +1772,5 @@
|
||||
to_chat(M, "<span class='warning'>Mmm, tasty.</span>")
|
||||
nutriment_factor = 1 * REAGENTS_METABOLISM
|
||||
mutated = TRUE
|
||||
|
||||
|
||||
return ..()
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
/datum/chemical_reaction/blackpowder_explosion/on_reaction(datum/reagents/holder, created_volume)
|
||||
var/location = get_turf(holder.my_atom)
|
||||
do_sparks(2, 1, location)
|
||||
addtimer(CALLBACK(null, .proc/blackpowder_detonate, holder, created_volume), rand(5, 15))
|
||||
addtimer(CALLBACK(null, GLOBAL_PROC_REF(blackpowder_detonate), holder, created_volume), rand(5, 15))
|
||||
|
||||
/proc/blackpowder_detonate(datum/reagents/holder, created_volume)
|
||||
var/turf/T = get_turf(holder.my_atom)
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
/datum/chemical_reaction/slimemobspawn/proc/summon_mobs(datum/reagents/holder, turf/T)
|
||||
T.visible_message("<span class='danger'>The slime extract begins to vibrate violently!</span>")
|
||||
if(SSmobs.xenobiology_mobs < MAX_GOLD_CORE_MOBS)
|
||||
addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 5, "Gold Slime", HOSTILE_SPAWN, "chemicalsummon", TRUE, TRUE), 50)
|
||||
addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 5, "Gold Slime", HOSTILE_SPAWN, "chemicalsummon", TRUE, TRUE), 50)
|
||||
SSmobs.xenobiology_mobs += 5
|
||||
else
|
||||
T.visible_message("<span class='danger'>The slime extract sputters out, there's too many mobs to make any more!</span>")
|
||||
@@ -116,7 +116,7 @@
|
||||
/datum/chemical_reaction/slimemobspawn/lesser/summon_mobs(datum/reagents/holder, turf/T)
|
||||
T.visible_message("<span class='danger'>The slime extract begins to vibrate violently!</span>")
|
||||
if(SSmobs.xenobiology_mobs < MAX_GOLD_CORE_MOBS)
|
||||
addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 3, "Lesser Gold Slime", HOSTILE_SPAWN, "neutral", TRUE, TRUE), 50)
|
||||
addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 3, "Lesser Gold Slime", HOSTILE_SPAWN, "neutral", TRUE, TRUE), 50)
|
||||
SSmobs.xenobiology_mobs += 3
|
||||
else
|
||||
T.visible_message("<span class='danger'>The slime extract sputters out, there's too many mobs to make any more!</span>")
|
||||
@@ -129,7 +129,7 @@
|
||||
/datum/chemical_reaction/slimemobspawn/friendly/summon_mobs(datum/reagents/holder, turf/T)
|
||||
T.visible_message("<span class='danger'>The slime extract begins to vibrate adorably!</span>")
|
||||
if(SSmobs.xenobiology_mobs < MAX_GOLD_CORE_MOBS)
|
||||
addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 1, "Friendly Gold Slime", FRIENDLY_SPAWN, "neutral", TRUE, TRUE), 50)
|
||||
addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 1, "Friendly Gold Slime", FRIENDLY_SPAWN, "neutral", TRUE, TRUE), 50)
|
||||
SSmobs.xenobiology_mobs += 1
|
||||
else
|
||||
T.visible_message("<span class='danger'>The slime extract sputters out, there's too many mobs to make any more!</span>")
|
||||
@@ -513,7 +513,7 @@
|
||||
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
|
||||
var/obj/item/slime_extract/oil/extract = holder.my_atom
|
||||
extract.visible_message("<span class='danger'>The slime extract begins to vibrate violently!</span>")
|
||||
addtimer(CALLBACK(src, .proc/explode, extract), 5 SECONDS)
|
||||
addtimer(CALLBACK(src, PROC_REF(explode), extract), 5 SECONDS)
|
||||
|
||||
/datum/chemical_reaction/slime_explosion/proc/explode(obj/item/slime_extract/oil/extract)
|
||||
if(QDELETED(extract))
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
|
||||
var/fraction = min(5 / reagents.total_volume, 1)
|
||||
reagents.reaction(M, REAGENT_INGEST, fraction)
|
||||
addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5), 5)
|
||||
addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, trans_to), M, 5), 5)
|
||||
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
|
||||
|
||||
/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
return
|
||||
|
||||
var/contents_log = reagents.reagent_list.Join(", ")
|
||||
INVOKE_ASYNC(src, .proc/spray, A)
|
||||
INVOKE_ASYNC(src, PROC_REF(spray), A)
|
||||
|
||||
playsound(loc, 'sound/effects/spray2.ogg', 50, 1, -6)
|
||||
user.changeNext_move(CLICK_CD_RANGE*2)
|
||||
|
||||
Reference in New Issue
Block a user