Merge pull request #4877 from Novacat/nova-pathfinder

Lynx Fixes Runtimes
This commit is contained in:
Novacat
2019-03-29 09:02:14 -04:00
committed by GitHub
15 changed files with 57 additions and 57 deletions
@@ -157,7 +157,7 @@
if(co != null) carbon_amt = co
..()
/obj/effect/spawner/newbomb/New(newloc)
/obj/effect/spawner/newbomb/Initialize(newloc) //VOREStation Edit
..(newloc)
var/obj/item/device/transfer_valve/V = new(src.loc)
@@ -83,7 +83,7 @@
icon_state = "jetpack-void"
item_state_slots = list(slot_r_hand_str = "jetpack-void", slot_l_hand_str = "jetpack-void")
/obj/item/weapon/tank/jetpack/void/New()
/obj/item/weapon/tank/jetpack/void/Initialize() //VOREStation Edit
..()
air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return
@@ -94,7 +94,7 @@
icon_state = "jetpack"
item_state_slots = list(slot_r_hand_str = "jetpack", slot_l_hand_str = "jetpack")
/obj/item/weapon/tank/jetpack/oxygen/New()
/obj/item/weapon/tank/jetpack/oxygen/Initialize() //VOREStation Edit
..()
air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return
@@ -106,7 +106,7 @@
icon_state = "jetpack-black"
item_state_slots = list(slot_r_hand_str = "jetpack-black", slot_l_hand_str = "jetpack-black")
/obj/item/weapon/tank/jetpack/carbondioxide/New()
/obj/item/weapon/tank/jetpack/carbondioxide/Initialize() //VOREStation Edit
..()
air_contents.adjust_gas("carbon_dioxide", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return
@@ -48,7 +48,6 @@
update_icon()
if(always_process)
START_PROCESSING(SSobj, src)
..()
/obj/item/weapon/weldingtool/Destroy()
if(welding || always_process)
+6 -6
View File
@@ -31,7 +31,7 @@
icon_state = "space_mountain_wind"
center_of_mass = list("x"=16, "y"=10)
/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind/New()
/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind/Initialize()
..()
reagents.add_reagent("spacemountainwind", 30)
@@ -51,7 +51,7 @@
icon_state = "dr_gibb"
center_of_mass = list("x"=16, "y"=10)
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb/New()
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb/Initialize()
..()
reagents.add_reagent("dr_gibb", 30)
@@ -71,7 +71,7 @@
icon_state = "space-up"
center_of_mass = list("x"=16, "y"=10)
/obj/item/weapon/reagent_containers/food/drinks/cans/space_up/New()
/obj/item/weapon/reagent_containers/food/drinks/cans/space_up/Initialize()
..()
reagents.add_reagent("space_up", 30)
@@ -81,7 +81,7 @@
icon_state = "lemon-lime"
center_of_mass = list("x"=16, "y"=10)
/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_lime/New()
/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_lime/Initialize()
..()
reagents.add_reagent("lemon_lime", 30)
@@ -91,7 +91,7 @@
icon_state = "ice_tea_can"
center_of_mass = list("x"=16, "y"=10)
/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea/New()
/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea/Initialize()
..()
reagents.add_reagent("icetea", 30)
@@ -101,7 +101,7 @@
icon_state = "purple_can"
center_of_mass = list("x"=16, "y"=10)
/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice/New()
/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice/Initialize()
..()
reagents.add_reagent("grapejuice", 30)
+2 -2
View File
@@ -189,7 +189,7 @@
item_state = "coffee"
center_of_mass = list("x"=15, "y"=13)
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate/New()
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate/Initialize() //VOREStation Edit
..()
reagents.add_reagent("hot_coco", 30)
@@ -198,7 +198,7 @@
desc = "Just add 10ml water, self heats! A taste that reminds you of your school years."
icon_state = "ramen"
center_of_mass = list("x"=16, "y"=11)
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen/New()
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen/Initialize() //VOREStation Edit
..()
reagents.add_reagent("dry_ramen", 30)
+2 -2
View File
@@ -383,7 +383,7 @@
icon_state = "space-up_bottle"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up/New()
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up/Initialize()
..()
reagents.add_reagent("space_up", 100)
@@ -393,7 +393,7 @@
icon_state = "space_mountain_wind_bottle"
center_of_mass = list("x"=16, "y"=6)
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind/New()
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize()
..()
reagents.add_reagent("spacemountainwind", 100)
+6 -6
View File
@@ -344,7 +344,7 @@
nutriment_amt = 4
nutriment_desc = list("candy corn" = 4)
/obj/item/weapon/reagent_containers/food/snacks/candy_corn/New()
/obj/item/weapon/reagent_containers/food/snacks/candy_corn/Initialize()
..()
reagents.add_reagent("sugar", 2)
bitesize = 2
@@ -1175,7 +1175,7 @@
nutriment_amt = 5
nutriment_desc = list("sweetness" = 3, "mushroom" = 3, "pie" = 2)
/obj/item/weapon/reagent_containers/food/snacks/amanita_pie/New()
/obj/item/weapon/reagent_containers/food/snacks/amanita_pie/Initialize()
..()
reagents.add_reagent("amatoxin", 3)
reagents.add_reagent("psilocybin", 1)
@@ -1190,7 +1190,7 @@
nutriment_amt = 8
nutriment_desc = list("heartiness" = 2, "mushroom" = 3, "pie" = 3)
/obj/item/weapon/reagent_containers/food/snacks/plump_pie/New()
/obj/item/weapon/reagent_containers/food/snacks/plump_pie/Initialize()
..()
if(prob(10))
name = "exceptional plump pie"
@@ -1316,7 +1316,7 @@
filling_color = "#631212"
center_of_mass = list("x"=15, "y"=9)
/obj/item/weapon/reagent_containers/food/snacks/sosjerky/New()
/obj/item/weapon/reagent_containers/food/snacks/sosjerky/Initialize()
..()
reagents.add_reagent("protein", 4)
bitesize = 2
@@ -1331,7 +1331,7 @@
nutriment_amt = 6
nutriment_desc = list("dried raisins" = 6)
/obj/item/weapon/reagent_containers/food/snacks/no_raisin/New()
/obj/item/weapon/reagent_containers/food/snacks/no_raisin/Initialize()
..()
reagents.add_reagent("nutriment", 6)
@@ -3611,7 +3611,7 @@
filling_color = "#631212"
center_of_mass = list("x"=15, "y"=9)
/obj/item/weapon/reagent_containers/food/snacks/unajerky/New()
/obj/item/weapon/reagent_containers/food/snacks/unajerky/Initialize()
..()
reagents.add_reagent("protein", 8)
reagents.add_reagent("capsaicin", 2)
+30 -30
View File
@@ -10,7 +10,7 @@
nutriment_amt = 5
nutriment_desc = list("gargonzola" = 2, "burning" = 2)
/obj/item/weapon/reagent_containers/food/snacks/my_new_food/New()
/obj/item/weapon/reagent_containers/food/snacks/my_new_food/Initialize()
..()
reagents.add_reagent("protein", 2) //For meaty things.
bitesize = 3 //How many reagents to transfer per bite?
@@ -26,7 +26,7 @@
nutriment_desc = list("rice" = 5, "fish" = 5)
nutriment_amt = 15
/obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi/New()
/obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi/Initialize()
..()
reagents.add_reagent("protein", 10)
bitesize = 5
@@ -51,7 +51,7 @@
nutriment_amt = 5
nutriment_desc = list("tomato" = 4, "meat" = 2)
/obj/item/weapon/reagent_containers/food/snacks/lasagna/New()
/obj/item/weapon/reagent_containers/food/snacks/lasagna/Initialize()
..()
reagents.add_reagent("protein", 2) //For meaty things.
@@ -65,7 +65,7 @@
nutriment_amt = 6
nutriment_desc = list("meat" = 2, "vegetables" = 2, "seasoning" = 5)
/obj/item/weapon/reagent_containers/food/snacks/goulash/New()
/obj/item/weapon/reagent_containers/food/snacks/goulash/Initialize()
..()
reagents.add_reagent("protein", 3) //For meaty things.
reagents.add_reagent("water", 5)
@@ -79,7 +79,7 @@
nutriment_amt = 5
nutriment_desc = list("vegetables" = 2, "seasoned meat" = 5)
/obj/item/weapon/reagent_containers/food/snacks/donerkebab/New()
/obj/item/weapon/reagent_containers/food/snacks/donerkebab/Initialize()
..()
reagents.add_reagent("protein", 2) //For meaty things.
@@ -93,7 +93,7 @@
nutriment_amt = 8
nutriment_desc = list("cooked meat" = 5)
/obj/item/weapon/reagent_containers/food/snacks/roastbeef/New()
/obj/item/weapon/reagent_containers/food/snacks/roastbeef/Initialize()
..()
reagents.add_reagent("protein", 4) //For meaty things.
bitesize = 2
@@ -107,7 +107,7 @@
nutriment_amt = 3
nutriment_desc = list("chocolate" = 4, "colors" = 2)
/obj/item/weapon/reagent_containers/food/snacks/reishicup/New()
/obj/item/weapon/reagent_containers/food/snacks/reishicup/Initialize()
..()
reagents.add_reagent("psilocybin", 3)
bitesize = 6
@@ -122,7 +122,7 @@
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/chickenwing)
foldable = null
/obj/item/weapon/storage/box/wings/New()
/obj/item/weapon/storage/box/wings/Initialize()
..()
for(var/i=1 to startswith)
new /obj/item/weapon/reagent_containers/food/snacks/chickenwing(src)
@@ -143,7 +143,7 @@
nutriment_amt = 2
nutriment_desc = list("chicken" = 2, "unplacable flavor sauce" = 4)
/obj/item/weapon/reagent_containers/food/snacks/chickenwing/New()
/obj/item/weapon/reagent_containers/food/snacks/chickenwing/Initialize()
..()
reagents.add_reagent("protein", 1)
bitesize = 3
@@ -158,7 +158,7 @@
nutriment_amt = 6
nutriment_desc = list("spicyness" = 4, "sourness" = 4, "tofu" = 1)
/obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup/New()
/obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup/Initialize()
..()
bitesize = 2
@@ -172,7 +172,7 @@
nutriment_amt = 6
nutriment_desc = list("fried egg" = 2, "egg noodles" = 4)
/obj/item/weapon/reagent_containers/food/snacks/kitsuneudon/New()
/obj/item/weapon/reagent_containers/food/snacks/kitsuneudon/Initialize()
..()
bitesize = 2
@@ -185,7 +185,7 @@
nutriment_amt = 6
nutriment_desc = list("sweet and spicy sauce" = 5, "chicken" = 3)
/obj/item/weapon/reagent_containers/food/snacks/generalschicken/New()
/obj/item/weapon/reagent_containers/food/snacks/generalschicken/Initialize()
..()
reagents.add_reagent("protein", 4)
bitesize = 2
@@ -197,7 +197,7 @@
icon_state = "grubmeat"
center_of_mass = list("x"=16, "y"=10)
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat/New()
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat/Initialize()
..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("shockchem", 6)
@@ -214,7 +214,7 @@
nutriment_amt = 1
nutriment_desc = list("crunchy shell bits" = 5)
/obj/item/weapon/reagent_containers/food/snacks/bugball/New()
/obj/item/weapon/reagent_containers/food/snacks/bugball/Initialize()
..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("carbon", 5)
@@ -229,7 +229,7 @@
nutriment_amt = 3
nutriment_desc = list("sparkles" = 5, "ancient inca culture" =3)
/obj/item/weapon/reagent_containers/food/snacks/pillbug/New()
/obj/item/weapon/reagent_containers/food/snacks/pillbug/Initialize()
..()
reagents.add_reagent("protein", 3)
reagents.add_reagent("shockchem", 6)
@@ -243,7 +243,7 @@
nutriment_amt = 1
nutriment_desc = list("crunchy shell bits" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pillbug/New()
/obj/item/weapon/reagent_containers/food/snacks/pillbug/Initialize()
..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("carbon", 5)
@@ -258,7 +258,7 @@
nutriment_amt = 3
nutriment_desc = list("brothy sweet goodness" = 5)
/obj/item/weapon/reagent_containers/food/snacks/mammi/New()
/obj/item/weapon/reagent_containers/food/snacks/mammi/Initialize()
..()
bitesize = 3
@@ -271,7 +271,7 @@
nutriment_amt = 15
nutriment_desc = list("Cheese" = 5, "eggs" = 3, "pasta" = 4, "sparkles" = 3)
/obj/item/weapon/reagent_containers/food/snacks/makaroni/New()
/obj/item/weapon/reagent_containers/food/snacks/makaroni/Initialize()
..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("shockchem", 6)
@@ -318,7 +318,7 @@
nutriment_amt = 15
nutriment_desc = list("ice" = 5, "toothache" = 1, "frozen cheese" = 5, "frozen tomato" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizza/margfrozen/New()
/obj/item/weapon/reagent_containers/food/snacks/pizza/margfrozen/Initialize()
..()
bitesize = 20
reagents.add_reagent("frostoil",3)
@@ -334,7 +334,7 @@
nutriment_desc = list("pizza crust" = 10, "tomato" = 15, "cheese" = 5)
nutriment_amt = 10
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margcargo/New()
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margcargo/Initialize()
..()
reagents.add_reagent("protein", 2)
reagents.add_reagent("tomatojuice", 10)
@@ -363,7 +363,7 @@
nutriment_amt = 15
nutriment_desc = list("ice" = 5, "toothache" = 1, "frozen meat" = 5, "frozen cow screams" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizza/meatfrozen/New()
/obj/item/weapon/reagent_containers/food/snacks/pizza/meatfrozen/Initialize()
..()
bitesize = 20
reagents.add_reagent("frostoil",3)
@@ -379,7 +379,7 @@
nutriment_desc = list("meat" = 10, "beef" = 10, "squeaky pork" = 15, "longpig" = 5)
nutriment_amt = 10
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatcargo/New()
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatcargo/Initialize()
..()
reagents.add_reagent("protein", 20)
reagents.add_reagent("tomatojuice", 6)
@@ -408,7 +408,7 @@
nutriment_amt = 15
nutriment_desc = list("ice" = 5, "toothache" = 1, "frozen mushrooms" = 5, "frozen cream" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizza/mushfrozen/New()
/obj/item/weapon/reagent_containers/food/snacks/pizza/mushfrozen/Initialize()
..()
bitesize = 20
reagents.add_reagent("frostoil",3)
@@ -424,7 +424,7 @@
nutriment_desc = list("pizza crust" = 10, "cheese" = 5, "creamy sauce" = 5, "mushroom" = 5)
nutriment_amt = 10
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushcargo/New()
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushcargo/Initialize()
..()
reagents.add_reagent("protein", 4)
bitesize = 2
@@ -452,7 +452,7 @@
nutriment_amt = 15
nutriment_desc = list("ice" = 5, "toothache" = 1, "frozen vegtable chunks" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizza/vegfrozen/New()
/obj/item/weapon/reagent_containers/food/snacks/pizza/vegfrozen/Initialize()
..()
bitesize = 20
reagents.add_reagent("frostoil",3)
@@ -468,7 +468,7 @@
nutriment_desc = list("pizza crust" = 10, "tomato" = 20, "cheese" = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5)
nutriment_amt = 5
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegcargo/New()
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegcargo/Initialize()
..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("tomatojuice", 15)
@@ -489,14 +489,14 @@
/obj/item/weapon/reagent_containers/food/snacks/slice/vegcargo/filled
filled = TRUE
/obj/item/pizzabox/margherita/New()
/obj/item/pizzabox/margherita/Initialize()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/margfrozen(src)
/obj/item/pizzabox/vegetable/New()
/obj/item/pizzabox/vegetable/Initialize()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/vegfrozen(src)
/obj/item/pizzabox/mushroom/New()
/obj/item/pizzabox/mushroom/Initialize()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/mushfrozen(src)
/obj/item/pizzabox/meat/New()
/obj/item/pizzabox/meat/Initialize()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/meatfrozen(src)
+1 -1
View File
@@ -19,7 +19,7 @@ var/global/ingredientLimit = 20
var/image/topping
var/image/filling
/obj/item/weapon/reagent_containers/food/snacks/customizable/New(loc,ingredient)
/obj/item/weapon/reagent_containers/food/snacks/customizable/Initialize(loc,ingredient)
. = ..()
topping = image(icon,,"[initial(icon_state)]_top")
filling = image(icon,,"[initial(icon_state)]_filling")
@@ -36,7 +36,7 @@
/mob/living/carbon/human/promethean/Initialize(var/new_loc)
return ..(new_loc, SPECIES_PROMETHEAN)
/mob/living/carbon/human/zaddat/New(var/new_loc)
/mob/living/carbon/human/zaddat/Initialize(var/new_loc) //VOREStation Edit - Fixes a Polaris bug
return ..(new_loc, SPECIES_ZADDAT)
/mob/living/carbon/human/monkey/Initialize(var/new_loc)
@@ -290,7 +290,7 @@
temporary_form = blob
//Mail them to nullspace
forceMove(null)
moveToNullspace()
//Message
blob.visible_message("<b>[src.name]</b> collapses into a gooey blob!")
@@ -116,7 +116,7 @@
var/obj/item/device/nif/saved_nif = H.nif
if(saved_nif)
H.nif.unimplant(H) //Needs reference to owner to unimplant right.
H.nif.forceMove(null)
H.nif.moveToNullspace()
..()
if(saved_nif)
saved_nif.quick_implant(H)
@@ -3,7 +3,7 @@
health = 50
maxHealth = 50
/mob/living/simple_mob/animal/passive/fish/koi/poisonous/New()
/mob/living/simple_mob/animal/passive/fish/koi/poisonous/Initialize()
..()
create_reagents(60)
reagents.add_reagent("toxin", 45)
@@ -139,7 +139,7 @@
nutriment_amt = 1
nutriment_desc = list("sugar" = 1)
/obj/item/weapon/reagent_containers/food/snacks/snakesnack/New()
/obj/item/weapon/reagent_containers/food/snacks/snakesnack/Initialize()
..()
if(!snack_colour)
snack_colour = pick( list("yellow","green","pink","blue") )
@@ -2,6 +2,7 @@
var/mob/living/carbon/human/dummy/mannequin/mannequin = get_mannequin(client_ckey)
mannequin.delete_inventory(TRUE)
dress_preview_mob(mannequin)
COMPILE_OVERLAYS(mannequin)
preview_icon = icon('icons/effects/128x72_vr.dmi', bgstate)
preview_icon.Scale(128, 72)