Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 845ed80

Browse files
Merge remote-tracking branch 'upstream/master' into skill-issue
2 parents 219ba71 + 5ea0012 commit 845ed80

File tree

99 files changed

+6059
-5949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+6059
-5949
lines changed

_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2035,7 +2035,7 @@
20352035
/obj/item/stack/sheet/mineral/bamboo{
20362036
amount = 50
20372037
},
2038-
/obj/item/paicard,
2038+
/obj/item/computer_hardware/paicard,
20392039
/obj/item/reagent_containers/glass/gromitmug,
20402040
/turf/open/floor/plasteel/dark,
20412041
/area/ruin/powered/fishing/shop)

_maps/RandomRuins/SpaceRuins/TheDerelict.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@
14211421
/area/ruin/space/derelict/bridge/access)
14221422
"eC" = (
14231423
/obj/structure/table,
1424-
/obj/item/paicard,
1424+
/obj/item/computer_hardware/paicard,
14251425
/turf/open/floor/plasteel,
14261426
/area/ruin/space/derelict/bridge)
14271427
"eD" = (

_maps/RandomRuins/SpaceRuins/bigderelict1.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2114,7 +2114,7 @@
21142114
/obj/structure/closet/crate{
21152115
icon_state = "crateopen"
21162116
},
2117-
/obj/item/paicard,
2117+
/obj/item/computer_hardware/paicard,
21182118
/obj/machinery/light,
21192119
/obj/effect/turf_decal/delivery,
21202120
/turf/open/floor/plasteel,

_maps/RandomRuins/SpaceRuins/bus.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
/area/ruin/unpowered/no_grav)
118118
"av" = (
119119
/obj/structure/table,
120-
/obj/item/paicard,
120+
/obj/item/computer_hardware/paicard,
121121
/turf/open/floor/plating/asteroid/airless,
122122
/area/ruin/unpowered/no_grav)
123123
"aw" = (

_maps/RandomRuins/StationRuins/maint/10x10/10x10_deltalibrary.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"ar" = (
7171
/obj/structure/table/wood,
7272
/obj/effect/decal/cleanable/dirt,
73-
/obj/item/paicard,
73+
/obj/item/computer_hardware/paicard,
7474
/turf/open/floor/carpet,
7575
/area/template_noop)
7676
"as" = (

_maps/RandomRuins/StationRuins/maint/10x10/10x10_fakewalls.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
/obj/item/laser_pointer/blue,
135135
/obj/item/lighter/greyscale,
136136
/obj/structure/closet/crate,
137-
/obj/item/paicard,
137+
/obj/item/computer_hardware/paicard,
138138
/obj/item/clothing/gloves/color/yellow,
139139
/obj/item/clothing/glasses/yogs/eyepatch,
140140
/turf/open/floor/plating,

_maps/RandomZLevels/VR/syndicate_trainer.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1841,7 +1841,7 @@
18411841
/area/space/nearstation)
18421842
"kW" = (
18431843
/obj/structure/table,
1844-
/obj/item/paicard,
1844+
/obj/item/computer_hardware/paicard,
18451845
/turf/open/indestructible,
18461846
/area/awaymission/centcomAway/thunderdome)
18471847
"kX" = (

_maps/RandomZLevels/VR/vrhub.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2447,7 +2447,7 @@
24472447
/area/awaymission/vr/syndicate)
24482448
"Jl" = (
24492449
/obj/structure/table,
2450-
/obj/item/paicard,
2450+
/obj/item/computer_hardware/paicard,
24512451
/turf/open/indestructible,
24522452
/area/awaymission/vr/syndicate)
24532453
"Jz" = (

0 commit comments

Comments
 (0)