mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
File standardisation (#13131)
* Adds the check components * Adds in trailing newlines * Converts all CRLF to LF * Post merge EOF * Post merge line endings * Final commit
This commit is contained in:
@@ -272,4 +272,4 @@
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/beebox/unwrenched
|
||||
anchored = FALSE
|
||||
anchored = FALSE
|
||||
|
||||
@@ -37,4 +37,4 @@
|
||||
reagents.add_reagent(R.id,5)
|
||||
else
|
||||
honey_color = ""
|
||||
update_icon()
|
||||
update_icon()
|
||||
|
||||
@@ -92,4 +92,4 @@
|
||||
/obj/item/reagent_containers/food/snacks/grown/ambrosia/cruciatus
|
||||
seed = /obj/item/seeds/ambrosia/cruciatus
|
||||
wine_power = 0.7
|
||||
tastes = list("ambrosia cruciatus" = 1)
|
||||
tastes = list("ambrosia cruciatus" = 1)
|
||||
|
||||
@@ -49,4 +49,4 @@
|
||||
filling_color = "#F0E68C"
|
||||
bitesize_mod = 2
|
||||
tastes = list("koi" = 1)
|
||||
wine_power = 0.4
|
||||
wine_power = 0.4
|
||||
|
||||
@@ -47,4 +47,4 @@
|
||||
icon_state = "vanillapod"
|
||||
filling_color = "#FFD700"
|
||||
tastes = list("vanilla" = 1)
|
||||
distill_reagent = "vanilla" //Takes longer, but you can get even more vanilla from it.
|
||||
distill_reagent = "vanilla" //Takes longer, but you can get even more vanilla from it.
|
||||
|
||||
@@ -77,4 +77,4 @@
|
||||
throw_range = 3
|
||||
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
|
||||
cotton_type = /obj/item/stack/sheet/cotton/durathread
|
||||
cotton_name = "raw durathread"
|
||||
cotton_name = "raw durathread"
|
||||
|
||||
@@ -47,4 +47,4 @@
|
||||
filling_color = "#F8F8FF"
|
||||
bitesize_mod = 2
|
||||
tastes = list("egg-plant" = 1)
|
||||
distill_reagent = "eggnog"
|
||||
distill_reagent = "eggnog"
|
||||
|
||||
@@ -19,4 +19,4 @@
|
||||
filling_color = "#C0C9A0"
|
||||
bitesize_mod = 2
|
||||
tastes = list("garlic" = 1)
|
||||
wine_power = 0.1
|
||||
wine_power = 0.1
|
||||
|
||||
@@ -52,4 +52,4 @@
|
||||
A.heal_burn = seed.potency
|
||||
to_chat(user, "<span class='notice'>You mash [src] into a poultice.</span>")
|
||||
user.drop_item()
|
||||
qdel(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -161,4 +161,4 @@
|
||||
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime()
|
||||
icon_state = "cherry_bomb_lit"
|
||||
playsound(src, 'sound/goonstation/misc/fuse.ogg', seed.potency, 0)
|
||||
reagents.set_reagent_temp(1000) //Sets off the black powder
|
||||
reagents.set_reagent_temp(1000) //Sets off the black powder
|
||||
|
||||
@@ -23,4 +23,4 @@
|
||||
new /mob/living/simple_animal/diona(get_turf(user))
|
||||
to_chat(user, "<span class='notice'>You crack open [src] letting the nymph out.</span>")
|
||||
user.drop_item()
|
||||
qdel(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -66,4 +66,4 @@
|
||||
icon_state = "onionslice_red"
|
||||
filling_color = "#C29ACF"
|
||||
tastes = list("red onion" = 1, "pungentness" = 3)
|
||||
list_reagents = list("plantmatter" = 5, "vitamin" = 2, "onionjuice" = 2.5)
|
||||
list_reagents = list("plantmatter" = 5, "vitamin" = 2, "onionjuice" = 2.5)
|
||||
|
||||
@@ -23,4 +23,4 @@
|
||||
desc = "Best avoided if you have spess allergies."
|
||||
icon_state = "peanuts"
|
||||
tastes = list("peanut" = 1, "nuttiness" = 1)
|
||||
gender = PLURAL
|
||||
gender = PLURAL
|
||||
|
||||
@@ -30,4 +30,4 @@
|
||||
filling_color = "#F6CB0B"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
tastes = list("pineapple" = 1)
|
||||
wine_power = 0.4
|
||||
wine_power = 0.4
|
||||
|
||||
@@ -67,4 +67,4 @@
|
||||
name = "sweet potato"
|
||||
desc = "It's sweet."
|
||||
tastes = list("sweet potato" = 1)
|
||||
icon_state = "sweetpotato"
|
||||
icon_state = "sweetpotato"
|
||||
|
||||
@@ -92,4 +92,4 @@
|
||||
name = "coffee robusta beans"
|
||||
desc = "Increases robustness by 37 percent!"
|
||||
tastes = list("coffee beans" = 1, "robustness" = 1)
|
||||
icon_state = "coffee_robusta"
|
||||
icon_state = "coffee_robusta"
|
||||
|
||||
@@ -43,4 +43,4 @@
|
||||
icon_state = "stobacco_leaves"
|
||||
tastes = list("space tobacco" = 1)
|
||||
distill_reagent = null
|
||||
wine_power = 0.5
|
||||
wine_power = 0.5
|
||||
|
||||
@@ -197,4 +197,4 @@
|
||||
|
||||
/obj/structure/bonfire/unbuckle_mob(mob/living/buckled_mob, force = FALSE)
|
||||
if(..())
|
||||
buckled_mob.pixel_y -= 13
|
||||
buckled_mob.pixel_y -= 13
|
||||
|
||||
Reference in New Issue
Block a user