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

Star Hunter Temp Fix (#7745)

Browse Source
This commit is contained in:
FluffMedic
2024-02-15 17:25:47 -05:00
committed by GitHub
parent af1c472862
commit 2facfe59eb
2 changed files with 89 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
maps/southern_cross/southern_cross-6.dmm
View File

@@ -4402,6 +4402,7 @@
"Cv" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet/cosmos,
/mob/living/simple_mob/humanoid/starhunter/trader/miner,
/turf/simulated/floor/concrete,
/area/surface/cave/explored/trader)
"Cx" = (
@@ -4461,7 +4462,8 @@
/turf/simulated/floor/concrete,
/area/surface/cave/explored/trader)
"In" = (
/obj/item/weapon/stool,
/obj/structure/bed,
/obj/item/weapon/bedsheet/cosmos,
/mob/living/simple_mob/humanoid/starhunter/trader/farmer,
/turf/simulated/floor/concrete,
/area/surface/cave/explored/trader)
@@ -4517,8 +4519,7 @@
},
/area/surface/outpost/research/xenoarcheology/exterior)
"Qd" = (
/obj/item/weapon/stool,
/mob/living/simple_mob/humanoid/starhunter/trader/miner,
/obj/machinery/vending/starhunter_farmer,
/turf/simulated/floor/concrete,
/area/surface/cave/explored/trader)
"Qs" = (
@@ -4553,6 +4554,10 @@
temperature = 243.15
},
/area/surface/outpost/mining_main/cave)
"St" = (
/obj/machinery/vending/starhunter_miner,
/turf/simulated/floor/concrete,
/area/surface/cave/explored/trader)
"SI" = (
/obj/structure/table/marble,
/obj/item/weapon/reagent_containers/food/snacks/bacon_and_eggs,
@@ -69090,11 +69095,11 @@ Cv
Qs
kx
RM
YU
Qd
oO
xS
SI
Qd
oO
YU
RM
LO
@@ -69602,12 +69607,12 @@ ae
ae
ae
RM
Cv
In
jK
kx
RM
YU
In
St
oO
HL
jU
oO

77
modular_chomp/code/game/machinery/vending.dm
View File

@@ -123,4 +123,79 @@
/obj/item/roller/adv = 2,
/obj/item/extraction_pack = 1,
/obj/item/fulton_core = 1
)
)
//Temp Starhunter Fix
/obj/machinery/vending/starhunter_farmer
name = "Starhunter Trade Vendor: Farming"
desc = "A large vending machine stocked with strange farming goods."
vend_delay = 1
icon_state = "sec" // Placeholder
products = list(/obj/item/slime_extract/sepia =3,
/obj/item/slime_extract/ruby = 3,
/obj/item/slime_extract/bluespace = 3,
/obj/item/slime_extract/oil = 3,
/obj/item/slime_extract/sapphire = 3,
/obj/item/slime_extract/emerald = 3,
/obj/item/seeds/shrinkshroom = 12,
/obj/item/seeds/megashroom = 12,
/obj/item/seeds/pitcherseed = 6,
/obj/item/seeds/deathberryseed = 6,
/obj/item/seeds/ambrosiainfernusseed = 6,
/obj/item/seeds/thaadra = 6,
/obj/item/seeds/icepepperseed = 6,
/obj/item/seeds/jurlmah = 6,
/obj/item/seeds/amauri = 6,
/obj/item/seeds/gelthi = 6,
/obj/item/seeds/vale = 6
) // For each, use the following pattern:
premium = list() // No specified amount = only one in stock
prices = list(/obj/item/slime_extract/sepia = 2250,
/obj/item/slime_extract/ruby = 3250,
/obj/item/slime_extract/bluespace = 3250,
/obj/item/slime_extract/oil = 3250,
/obj/item/slime_extract/sapphire = 3250,
/obj/item/slime_extract/emerald = 3250,
/obj/item/seeds/shrinkshroom = 50,
/obj/item/seeds/megashroom = 50,
/obj/item/seeds/pitcherseed = 125,
/obj/item/seeds/deathberryseed = 125,
/obj/item/seeds/ambrosiainfernusseed = 125,
/obj/item/seeds/thaadra = 125,
/obj/item/seeds/icepepperseed = 125,
/obj/item/seeds/jurlmah = 125,
/obj/item/seeds/amauri = 125,
/obj/item/seeds/gelthi = 125,
/obj/item/seeds/vale = 125)
/obj/machinery/vending/starhunter_miner
name = "Starhunter Trade Vendor: Miner"
desc = "A large vending machine stocked with strange mining goods."
vend_delay = 1
icon_state = "sec" // Placeholder
products = list(/obj/item/weapon/kinetic_crusher/glaive = 3,
/obj/item/weapon/kinetic_crusher = 3,
/obj/item/weapon/gun/energy/mininglaser = 3,
/obj/item/stack/material/phoron = 50,
/obj/item/stack/material/uranium = 50,
/obj/item/stack/material/tritium = 50,
/obj/item/stack/material/deuterium = 50,
/obj/item/stack/material/bronze = 50,
) // For each, use the following pattern:
premium = list(/obj/item/weapon/circuitboard/defenseonelisk) // No specified amount = only one in stock
prices = list(/obj/item/weapon/kinetic_crusher/glaive = 1200,
/obj/item/weapon/kinetic_crusher = 1200,
/obj/item/weapon/gun/energy/mininglaser = 1800,
/obj/item/stack/material/phoron = 12,
/obj/item/stack/material/uranium = 12,
/obj/item/stack/material/tritium = 12,
/obj/item/stack/material/deuterium = 12,
/obj/item/stack/material/bronze = 12,
/obj/item/weapon/circuitboard/defenseonelisk = 5000
)