cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12659 from Very-Soft/tweaks

Browse Source 
Adjusts trees and vendor spawners
This commit is contained in:
Casey
2022-04-05 20:56:02 -04:00
committed by CHOMPStation2
parent 0dd44e94bf
commit 97eccd40fa
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
code/game/objects/random/mapping.dm
View File

@@ -71,20 +71,20 @@
icon_state = "radren-off" icon_state = "radren-off"
/obj/random/vendorall/item_to_spawn() /obj/random/vendorall/item_to_spawn()
return pick (/obj/machinery/vending/coffee, return pick (prob(5);/obj/machinery/vending/coffee, //VOREStation Edit Start - Let's weight this a little bit
/obj/machinery/vending/snack, prob(5);/obj/machinery/vending/snack,
/obj/machinery/vending/cola, prob(5);/obj/machinery/vending/cola,
/obj/machinery/vending/fitness, prob(3);/obj/machinery/vending/fitness,
/obj/machinery/vending/cigarette, prob(4);/obj/machinery/vending/cigarette,
/obj/machinery/vending/giftvendor, prob(3);/obj/machinery/vending/giftvendor,
/obj/machinery/vending/hotfood, prob(1);/obj/machinery/vending/hotfood,
/obj/machinery/vending/weeb, prob(5);/obj/machinery/vending/weeb,
/obj/machinery/vending/sol, prob(5);/obj/machinery/vending/sol,
/obj/machinery/vending/snix, prob(5);/obj/machinery/vending/snix,
/obj/machinery/vending/snlvend, prob(5);/obj/machinery/vending/snlvend,
/obj/machinery/vending/sovietsoda, prob(5);/obj/machinery/vending/sovietsoda,
/obj/machinery/vending/sovietvend, prob(5);/obj/machinery/vending/sovietvend,
/obj/machinery/vending/radren) prob(5);/obj/machinery/vending/radren) //VOREStation Edit End
/obj/random/vendorfood //Random food vendors for station use /obj/random/vendorfood //Random food vendors for station use
name = "random snack vending machine" name = "random snack vending machine"

16
code/game/objects/structures/flora/moretrees_vr.dm
View File

@@ -4,8 +4,8 @@
base_state = "tree" base_state = "tree"
product = /obj/item/stack/material/log product = /obj/item/stack/material/log
product_amount = 20 product_amount = 20
health = 2000 health = 400
max_health = 2000 max_health = 400
pixel_x = -65 pixel_x = -65
pixel_y = -8 pixel_y = -8
layer = MOB_LAYER - 1 layer = MOB_LAYER - 1
@@ -19,4 +19,14 @@
var/image/i = image('icons/obj/flora/moretrees_vr.dmi', "[icon_state]-b") var/image/i = image('icons/obj/flora/moretrees_vr.dmi', "[icon_state]-b")
i.plane = ABOVE_MOB_PLANE i.plane = ABOVE_MOB_PLANE
add_overlay(i) add_overlay(i)
/obj/structure/flora/tree/bigtree/stump()
if(is_stump)
return
is_stump = TRUE
density = FALSE
icon_state = "[icon_state]_stump"
cut_overlays()
set_light(0)

BIN
icons/obj/flora/moretrees_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 73 KiB