Merge pull request #8382 from PrismaticGynoid/mapfixes8

Cynosure map fixes round 8
This commit is contained in:
Atermonera
2022-01-27 20:06:13 -08:00
committed by GitHub
13 changed files with 51063 additions and 50996 deletions
-1
View File
@@ -119,7 +119,6 @@
var/old_underlays = T.underlays.Copy()
var/old_decals = T.decals ? T.decals.Copy() : null
B.Destroy()
X = B.ChangeTurf(T.type)
X.set_dir(old_dir1)
X.icon_state = old_icon_state1
+32913 -32933
View File
File diff suppressed because it is too large Load Diff
+4
View File
@@ -3694,6 +3694,7 @@
dir = 10
},
/obj/structure/reagent_dispensers/virusfood{
density = 0;
pixel_x = 32;
pixel_y = 32
},
@@ -15858,6 +15859,9 @@
icon_state = "frame";
pixel_x = 32
},
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/tiled,
/area/surface/station/quartermaster/office)
"jQk" = (
+37 -31
View File
@@ -1052,6 +1052,7 @@
/obj/structure/undies_wardrobe,
/obj/item/device/radio/intercom{
desc = "Talk through this. Evilly";
dir = 4;
frequency = 1213;
name = "Subversive Intercom";
pixel_x = 32;
@@ -1789,12 +1790,6 @@
id_tag = "ninja_shuttle_sensor";
pixel_y = 28
},
/obj/effect/shuttle_landmark{
base_area = /area/ninja_dojo/dojo;
base_turf = /turf/snow;
landmark_tag = "ninja_start";
name = "Dojo Outpost"
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/ninja_dojo/start)
"ccf" = (
@@ -2133,17 +2128,18 @@
},
/area/centcom/command)
"cxc" = (
/obj/machinery/computer/station_alert/all{
dir = 1
},
/obj/item/device/radio/intercom{
desc = "Talk through this. Evilly";
dir = 4;
frequency = 1213;
name = "Subversive Intercom";
pixel_x = 32;
subspace_transmission = 1;
syndie = 1
},
/obj/machinery/computer/station_alert/all{
dir = 1
},
/turf/unsimulated/floor{
dir = 5;
icon_state = "vault"
@@ -2429,7 +2425,7 @@
},
/area/tdome)
"cTw" = (
/obj/effect/landmark/start{
/obj/effect/landmark{
name = "wizard"
},
/turf/unsimulated/floor{
@@ -2913,6 +2909,7 @@
/obj/item/weapon/book/manual/engineering_hacking,
/obj/item/device/radio/intercom{
desc = "Talk through this. Evilly";
dir = 4;
frequency = 1213;
name = "Subversive Intercom";
pixel_x = 32;
@@ -5182,7 +5179,7 @@
desc = "Talk through this. Evilly";
dir = 4;
frequency = 1213;
name = "Syndicate Intercom";
name = "Subversive Intercom";
pixel_x = 32;
subspace_transmission = 1;
syndie = 1
@@ -5918,6 +5915,7 @@
},
/obj/item/device/radio/intercom{
desc = "Talk through this. Evilly";
dir = 8;
frequency = 1213;
name = "Subversive Intercom";
pixel_x = -32;
@@ -6124,22 +6122,13 @@
/obj/item/device/radio/intercom{
desc = "Talk through this. Evilly";
frequency = 1213;
name = "Syndicate Intercom";
pixel_x = 32;
subspace_transmission = 1;
syndie = 1
},
/obj/item/device/radio/intercom{
desc = "Talk through this. Evilly";
frequency = 1213;
name = "Syndicate Intercom";
name = "Subversive Intercom";
pixel_y = -32;
subspace_transmission = 1;
syndie = 1
},
/turf/unsimulated/floor{
dir = 5;
icon_state = "vault"
icon_state = "dark"
},
/area/wizard_station)
"hkh" = (
@@ -8292,7 +8281,7 @@
desc = "Talk through this. Evilly";
dir = 8;
frequency = 1213;
name = "Syndicate Intercom";
name = "Subversive Intercom";
pixel_x = -32;
subspace_transmission = 1;
syndie = 1
@@ -12813,7 +12802,7 @@
desc = "Talk through this. Evilly";
dir = 8;
frequency = 1213;
name = "Syndicate Intercom";
name = "Subversive Intercom";
pixel_x = -32;
subspace_transmission = 1;
syndie = 1
@@ -16863,7 +16852,7 @@
desc = "Talk through this. Evilly";
dir = 8;
frequency = 1213;
name = "Syndicate Intercom";
name = "Subversive Intercom";
pixel_x = -32;
subspace_transmission = 1;
syndie = 1
@@ -18499,6 +18488,7 @@
/obj/item/weapon/pen,
/obj/item/device/radio/intercom{
desc = "Talk through this. Evilly";
dir = 8;
frequency = 1213;
name = "Subversive Intercom";
pixel_x = -32;
@@ -19527,6 +19517,15 @@
"vTt" = (
/obj/structure/table/steel_reinforced,
/obj/item/clothing/head/philosopher_wig,
/obj/item/device/radio/intercom{
desc = "Talk through this. Evilly";
dir = 4;
frequency = 1213;
name = "Subversive Intercom";
pixel_x = 32;
subspace_transmission = 1;
syndie = 1
},
/turf/unsimulated/floor{
icon_state = "dark"
},
@@ -19667,7 +19666,7 @@
desc = "Talk through this. Evilly";
dir = 8;
frequency = 1213;
name = "Syndicate Intercom";
name = "Subversive Intercom";
pixel_x = -32;
subspace_transmission = 1;
syndie = 1
@@ -21458,7 +21457,7 @@
/obj/item/device/radio/intercom{
desc = "Talk through this. Evilly";
frequency = 1213;
name = "Syndicate Intercom";
name = "Subversive Intercom";
pixel_y = -32;
subspace_transmission = 1;
syndie = 1
@@ -21551,16 +21550,17 @@
},
/area/skipjack_station)
"xWw" = (
/obj/item/target,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/device/radio/intercom{
desc = "Talk through this. Evilly";
dir = 8;
frequency = 1213;
name = "Subversive Intercom";
pixel_x = -32;
subspace_transmission = 1;
syndie = 1
},
/obj/item/target,
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/unsimulated/floor{
dir = 5;
icon_state = "vault"
@@ -21824,6 +21824,12 @@
name = "ship lockdown control";
pixel_x = -25
},
/obj/effect/shuttle_landmark{
base_area = /area/ninja_dojo/dojo;
base_turf = /turf/snow;
landmark_tag = "ninja_start";
name = "Dojo Outpost"
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/ninja_dojo/start)
"ymh" = (
@@ -79809,7 +79815,7 @@ jeX
jeX
lXr
bXF
jeX
hkb
xIh
jeX
bXF
@@ -80066,7 +80072,7 @@ wMD
sqm
xIh
rhp
hkb
bXF
jeX
bXF
kRO
+17950 -18022
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -14,6 +14,7 @@
#include "loadout/loadout_uniform.dm"
#include "datums/supplypacks/munitions.dm"
#include "datums/random_map.dm"
#include "items/encryptionkey_cyno.dm"
#include "items/headset_cyno.dm"
#include "items/clothing/cyno_suit.dm"
+6 -1
View File
@@ -150,9 +150,14 @@
new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_STATION_ONE, world.maxx, world.maxy) // Create the mining Z-level.
to_world_log("Generated caves in [(REALTIMEOFDAY - time_started) / 10] second\s.")
time_started = REALTIMEOFDAY
new /datum/random_map/noise/sif/underground(null, 1, 1, Z_LEVEL_STATION_ONE, world.maxx, world.maxy)
new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_STATION_ONE, 64, 64) // Create the mining ore distribution map.
to_world_log("Generated ores in [(REALTIMEOFDAY - time_started) / 10] second\s.")
// Todo: Forest generation.
// Forest/wilderness generation.
new /datum/random_map/noise/sif( null, 1, 1, Z_LEVEL_STATION_TWO, world.maxx, world.maxy)
new /datum/random_map/noise/sif/forest(null, 1, 1, Z_LEVEL_SURFACE_WILD, world.maxx, world.maxy)
return 1
// Skybox Settings
+1 -1
View File
@@ -269,7 +269,7 @@
landmark_station = "escape_station"
landmark_transition = "escape_transit";
docking_controller_tag = "escape_shuttle"
ceiling_type = /turf/simulated/floor/reinforced/
ceiling_type = /turf/simulated/floor/reinforced
move_time = SHUTTLE_TRANSIT_DURATION_RETURN
/obj/effect/shuttle_landmark/cynosure/escape/offsite
+144
View File
@@ -0,0 +1,144 @@
/turf/simulated/floor/outdoors/mask // Used solely as a placeholder to avoid changeturf.
/datum/random_map/noise/sif
descriptor = "Sif plains (roundstart)"
smoothing_iterations = 3
target_turf_type = /turf/simulated/floor/outdoors/mask
smooth_single_tiles = TRUE
var/refresh_icons_post_apply = TRUE
/datum/random_map/noise/sif/cleanup()
..()
// Round down to 1-9.
for(var/x = 1, x <= limit_x, x++)
for(var/y = 1, y <= limit_y, y++)
var/current_cell = get_map_cell(x,y)
var/current_val = map[current_cell]
map[current_cell] = min(9,max(0,round((current_val/cell_range)*10)))
/datum/random_map/noise/sif/apply_to_map()
..()
if(refresh_icons_post_apply)
for(var/x = 1, x <= limit_x, x++)
for(var/y = 1, y <= limit_y, y++)
var/turf/simulated/floor/outdoors/T = locate((origin_x-1)+x,(origin_y-1)+y,origin_z)
if(istype(T))
T.update_icon()
/datum/random_map/noise/sif/get_appropriate_path(var/value)
switch(value)
if(0)
return /turf/simulated/floor/outdoors/mud/sif/planetuse
if(1 to 2)
return /turf/simulated/floor/outdoors/dirt/sif/planetuse
if(3 to 5)
return /turf/simulated/floor/outdoors/grass/sif/planetuse
if(6 to 8)
return /turf/simulated/floor/outdoors/grass/sif/forest/planetuse
if(9)
return /turf/simulated/floor/outdoors/snow/sif/planetuse
/datum/random_map/noise/sif/get_additional_spawns(var/value, var/turf/T)
if(prob(45) || T.check_density())
return
switch(value)
if(1 to 2)
if(prob(1))
new /obj/structure/flora/sif/eyes(T)
else if(prob(1))
new /obj/structure/flora/mushroom(T)
if(3 to 4)
if(prob(1))
new /obj/structure/flora/sif/eyes(T)
else if(prob(1))
new /obj/structure/flora/sif/tendrils(T)
else if(prob(1))
new /obj/structure/flora/mushroom(T)
if(5 to 6)
if(prob(1))
new /obj/structure/flora/tree/sif(T)
else if(prob(1))
new /obj/structure/flora/sif/tendrils(T)
else if(prob(1))
new /obj/structure/flora/sif/frostbelle(T)
else if (prob(1))
new /obj/structure/flora/sif/eyes(T)
if(7 to 8)
if(prob(5))
new /obj/structure/flora/tree/sif(T)
else if(prob(1))
new /obj/structure/flora/sif/frostbelle(T)
else if(prob(1))
new /obj/structure/flora/sif/eyes(T)
else if(prob(1))
new /obj/structure/flora/sif/tendrils(T)
/datum/random_map/noise/sif/forest
descriptor = "Sif forest (roundstart)"
/datum/random_map/noise/sif/forest/get_appropriate_path(var/value)
switch(value)
if(0 to 3)
return /turf/simulated/floor/outdoors/grass/sif/planetuse
if(4 to 6)
return /turf/simulated/floor/outdoors/grass/sif/forest/planetuse
if(7 to 9)
return /turf/simulated/floor/outdoors/snow/sif/planetuse
/datum/random_map/noise/sif/forest/get_additional_spawns(var/value, var/turf/T)
if(prob(25) || T.check_density())
return
switch(value)
if(0 to 5)
if(value >= 3 && prob(5))
new /obj/structure/flora/tree/sif(T)
return
if(prob(1))
new /obj/structure/flora/sif/eyes(T)
else if(prob(1))
new /obj/structure/flora/sif/tendrils(T)
else if(prob(1))
new /obj/structure/flora/mushroom(T)
if(6 to 9)
if(prob((value <= 7) ? 15 : 35))
new /obj/structure/flora/tree/sif(T)
return
if(prob(1))
new /obj/structure/flora/sif/frostbelle(T)
else if(prob(1))
new /obj/structure/flora/sif/eyes(T)
else if(prob(1))
new /obj/structure/flora/sif/tendrils(T)
/datum/random_map/noise/sif/underground
descriptor = "Sif underground (roundstart)"
target_turf_type = /turf/simulated/mineral/sif
skip_dense = TRUE
keep_outside = TRUE
refresh_icons_post_apply = FALSE
/datum/random_map/noise/sif/underground/get_appropriate_path(var/value)
switch(value)
if(0 to 2)
return /turf/simulated/floor/outdoors/mud/sif/planetuse
if(3 to 4)
return /turf/simulated/floor/outdoors/dirt/sif/planetuse
/datum/random_map/noise/sif/underground/get_additional_spawns(var/value, var/turf/T)
if(value <= 1 && prob(30)) // Mud is very fun-gy.
new /obj/structure/flora/mushroom(T)
else if(!prob(30))
var/mushroom_prob = 0
switch(value)
if(2)
mushroom_prob = 8
if(3)
mushroom_prob = 4
if(4 to 6)
mushroom_prob = 2
if(7)
mushroom_prob = 1
if(mushroom_prob && prob(mushroom_prob))
new /obj/structure/flora/mushroom(T)
else if(prob(0.1))
new /obj/structure/flora/sif/subterranean(T)
+3 -3
View File
@@ -11,7 +11,7 @@
"dm" = (/obj/random/obstruction,/turf/simulated/floor/tiled/dark,/area/template_noop)
"dr" = (/obj/machinery/shower{pixel_y = 3},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/southright{name = "Shower"},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/freezer,/area/template_noop)
"el" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/stack/tile/floor,/obj/item/device/radio/intercom{dir = 1; pixel_y = 21},/turf/simulated/floor/plating,/area/template_noop)
"eH" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/obj/item/frame/mirror,/turf/simulated/floor/tiled/freezer,/area/template_noop)
"eH" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/item/frame/mirror,/turf/simulated/floor/tiled/freezer,/area/template_noop)
"eO" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/wood,/area/template_noop)
"eQ" = (/turf/simulated/floor/tiled,/area/template_noop)
"fe" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/plating,/area/template_noop)
@@ -28,7 +28,7 @@
"mQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1},/obj/item/stack/cable_coil,/turf/simulated/floor/plating,/area/template_noop)
"nY" = (/obj/machinery/newscaster{pixel_y = -28},/turf/simulated/floor/plating,/area/template_noop)
"oR" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber,/obj/item/poster/custom,/turf/simulated/floor/wood,/area/template_noop)
"pj" = (/obj/item/tape/engineering,/obj/structure/disposalpipe/broken,/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers,/obj/machinery/atmospherics/pipe/cap/hidden/supply,/turf/simulated/floor/plating,/area/template_noop)
"pj" = (/obj/item/tape/engineering,/obj/structure/disposalpipe/broken,/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers,/obj/machinery/atmospherics/pipe/cap/hidden/supply,/turf/simulated/floor/plating,/area/template_noop)
"qb" = (/obj/structure/closet/wardrobe/suit,/turf/simulated/floor/tiled/dark,/area/template_noop)
"qG" = (/obj/machinery/vending/fitness{dir = 4},/turf/simulated/floor/tiled/dark,/area/template_noop)
"su" = (/obj/structure/closet/wardrobe/mixed,/turf/simulated/floor/tiled/dark,/area/template_noop)
@@ -55,7 +55,7 @@
"DV" = (/turf/template_noop,/area/template_noop)
"Eo" = (/turf/simulated/floor/wood,/area/template_noop)
"Fn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8},/turf/simulated/floor/tiled,/area/template_noop)
"FE" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/freezer,/area/template_noop)
"FE" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/freezer,/area/template_noop)
"FP" = (/obj/machinery/recharge_station,/turf/simulated/floor/tiled/dark,/area/template_noop)
"GY" = (/obj/effect/floor_decal/spline/plain{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals_central4{dir = 4},/obj/item/weapon/stool{dir = 1},/turf/simulated/floor/tiled,/area/template_noop)
"It" = (/obj/machinery/newscaster{pixel_y = 26},/turf/simulated/floor/wood,/area/template_noop)
+2 -2
View File
@@ -7,10 +7,10 @@
"z" = (/obj/structure/railing{dir = 8},/obj/structure/railing,/turf/simulated/floor/plating,/area/template_noop)
"C" = (/turf/simulated/wall/r_wall,/area/template_noop)
"D" = (/obj/structure/railing{dir = 4},/obj/structure/railing,/turf/simulated/floor/plating,/area/template_noop)
"F" = (/obj/structure/sign/poster{pixel_y = 32; poster_decl = /decl/poster/pol_11},/turf/simulated/floor/plating,/area/template_noop)
"F" = (/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/pol_11},/turf/simulated/floor/plating,/area/template_noop)
"G" = (/obj/random/trash,/turf/simulated/floor/plating,/area/template_noop)
"I" = (/obj/random/crate,/obj/random/contraband,/obj/random/contraband,/obj/random/maintenance/engineering,/obj/random/maintenance/security,/obj/random/maintenance/security,/turf/simulated/floor/plating,/area/template_noop)
"J" = (/obj/structure/sign/poster{pixel_y = 32; poster_decl = /decl/poster/pol_16},/turf/simulated/floor/plating,/area/template_noop)
"J" = (/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/pol_16},/turf/simulated/floor/plating,/area/template_noop)
"L" = (/obj/random/crate,/obj/random/plushie,/obj/random/maintenance/clean,/obj/random/medical,/obj/random/medical/lite,/obj/random/medical/lite,/turf/simulated/floor/plating,/area/template_noop)
"N" = (/turf/simulated/floor/plating,/area/template_noop)
"O" = (/turf/simulated/wall,/area/template_noop)
+1 -1
View File
@@ -24,7 +24,7 @@
"L" = (/obj/item/trash/candy,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
"M" = (/obj/structure/window/basic{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/template_noop)
"O" = (/obj/machinery/light/small,/turf/simulated/floor/wood,/area/template_noop)
"R" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/mouse,/obj/structure/sign/poster{pixel_y = 32; poster_decl = /decl/poster/vore_91},/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
"R" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/mouse,/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/vore_91},/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
"S" = (/obj/item/weapon/shreddedp,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
"T" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/item/device/flashlight/lamp/green,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/template_noop)
"V" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
+1 -1
View File
@@ -3,7 +3,7 @@
"h" = (/obj/effect/decal/remains/lizard,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
"k" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/powercell,/turf/simulated/floor/wood,/area/template_noop)
"m" = (/turf/template_noop,/area/template_noop)
"n" = (/obj/structure/dogbed,/obj/structure/sign/poster{pixel_y = 32; poster_decl = /decl/poster/vore_45},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
"n" = (/obj/structure/dogbed,/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/vore_45},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
"o" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance,/obj/random/drinksoft,/obj/random/snack,/turf/simulated/floor/wood,/area/template_noop)
"p" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/lizard/large,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
"u" = (/obj/structure/flora/pottedplant/overgrown,/turf/simulated/floor/wood,/area/template_noop)