cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-24 05:28:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2022-12-02 16:33:11 +01:00
parent 986954fa98 40027ed918
commit 2ef553df70
101 changed files with 9231 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+13 -1
View File
@@ -299,7 +299,7 @@
/obj/structure/bed/chair/sofa/update_layer()
// Corner east/west should be on top of mobs, any other state's north should be.
if((corner_piece && ((dir & EAST) || (dir & WEST))) || (!corner_piece && (dir & NORTH)))
if(!corner_piece && (dir & NORTH))
plane = MOB_PLANE
layer = MOB_LAYER + 0.1
else
@@ -318,6 +318,18 @@
base_icon = "sofacorner"
corner_piece = TRUE
/obj/structure/bed/chair/sofa/corner/update_icon()
..()
var/cache_key = "[base_icon]-armrest-[padding_material ? padding_material.name : "no_material"]-permanent"
if(isnull(stool_cache[cache_key]))
var/image/I = image(icon, "[base_icon]_armrest")
I.plane = MOB_PLANE
I.layer = ABOVE_MOB_LAYER
if(padding_material)
I.color = padding_material.icon_colour
stool_cache[cache_key] = I
add_overlay(stool_cache[cache_key])
// Wooden nonsofa - no corners
/obj/structure/bed/chair/sofa/pew
name = "pew bench"
code/game/objects/structures/trash_pile_vr.dm
+4 -3
View File
@@ -22,8 +22,6 @@
/obj/item/weapon/bluespace_harpoon,
/obj/item/clothing/glasses/thermal/syndi,
/obj/item/weapon/gun/energy/netgun,
/obj/item/weapon/gun/projectile/pirate,
/obj/item/clothing/accessory/permit/gun,
/obj/item/weapon/gun/projectile/dartgun,
/obj/item/clothing/gloves/black/bloodletter,
/obj/item/weapon/gun/energy/mouseray/metamorphosis
@@ -264,7 +262,7 @@
prob(1);/obj/item/device/flashlight/glowstick/yellow,
prob(1);/obj/item/device/flashlight/pen,
prob(1);/obj/item/device/paicard,
prob(1);/obj/item/weapon/card/emag,
prob(1);/obj/item/clothing/accessory/permit/gun,
prob(1);/obj/item/clothing/mask/gas/voice,
prob(1);/obj/item/weapon/spacecash/c100,
prob(1);/obj/item/weapon/spacecash/c50,
@@ -295,6 +293,7 @@
prob(2);/obj/item/clothing/under/hyperfiber/bluespace,
prob(2);/obj/item/selectable_item/chemistrykit/size,
prob(2);/obj/item/selectable_item/chemistrykit/gender,
prob(2);/obj/item/clothing/gloves/bluespace/emagged,
prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,
prob(1);/obj/item/device/nif/bad,
prob(1);/obj/item/device/radio_jammer,
@@ -310,6 +309,8 @@
prob(1);/obj/item/device/survivalcapsule/popcabin,
prob(1);/obj/item/weapon/reagent_containers/syringe/steroid,
prob(1);/obj/item/capture_crystal,
prob(1);/obj/item/device/perfect_tele/one_beacon,
prob(1);/obj/item/clothing/gloves/bluespace,
prob(1);/obj/item/weapon/gun/energy/mouseray)
var/obj/item/I = new path()