Skip to content

Commit 30bf302

Browse files
Compile fixes for post-rebase Pyrelight.
1 parent 846ae19 commit 30bf302

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
/datum/map/karzerfeste
2-
apc_test_exempt_areas = list(
3-
/area/space = NO_SCRUBBER|NO_VENT|NO_APC,
4-
/area/karzerfeste = NO_SCRUBBER|NO_VENT|NO_APC
5-
)
1+
/datum/map/karzerfeste/New()
2+
LAZYSET(apc_test_exempt_areas, /area/karzerfeste, NO_SCRUBBER|NO_VENT|NO_APC)
3+
LAZYDISTINCTADD(area_coherency_test_exempted_root_areas, /area/karzerfeste/caves/poi)
4+
..()

maps/modpack_testing/modpack_testing.dm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "../../mods/content/beekeeping/_beekeeping.dme"
1212
#include "../../mods/content/bigpharma/_bigpharma.dme"
1313
#include "../../mods/content/biomods/_biomods.dme"
14-
#include "../../mods/content/blacksmithy/_blacksmithy.dme"
1514
#include "../../mods/content/blob/_blob.dme"
1615
#include "../../mods/content/breath_holding/_breath_holding.dme"
1716
#include "../../mods/content/byond_membership/_byond_membership.dm"
@@ -22,7 +21,6 @@
2221
#include "../../mods/content/government/_government.dme"
2322
#include "../../mods/content/inertia/_inertia.dme"
2423
#include "../../mods/content/integrated_electronics/_integrated_electronics.dme"
25-
#include "../../mods/content/item_sharpening/_item_sharpening.dme"
2624
#include "../../mods/content/matchmaking/_matchmaking.dme"
2725
#include "../../mods/content/modern_earth/_modern_earth.dme"
2826
#include "../../mods/content/mouse_highlights/_mouse_highlight.dme"

mods/pyrelight/plants/plants_fruit.dm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@
55
icon_state = "base"
66
material = /decl/material/solid/organic/plantmatter
77
is_spawnable_type = FALSE
8+
abstract_type = /obj/item/food/fruit
89
var/examine_info
910
var/examine_info_skill = SKILL_BOTANY
1011
var/examine_info_rank = SKILL_BASIC
1112
var/list/removed_segments
1213

13-
/obj/item/food/fruit/initialize_reagents(populate)
14+
/obj/item/food/fruit/Initialize(ml, material_key, skip_plate)
1415
var/segment_amount = 0
1516
for(var/datum/fruit_segment/comp as anything in get_composition())
1617
if(comp.contributes_to_fruit_reagents)
1718
segment_amount += comp.reagent_total
18-
create_or_update_reagents(segment_amount)
19-
return ..()
19+
chem_volume = segment_amount
20+
. = ..()
2021

2122
/obj/item/food/fruit/populate_reagents()
2223
for(var/datum/fruit_segment/comp as anything in get_composition())

mods/pyrelight/plants/plants_fruit_segment.dm

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
icon = _fruit.icon
2222
icon_state = "seg_[_template.icon_state]"
2323
fruit_template = _template
24-
return ..()
25-
26-
/obj/item/food/fruit_segment/initialize_reagents(populate)
27-
create_or_update_reagents(fruit_template.reagent_total)
24+
chem_volume = fruit_template?.reagent_total || chem_volume
2825
return ..()
2926

3027
/obj/item/food/fruit_segment/populate_reagents()

0 commit comments

Comments
 (0)