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 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2022-04-27 16:11:36 +02:00
parent 48b893b3f8 ea9f968d18
commit d841463eb5
127 changed files with 286803 additions and 21227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/catwalk.dm
+2 -2
View File
@@ -128,9 +128,9 @@
new /obj/item/stack/rods(get_turf(src))
Destroy()
/obj/structure/catwalk/Crossed()
/obj/structure/catwalk/Crossed(atom/movable/AM)
. = ..()
if(isliving(usr) && !usr.is_incorporeal())
if(isliving(AM) && !AM.is_incorporeal())
playsound(src, pick('sound/effects/footstep/catwalk1.ogg', 'sound/effects/footstep/catwalk2.ogg', 'sound/effects/footstep/catwalk3.ogg', 'sound/effects/footstep/catwalk4.ogg', 'sound/effects/footstep/catwalk5.ogg'), 25, 1)
/obj/effect/catwalk_plated
code/game/objects/structures/salvageable.dm
+36
View File
@@ -242,6 +242,42 @@
if((. = ..()))
playsound(src, 'sound/machines/shutdown.ogg', 60, 1)
///////////////////
//// COMPUTERS ////
///////////////////
/obj/structure/salvageable/console
name = "console"
icon_state = "console0"
salvageable_parts = list(
/obj/item/stack/cable_coil{amount = 5} = 90,
/obj/item/stack/material/glass{amount = 5} = 70,
/obj/item/trash/material/circuit = 60,
/obj/item/trash/material/metal = 60,
/obj/item/weapon/stock_parts/capacitor = 40,
/obj/item/weapon/stock_parts/capacitor = 40,
/obj/item/weapon/stock_parts/scanning_module = 40,
/obj/item/weapon/stock_parts/scanning_module = 40
)
/obj/structure/salvageable/personal/Initialize()
. = ..()
icon_state = "console[rand(0,2)]"
/obj/structure/salvageable/shuttle_console
name = "shuttle console"
icon_state = "shuttle"
salvageable_parts = list(
/obj/item/stack/cable_coil{amount = 5} = 90,
/obj/item/stack/material/glass{amount = 5} = 70,
/obj/item/trash/material/circuit = 60,
/obj/item/trash/material/metal = 60,
/obj/item/weapon/stock_parts/capacitor = 40,
/obj/item/weapon/stock_parts/capacitor = 40,
/obj/item/weapon/stock_parts/scanning_module = 40,
/obj/item/weapon/stock_parts/scanning_module = 40
)
//////////////////
//// ONE STAR ////
//////////////////
code/game/objects/structures/trash_pile_vr.dm
+2 -1
View File
@@ -234,7 +234,8 @@
prob(4);/obj/item/weapon/storage/pill_bottle/happy,
prob(4);/obj/item/weapon/storage/pill_bottle/zoom,
prob(4);/obj/item/seeds/ambrosiavulgarisseed,
prob(4);/obj/item/weapon/gun/energy/sizegun/old,
prob(4);/obj/item/weapon/gun/energy/sizegun,
prob(4);/obj/item/device/slow_sizegun,
prob(3);/obj/item/weapon/material/butterfly,
prob(3);/obj/item/weapon/material/butterfly/switchblade,
prob(3);/obj/item/clothing/gloves/knuckledusters,