cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 06:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

1Z Talon - R2.0

Browse Source 
banished 2z talon to the deprecated folder (begone ~~thot~~ block), fixed the refinery with a couple of hacks (now processes ore, doesn't give points!), and adjusted the custom spawners in cargo
This commit is contained in:
Killian
2021-05-09 20:17:58 +01:00
parent 310d1737b3
commit 9f156e2e7d
9 changed files with 2473 additions and 3353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_processing.dm
+9 -1
View File
@@ -164,6 +164,7 @@
var/active = FALSE
var/points = 0
var/points_mult = 1 //VOREStation Add - multiplier for points generated when ore hits the processors
var/static/list/ore_values = list(
"sand" = 1,
"hematite" = 1,
@@ -202,6 +203,13 @@
ore_data[OD.name] = OD
ores_processing[OD.name] = 0
ores_stored[OD.name] = 0
//VOREStation Edit Start -Killian: allows secondary/tertiary/etc. refineries to work! ugly but it works
else
for(var/oretype in typesof(/ore)-/ore)
var/ore/OD = new oretype()
ores_processing[OD.name] = 0
ores_stored[OD.name] = 0
//VOREStation Edit End
/obj/machinery/mineral/processing_unit/Initialize()
. = ..()
@@ -249,7 +257,7 @@
for(var/obj/item/weapon/ore/O in input.loc)
if(!isnull(ores_stored[O.material]))
ores_stored[O.material]++
points += ore_values[O.material] // Give Points!
points += (ore_values[O.material]*points_mult) // Give Points! VOREStation Edit - or give lots of points! or less points! or no points!
qdel(O)
if(!active)
maps/offmap_vr/talon/talon_v2.dm
+113 -11
View File
@@ -540,6 +540,110 @@ also be sure that it's locked down before you take off, the automatic switch is
spawn_nothing_percentage = 50
icon_state = "crate"
/obj/random/multiple/ore_pile/talon
name = "random ore pile (talon)"
desc = "A pile of random ores. High chance of a larger pile of common ores, lower chances of small piles of rarer ores. No verdantium, reduced item counts vs normal ore craes."
icon = 'icons/obj/mining.dmi'
icon_state = "ore_clown"
/obj/random/multiple/ore_pile/talon/item_to_spawn()
return pick(
prob(10);list(
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal
),
prob(3);list(
/obj/item/weapon/ore/diamond,
/obj/item/weapon/ore/diamond
),
prob(15);list(
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass,
/obj/item/weapon/ore/glass
),
prob(5);list(
/obj/item/weapon/ore/gold,
/obj/item/weapon/ore/gold,
/obj/item/weapon/ore/gold,
/obj/item/weapon/ore/gold,
/obj/item/weapon/ore/gold
),
prob(2);list(
/obj/item/weapon/ore/hydrogen
),
prob(10);list(
/obj/item/weapon/ore/iron,
/obj/item/weapon/ore/iron,
/obj/item/weapon/ore/iron,
/obj/item/weapon/ore/iron,
/obj/item/weapon/ore/iron,
/obj/item/weapon/ore/iron,
/obj/item/weapon/ore/iron,
/obj/item/weapon/ore/iron,
/obj/item/weapon/ore/iron,
/obj/item/weapon/ore/iron
),
prob(10);list(
/obj/item/weapon/ore/lead,
/obj/item/weapon/ore/lead,
/obj/item/weapon/ore/lead,
/obj/item/weapon/ore/lead,
/obj/item/weapon/ore/lead,
/obj/item/weapon/ore/lead,
/obj/item/weapon/ore/lead,
/obj/item/weapon/ore/lead,
/obj/item/weapon/ore/lead,
/obj/item/weapon/ore/lead
),
prob(5);list(
/obj/item/weapon/ore/marble,
/obj/item/weapon/ore/marble,
/obj/item/weapon/ore/marble,
/obj/item/weapon/ore/marble
),
prob(3);list(
/obj/item/weapon/ore/osmium,
/obj/item/weapon/ore/osmium
),
prob(5);list(
/obj/item/weapon/ore/phoron,
/obj/item/weapon/ore/phoron,
/obj/item/weapon/ore/phoron,
/obj/item/weapon/ore/phoron
),
prob(5);list(
/obj/item/weapon/ore/silver,
/obj/item/weapon/ore/silver,
/obj/item/weapon/ore/silver,
/obj/item/weapon/ore/silver
),
prob(3);list(
/obj/item/weapon/ore/uranium,
/obj/item/weapon/ore/uranium
),
)
/obj/random/multiple/corp_crate/talon_cargo/item_to_spawn()
return pick(
prob(10);list(
@@ -622,24 +726,22 @@ also be sure that it's locked down before you take off, the automatic switch is
/obj/structure/closet/crate/grayson //GRAYSON TECH
),
prob(15);list(
/obj/random/multiple/ore_pile,
/obj/random/multiple/ore_pile,
/obj/random/multiple/ore_pile,
/obj/random/multiple/ore_pile,
/obj/structure/closet/crate/grayson //GRAYSON ORES
/obj/random/multiple/ore_pile/talon,
/obj/random/multiple/ore_pile/talon,
/obj/random/multiple/ore_pile/talon,
/obj/structure/closet/crate/grayson //GRAYSON ORES (TALON-ADJUSTED)
),
prob(10);list(
/obj/random/material/refined,
/obj/random/material/refined,
/obj/random/material/refined,
/obj/random/material/refined,
/obj/structure/closet/crate/grayson //GRAYSON MATS
/obj/random/material,
/obj/random/material,
/obj/random/material,
/obj/structure/closet/crate/grayson //GRAYSON MATS (TALON-ADJUSTED)
),
prob(5);list(
/obj/random/multiple/voidsuit/security,
/obj/random/tank,
/obj/item/clothing/mask/breath,
/obj/structure/closet/crate/secure/nanotrasen //NTSEC SUIT
/obj/structure/closet/crate/secure/heph //HEPH SUIT (so people don't get huffy at talon trying to sell "NT property" to NT...)
),
prob(5);list(
/obj/random/multiple/voidsuit/medical,
maps/offmap_vr/talon/talon_v2.dmm
+59 -33
View File
@@ -3,6 +3,7 @@
/turf/space,
/area/space)
"ab" = (
/obj/machinery/mineral/input,
/obj/machinery/conveyor{
dir = 4;
id = "talonrefinery"
@@ -2499,11 +2500,7 @@
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/bar)
"iB" = (
/obj/machinery/conveyor{
dir = 8;
id = "talonrefinery"
},
/obj/machinery/mineral/output,
/obj/machinery/mineral/stacking_machine,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/refining)
"iD" = (
@@ -2783,11 +2780,11 @@
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/unused)
"jS" = (
/obj/machinery/mineral/output,
/obj/machinery/conveyor{
dir = 1;
dir = 8;
id = "talonrefinery"
},
/obj/machinery/mineral/output,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/refining)
"jY" = (
@@ -3114,6 +3111,15 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/maintenance/wing_starboard)
"kZ" = (
/obj/structure/railing/grey{
dir = 4
},
/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/refining)
"lc" = (
/obj/machinery/firealarm{
dir = 1;
@@ -3268,6 +3274,12 @@
/area/talon_v2/maintenance/fore_starboard)
"lA" = (
/obj/machinery/light/small,
/obj/structure/railing/grey{
dir = 4
},
/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/refining)
"lB" = (
@@ -4742,12 +4754,13 @@
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/maintenance/wing_port)
"qQ" = (
/obj/effect/floor_decal/industrial/loading{
dir = 4
},
/obj/structure/sign/warning/moving_parts{
pixel_y = -32
},
/obj/machinery/conveyor{
dir = 4;
id = "talonrefinery"
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/refining)
"qU" = (
@@ -4785,10 +4798,6 @@
/obj/effect/catwalk_plated/dark,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
"qZ" = (
/obj/machinery/mineral/unloading_machine,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/refining)
"rg" = (
/obj/machinery/door/firedoor/glass/talon,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -7529,6 +7538,10 @@
/obj/structure/window/reinforced/full,
/turf/simulated/floor/plating,
/area/talon_v2/crew_quarters/bar)
"AY" = (
/obj/machinery/mineral/unloading_machine,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/refining)
"AZ" = (
/obj/structure/cable/green{
d1 = 4;
@@ -9248,7 +9261,7 @@
tag_south = 2;
tag_west = 1
},
/obj/structure/catwalk,
/obj/effect/catwalk_plated/dark,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
"GY" = (
@@ -9595,7 +9608,11 @@
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/mineral/processing_unit,
/obj/machinery/mineral/output,
/obj/machinery/conveyor{
dir = 1;
id = "talonrefinery"
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/refining)
"Ih" = (
@@ -10520,6 +10537,7 @@
name = "north bump";
pixel_y = 28
},
/obj/structure/table/steel,
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/refining)
"Lo" = (
@@ -11380,6 +11398,10 @@
},
/turf/simulated/floor/reinforced/airless,
/area/space)
"OI" = (
/obj/effect/floor_decal/industrial/loading,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/refining)
"OJ" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/structure/cable/green{
@@ -11729,7 +11751,8 @@
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/mineral/stacking_machine,
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/mineral/input,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/refining)
"PK" = (
@@ -12167,8 +12190,9 @@
/turf/space,
/area/talon_v2/engineering/port)
"Ry" = (
/obj/machinery/mineral/input,
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/mineral/processing_unit{
points_mult = 0
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/refining)
"RA" = (
@@ -13361,6 +13385,7 @@
tag_west = 1;
tag_west_con = 0.21
},
/obj/effect/catwalk_plated/dark,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
"VO" = (
@@ -14406,8 +14431,11 @@
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/mineral/input,
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/conveyor{
dir = 1;
id = "talonrefinery"
},
/obj/machinery/mineral/output,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/refining)
"ZB" = (
@@ -14517,10 +14545,8 @@
/turf/simulated/wall/rshull,
/area/talon_v2/maintenance/fore_starboard)
"ZR" = (
/obj/machinery/conveyor{
dir = 10;
id = "talonrefinery"
},
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/mineral/input,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/refining)
"ZS" = (
@@ -25988,7 +26014,7 @@ XR
gR
Yc
VS
XR
OI
qQ
WJ
WS
@@ -26271,9 +26297,9 @@ VS
XR
Hg
tJ
lv
kZ
mP
ab
AY
WJ
JK
Yp
@@ -26407,14 +26433,14 @@ RQ
ca
rj
fW
Gm
jS
tX
VS
mQ
ZR
Ly
jS
qZ
Ly
Ly
ZA
fW
DD
@@ -26692,9 +26718,9 @@ WB
bX
fW
PI
Ry
Ly
jS
Ly
Ly
Ig
fW
dJ
maps/submaps/depreciated_vr/_depreciated.dm
+27
View File
@@ -7,3 +7,30 @@
name = "Special Area - ERT"
desc = "ERT Base."
mappath = 'maps/submaps/admin_use_vr/ert_base.dmm'
// Old two-Z Talon - left commented out because multi-z maploading is fussy or something IIRC
/*
/datum/map_template/tether_lateload/offmap/talon1
name = "Offmap Ship - Talon Z1"
desc = "Offmap spawn ship, the Talon."
mappath = 'maps/submaps/depreciated_vr/talon/talon1.dmm'
associated_map_datum = /datum/map_z_level/tether_lateload/talon1
/datum/map_template/tether_lateload/offmap/talon2
name = "Offmap Ship - Talon Z2"
desc = "Offmap spawn ship, the Talon."
mappath = 'maps/submaps/depreciated_vr/talon/talon2.dmm'
associated_map_datum = /datum/map_z_level/tether_lateload/talon2
/datum/map_z_level/tether_lateload/talon1
name = "Talon Deck One"
flags = MAP_LEVEL_PLAYER
base_turf = /turf/space
z = Z_LEVEL_OFFMAP1
/datum/map_z_level/tether_lateload/talon2
name = "Talon Deck Two"
flags = MAP_LEVEL_PLAYER
base_turf = /turf/simulated/open
z = Z_LEVEL_OFFMAP2
*/
maps/offmap_vr/talon/talon.dm → maps/submaps/depreciated_vr/talon.dm
View File
maps/offmap_vr/talon/talon1.dmm → maps/submaps/depreciated_vr/talon1.dmm
+1409 -2009
View File
File diff suppressed because it is too large Load Diff
maps/offmap_vr/talon/talon2.dmm → maps/submaps/depreciated_vr/talon2.dmm
+856 -1268
View File
File diff suppressed because it is too large Load Diff
maps/offmap_vr/talon/talon_areas.dm → maps/submaps/depreciated_vr/talon_areas.dm
View File
maps/tether/submaps/_tether_submaps.dm
-31
View File
@@ -512,44 +512,13 @@
//////////////////////////////////////////////////////////////////////////////
//Offmap Spawn Locations
//#include "../../offmap_vr/talon/talon.dm"
//#include "../../offmap_vr/talon/talon_areas.dm"
#include "../../offmap_vr/talon/talon_v2.dm"
#include "../../offmap_vr/talon/talon_v2_areas.dm"
#if MAP_TEST
//#include "../../offmap_vr/talon/talon1.dmm"
//#include "../../offmap_vr/talon/talon2.dmm"
#include "../../offmap_vr/talon/talon_v2.dmm"
#endif
// Talon offmap spawn
/*
/datum/map_template/tether_lateload/offmap/talon1
name = "Offmap Ship - Talon Z1"
desc = "Offmap spawn ship, the Talon."
mappath = 'maps/offmap_vr/talon/talon1.dmm'
associated_map_datum = /datum/map_z_level/tether_lateload/talon1
/datum/map_template/tether_lateload/offmap/talon2
name = "Offmap Ship - Talon Z2"
desc = "Offmap spawn ship, the Talon."
mappath = 'maps/offmap_vr/talon/talon2.dmm'
associated_map_datum = /datum/map_z_level/tether_lateload/talon2
/datum/map_z_level/tether_lateload/talon1
name = "Talon Deck One"
flags = MAP_LEVEL_PLAYER
base_turf = /turf/space
z = Z_LEVEL_OFFMAP1
/datum/map_z_level/tether_lateload/talon2
name = "Talon Deck Two"
flags = MAP_LEVEL_PLAYER
base_turf = /turf/simulated/open
z = Z_LEVEL_OFFMAP2
*/
/datum/map_template/tether_lateload/offmap/talon_v2
name = "Offmap Ship - Talon V2"
desc = "Offmap spawn ship, the Talon."