cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16616 from Kashargul/things

Browse Source 
some accessories
This commit is contained in:
Heroman3003
2024-11-28 14:38:12 +10:00
committed by GitHub
parent b33dd0fd67 a5e910bfd2
commit 8d675e86e7
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/storage.dm
+2 -2
View File
@@ -787,7 +787,7 @@
var/open = 0
storage_slots = 1
can_hold = list(
/obj/item/clothing/gloves/ring,
/obj/item/clothing/accessory/ring,
/obj/item/coin,
/obj/item/clothing/accessory/medal
)
@@ -801,7 +801,7 @@
if(contents.len >= 1)
var/contained_image = null
if(istype(contents[1], /obj/item/clothing/gloves/ring))
if(istype(contents[1], /obj/item/clothing/accessory/ring))
contained_image = "ring_trinket"
else if(istype(contents[1], /obj/item/coin))
contained_image = "coin_trinket"
maps/submaps/shelters/shelter_2.dmm
+1 -1
View File
@@ -53,7 +53,7 @@
/obj/item/storage/firstaid/toxin,
/obj/item/storage/firstaid/o2,
/obj/item/storage/box/survival/space,
/obj/item/clothing/gloves/watch/survival,
/obj/item/clothing/accessory/watch/survival,
/obj/item/emergency_beacon,
/obj/item/healthanalyzer,
/obj/item/storage/pill_bottle/dice_nerd,
maps/submaps/shelters/shelter_a.dmm
+1 -1
View File
@@ -74,7 +74,7 @@
starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi)
},
/obj/item/storage/box/survival/space,
/obj/item/clothing/gloves/watch/survival,
/obj/item/clothing/accessory/watch/survival,
/obj/item/emergency_beacon,
/obj/item/extinguisher/mini,
/obj/item/radio{
maps/submaps/surface_submaps/plains/drgnplateu.dmm
+1 -1
View File
@@ -41,7 +41,7 @@
/obj/structure/flora/grass/green{
pixel_x = -8
},
/obj/item/clothing/gloves/ring/material/gold,
/obj/item/clothing/accessory/ring/material/gold,
/obj/item/clothing/ears/earring/stud/gold,
/obj/item/gun/projectile/deagle/gold{
pixel_x = -11;
maps/submaps/surface_submaps/plains/lonehome.dmm
+1 -1
View File
@@ -32,7 +32,7 @@
"kT" = (/obj/machinery/light/small{dir = 1},/obj/structure/bed/padded,/obj/item/book/custom_library/fiction/truelovehathmyheart,/obj/item/bedsheet/clown,/turf/simulated/floor/wood,/area/submap/lonehome)
"kU" = (/obj/item/chainsaw,/obj/item/storage/box/lights/mixed,/obj/item/extinguisher,/obj/item/storage/toolbox/mechanical,/obj/structure/table/rack,/turf/simulated/floor,/area/submap/lonehome)
"ld" = (/obj/machinery/power/port_gen/pacman,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/lonehome)
"lz" = (/obj/item/reagent_containers/glass/rag,/obj/item/clothing/gloves/ring/engagement,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome)
"lz" = (/obj/item/reagent_containers/glass/rag,/obj/item/clothing/accessory/ring/engagement,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome)
"lB" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/trash/plate,/obj/structure/table/sifwooden_reinforced,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/wood,/area/submap/lonehome)
"lJ" = (/obj/item/tape,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome)
"lS" = (/obj/item/organ/internal/liver,/obj/random/trash,/turf/simulated/floor,/area/submap/lonehome)
maps/submaps/surface_submaps/plains/lonehome_vr.dmm
+1 -1
View File
@@ -554,7 +554,7 @@
/area/submap/lonehome)
"bG" = (
/obj/item/reagent_containers/glass/rag,
/obj/item/clothing/gloves/ring/engagement,
/obj/item/clothing/accessory/ring/engagement,
/obj/structure/table/wooden_reinforced,
/turf/simulated/floor/wood/virgo3b,
/area/submap/lonehome)