Skip to content

Commit 6048179

Browse files
Merge branch 'vgstation-coders:Bleeding-Edge' into more-fission-fixing
2 parents d6d45d0 + 6397767 commit 6048179

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

code/modules/RCD/RCD.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
var/list/settings //for stuff like window directions and construction options.
4444
var/current_menu=null //we are keeping both systems of schematics for the sake of backwards compatability
45-
var/list/schem_groups=null
45+
var/list/datum/rcd_scematic_grouping/schem_groups=null
4646
var/datum/rcd_grouped_schematic/selected_schem=null
4747

4848

@@ -396,8 +396,8 @@
396396
schem_groups+= new /datum/rcd_scematic_grouping/build_airlock/engi_std(src)
397397
schem_groups+=new /datum/rcd_scematic_grouping/build_windows/engi_std(src)
398398

399-
current_menu=schem_groups[1].name
400-
schem_groups[1].switch_to()
399+
current_menu=schem_groups[1]?.name
400+
schem_groups[1]?.switch_to()
401401

402402

403403
/obj/item/device/rcd/mech/attack_self(var/mob/user)

code/modules/RCD/engie.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
schem_groups+=airlock_g
2929
schem_groups+=window_g
3030

31-
current_menu=schem_groups[1].name
32-
schem_groups[1].switch_to()
31+
current_menu=schem_groups[1]?.name
32+
schem_groups[1]?.switch_to()
3333

3434

3535
/obj/item/device/rcd/matter/engineering/Destroy()
@@ -219,8 +219,8 @@
219219
schem_groups+=new /datum/rcd_scematic_grouping/build_airlock/engi_std(src)
220220
schem_groups+=new /datum/rcd_scematic_grouping/build_windows/engi_std(src)
221221

222-
current_menu=schem_groups[1].name
223-
schem_groups[1].switch_to()
222+
current_menu=schem_groups[1]?.name
223+
schem_groups[1]?.switch_to()
224224

225225

226226
/obj/item/device/rcd/borg/engineering/attack_self(var/mob/user)

code/modules/RCD/schematics/engineering_rcd.dm

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -935,9 +935,11 @@
935935
newairlock.name=linked_rcd.settings["airlock_name"] || name
936936

937937
if(linked_rcd.settings["airlock_acany"])
938-
newairlock.req_one_access = linked_rcd.settings["airlock_access"]?.Copy()
938+
var/list/aa=linked_rcd.settings["airlock_access"]
939+
newairlock.req_one_access = aa?.Copy()
939940
else
940-
newairlock.req_access = linked_rcd.settings["airlock_access"]?.Copy()
941+
var/list/aa=linked_rcd.settings["airlock_access"]
942+
newairlock.req_access = aa?.Copy()
941943
newairlock.autoclose=1
942944
return cost
943945

@@ -1119,9 +1121,11 @@
11191121
newwindoor.change_dir(dirtouse)
11201122

11211123
if(linked_rcd.settings["airlock_acany"])
1122-
newwindoor.req_one_access = linked_rcd.settings["airlock_access"]?.Copy()
1124+
var/list/aa=linked_rcd.settings["airlock_access"]
1125+
newwindoor.req_one_access = aa?.Copy()
11231126
else
1124-
newwindoor.req_access = linked_rcd.settings["airlock_access"]?.Copy()
1127+
var/list/aa=linked_rcd.settings["airlock_access"]
1128+
newwindoor.req_access = aa?.Copy()
11251129
newwindoor.autoclose=1
11261130
return cost
11271131

0 commit comments

Comments
 (0)