Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

* Replace SSingulo with SScalamity; processing cleanup
- SScalamity now handles blobs as well as singularity-types.
- Processing subtypes have been simplified to not require a stop_processing definition.

* this is probably important

* Remove cascade disabling SSgarbage

* Fixed a bug where dust() did not qdel the target mob

* Misc fixes

* Fix decals surviving break-to-plating

* Subsystem flag tweaks

* Apparently subsystems are new'd before config is.

* Fix paper icons

* Speculative fix for insane lag

* Better machinery stat

* Make organs not use SSoverlay

* Misc bugfixes & tweaks

* Nightmode fixes

* Changelog for SMC

* Port /tg/'s improved MC crash handling

* Add some more SS Recover() procs

* supply_controller -> SScargo

* More New() -> Initialize()

* pAI and robot construction overlays

* Fix cargo unit tests

* Merge the DMM Suite's atom/New() into atoms_init

* Lighting pre-baking

* Lighting initialization logging

* Fix some bad SS init orders

* Fix SSlighting logging; rename Processes to MC

* Speculative fix for insane GC lag

* Prebaked openturf/icon_smooth & fix lighting prebake

* SS init status; SSatoms LATEQDEL

* Fix bug with MC init stat panel

* Fix parallax

* Misc

* Ignore SS_NO_DISPLAY during init

* apparently this is important

* REEEEEE

* Image GC fixes; broadcaster radio-new sanity

* RCON Cleanup

* Move pAI recruiter into subsystem

* Move global solars list into sun subsystem

* Make chickens not use a global

* Demote SSdisposals to SS_BACKGROUND; garbage-debug cleanup

* Speed up space init a little

* Fix bad timer flags on floor drying

* Subsystem panic-restart verb for mins

* Explosion speedup

* Minor subsystem & MC logging tweaks

* SSopenturf improvements

* Make pipenet actually initialize (whoops)

* Minor tweaks

* Implement lighting rounding

* comments are hard okay

* Minor lattice tweaks

* Fix some timer issues & better closet init

* Timer sanity

* Request console tweaks + Storage init sanity

* Minor SSmachiner RCON improvements

* Further reduce world-start timer count

* Standardize subsystem logging

* Garbage hard delete profiling from /tg/

* Timer hang detection & recovery

* Log machines that sleep in process() and fuck up SSmachinery

* Fix an issue with external airlocks sleeping in process()

* Failsafe logging

* Minor tweaks

* Revert "Request console tweaks + Storage init sanity"

This reverts commit 98d3579e35.

* Re-implement RC changes

* Fix SQL FT saving

* Fix SSmachinery sleep in disposals

* Minor SS tweaks

* Paper fixes

* Blood drying fixes

* Merge gameticker and SSticker

* Minor global list init cleanup

* Lagcheck biogenerator & bags

* Tweak SScargo init order; RIG Initialize()

* Caching tweaks

* Remove rogue comma

* Initialize fixes

* Lighting destroy cleanup

* Fix emagging airlocks

* Initial SSicon implementation

* Tweaks & Fixes

* Fire + Air alarm queued icon updates

* Overlays + Queued icon cleanup

* Runtime & background fixes

* Kill some meaningless set statements

* Kill some image qdels

* Bump up lighting rounding val

* Fix adv. scanner destroy runtimes

* Remove unneeded icon update limiting

* Move icon smoothing into helpers

* Show a warning if DM 510 compiles without memory leak hack enabled

* Re-organize subsystems & MC defines a little

* Airlock SFX

* Log of Changes

* Make SSicon_update disable itself when not doing anything

* Fix respawn verb runtime when used early in server-init

* Add more information to MC's stat_entry()

* Replace direct refernces to gcDestroyed with QDEL* macros

* plant_controller -> SSplants

* More plant tweaks

* Add more humor to changelog

* Move parallax globals into SSparallax

* Lighting responsiveness tweaks

* Fix parallax init order & better MC init panel stat

* Make mobs GC

* More overlays + Remove intercom spawn()

* SSfast_process; make pinpointers not use spawn-recursion to process
Also made the SM Cascade beach process with SSprocessing instead of a spawn loop.

* Update changelog

* Mob GC tweaks

* Del() cleanup

* Fix insomniac ZAS connection edges

* Minor pAI cleanup

* Convert more things to SSoverlay; fix duplicated overlay in field gens

* SM Bluespace turf tweaks

* Update SSgarbage debug globals list

* Human-type qdel tweaks

* Subsystem suspension; stat_entry improvements

* SQL Statistics cleanup

* Fix runtimes with ambrosia

* More disable() -> suspend(); fix nightmode again

* Human qdel fix; minor tweaks

* Update turbolift to work with StonedMC

* Make lifts use timers instead of a subsystem

* Make SSassets start earlier

* Convert the radio controller into a subsystem

* Fix some missing CHECK_TICKs in asteroid generation

* MC stat tweaks; make shouldnt_see a typecache

* Kill some redundant debug-controller entries

* radio_controller -> SSradio

* Better SSgarbage hard-del logging from /tg/ upstream

* Logging tweaks + GELF

* Misc client caching improvements

* Slime SSoverlay

* Oven icon fixes

* Implant fixes
- Death implants will no longer spam Common on death of user.
- Death implants should handle a deleted user better.

* Holder tweaks + Welding tool Initialize()

* Fix some bad subsystem logging

* Fix suit cooling units spawning without cells

* Starlight tweaks

* Gibber infinite gib fix

* More SSoverlay stuff

* Make crates use CUT_OVERLAY_IN

* Make SSarrivals suspend instead of disable

* Make openturf use split/phased tick checks

* Speculative fix for unwet timer runtimes

* Blood overlay tweaks/fixes

* Update crusher to play nice with SMC + SSoverlay

* Openturf improvements and fixes

* Minor turbolift tweaks

* Lighting performance improvements + ChangeTurf tweaks

* this is probably important

* Fix wall weld noises on changeturf

* More ChangeTurf tweaks

* Explosion tweaks

* Pre-game lobby tweaks

* Openturf tweaks

* Prevent admins from starting the game before init finishes

* Fix Travis

* Kill an unused var

* Fix ChangeTurf runtimes on openturfs

* Fixes

* Browser datum fixes, asset caching

* Update changelog

* Changelog

* Lobby tweaks

* Ticker tweaks; kill ticker var

* Further lobby tweaks

* Cascade tweaks

* air_master -> SSair

* Reduce overhead from radio autosay

* alarm_manager -> SSalarm

* bomb_processor -> SSexplosives

* corp_regs -> SSlaw

* ZAS overlay fixes

* Small wall icon optimization

* Fix effects master

* Assembly tweaks

* Megavend fixes

* Shuttle fixes

* Camera alert performance improvements

* Fix some world.log spam from lighting overlays

* Fix some Initialize() procs

* Openspace responsiveness tweaks

* Make HE pipes animate through openturfs

* Kill a spawn
This commit is contained in:
Lohikar
2017-05-02 13:40:40 -05:00
committed by LordFowl
parent 9dbf27a0f4
commit f6dc33a465
872 changed files with 17767 additions and 13417 deletions
+3 -1
View File
@@ -27,7 +27,8 @@
set_map_size()
for(var/x = 1, x <= limit_x, x++)
for(var/y = 1, y <= limit_y, y++)
current_cell = get_map_cell(x,y)
PREPARE_CELL(x,y)
current_cell = tmp_cell
next_map[current_cell] = map[current_cell]
count = 0
@@ -68,6 +69,7 @@
KILL_CELL(current_cell, next_map)
CHECK_TICK
map = next_map
/datum/random_map/automata/proc/revive_cell(var/target_cell, var/list/use_next_map, var/final_iter)
+19 -4
View File
@@ -1,3 +1,6 @@
#define GET_BELOW_OR_NULL(atom, z) \
(!(z > world.maxz || z > 17 || z < 2) && z_levels & (1 << (z - 2))) ? get_step(atom, DOWN) : null
/datum/random_map/automata/cave_system
iterations = 5
descriptor = "moon caves"
@@ -41,8 +44,10 @@
var/door_count = 0
var/empty_count = 0
while((ore_count>0) && (ore_turfs.len>0))
if(!priority_process)
CHECK_TICK
var/check_cell = pick(ore_turfs)
ore_turfs -= check_cell
if(prob(75))
@@ -96,6 +101,7 @@
num_applied += 1
new new_path(T)
CHECK_TICK
game_log("ASGEN", "Applied [num_applied] turfs.")
@@ -123,6 +129,7 @@
var/tmp_cell
var/x
var/y
var/z
var/new_path
var/num_applied = 0
for (var/thing in block(locate(origin_x, origin_y, origin_z), locate(limit_x, limit_y, origin_z)))
@@ -133,6 +140,7 @@
x = T.x
y = T.y
z = T.z
PREPARE_CELL(x,y)
@@ -145,15 +153,16 @@
if(EMPTY_CHAR)
new_path = mineral_rich
if(FLOOR_CHAR)
var/turf/below = GetBelow(T)
var/turf/below = GET_BELOW_OR_NULL(T, z)
if(below)
var/area/below_area = get_area(below)
if(below_area in the_station_areas)
var/area/below_area = below.loc // Let's just assume that the turf is not in nullspace.
if(below_area.station_area)
new_path = wall_type
else if(below.density)
new_path = wall_type
else
new_path = floor_type
if(WALL_CHAR)
new_path = wall_type
@@ -162,14 +171,20 @@
num_applied += 1
new new_path(T)
CHECK_TICK
game_log("ASGEN", "Applied [num_applied] turfs.")
/datum/random_map/automata/cave_system/chasms/cleanup()
return
/datum/random_map/automata/cave_system/chasms/surface
descriptor = "chasm surface"
wall_type = /turf/simulated/floor/asteroid
floor_type = /turf/simulated/open/airless
target_turf_type = /turf/unsimulated/chasm_mask
mineral_sparse = /turf/simulated/floor/asteroid
mineral_rich = /turf/simulated/floor/asteroid
mineral_rich = /turf/simulated/floor/asteroid
#undef GET_BELOW_OR_NULL
+9 -10
View File
@@ -1,5 +1,5 @@
/turf/simulated/wall/diona/New(var/newloc)
..(newloc,"biomass")
/turf/simulated/wall/diona/Initialize(mapload)
. = ..(mapload,"biomass")
/turf/simulated/wall/diona/attack_generic(var/mob/user, var/damage, var/attack_message)
if(istype(user, /mob/living/carbon/alien/diona))
@@ -38,7 +38,7 @@
if(1)
new_growth = 2
var/obj/structure/diona/vines/existing = locate() in T
if(!istype(existing)) existing = getFromPool(/obj/structure/diona/vines, T)
if(!istype(existing)) existing = new /obj/structure/diona/vines(T)
if(existing.growth < new_growth)
existing.growth = new_growth
existing.update_icon()
@@ -50,10 +50,9 @@
name = "glow bulb"
desc = "A glowing bulb of some sort."
icon_state = "glowbulb"
/obj/structure/diona/bulb/New(var/newloc)
..()
set_light(3,3,"#557733")
light_power = 3
light_range = 3
light_color = "#557733"
/datum/random_map/automata/diona
iterations = 3
@@ -161,12 +160,12 @@
switch(value)
if(ARTIFACT_CHAR)
getFromPool(/obj/structure/diona/bulb,T)
new /obj/structure/diona/bulb(T)
if(MONSTER_CHAR)
spawn_diona_nymph(T)
if(DOOR_CHAR)
var/obj/structure/diona/vines/V = getFromPool(/obj/structure/diona/vines,T)
var/obj/structure/diona/vines/V = new(T)
V.growth = 3
V.update_icon()
spawn(1)
V.spread()
V.spread()
+1 -4
View File
@@ -3,7 +3,7 @@ var/global/list/datum/supply_drop_loot/supply_drop
/proc/supply_drop_random_loot_types()
if(!supply_drop)
supply_drop = init_subtypes(/datum/supply_drop_loot)
supply_drop = dd_sortedObjectList(supply_drop)
sortTim(supply_drop, /proc/cmp_supply_drop, FALSE)
return supply_drop
/datum/supply_drop_loot
@@ -19,9 +19,6 @@ var/global/list/datum/supply_drop_loot/supply_drop
for(var/content in contents())
new content(C)
/datum/supply_drop_loot/dd_SortValue()
return name
/datum/supply_drop_loot/supermatter
name = "Supermatter"
/datum/supply_drop_loot/supermatter/New()
+30 -29
View File
@@ -35,13 +35,13 @@
// Instantiate the grid.
for(var/x = 1, x <= limit_x, x++)
for(var/y = 1, y <= limit_y, y++)
map[get_map_cell(x,y)] = 0
map[GET_MAP_CELL(x,y)] = 0
// Now dump in the actual random data.
map[get_map_cell(1,1)] = cell_base+rand(initial_cell_range)
map[get_map_cell(1,limit_y)] = cell_base+rand(initial_cell_range)
map[get_map_cell(limit_x,limit_y)] = cell_base+rand(initial_cell_range)
map[get_map_cell(limit_x,1)] = cell_base+rand(initial_cell_range)
map[GET_MAP_CELL(1,1)] = cell_base+rand(initial_cell_range)
map[GET_MAP_CELL(1,limit_y)] = cell_base+rand(initial_cell_range)
map[GET_MAP_CELL(limit_x,limit_y)] = cell_base+rand(initial_cell_range)
map[GET_MAP_CELL(limit_x,1)] = cell_base+rand(initial_cell_range)
/datum/random_map/noise/generate_map()
// Begin recursion.
@@ -69,33 +69,33 @@
(x,y)----------(x+hsize,y)----------(x+isize,y)
*/
// Central edge values become average of corners.
map[get_map_cell(x+hsize,y+isize)] = round((\
map[get_map_cell(x,y+isize)] + \
map[get_map_cell(x+isize,y+isize)] \
map[GET_MAP_CELL(x+hsize,y+isize)] = round((\
map[GET_MAP_CELL(x,y+isize)] + \
map[GET_MAP_CELL(x+isize,y+isize)] \
)/2)
map[get_map_cell(x+hsize,y)] = round(( \
map[get_map_cell(x,y)] + \
map[get_map_cell(x+isize,y)] \
map[GET_MAP_CELL(x+hsize,y)] = round(( \
map[GET_MAP_CELL(x,y)] + \
map[GET_MAP_CELL(x+isize,y)] \
)/2)
map[get_map_cell(x,y+hsize)] = round(( \
map[get_map_cell(x,y+isize)] + \
map[get_map_cell(x,y)] \
map[GET_MAP_CELL(x,y+isize)] + \
map[GET_MAP_CELL(x,y)] \
)/2)
map[get_map_cell(x+isize,y+hsize)] = round(( \
map[get_map_cell(x+isize,y+isize)] + \
map[get_map_cell(x+isize,y)] \
map[GET_MAP_CELL(x+isize,y+hsize)] = round(( \
map[GET_MAP_CELL(x+isize,y+isize)] + \
map[GET_MAP_CELL(x+isize,y)] \
)/2)
// Centre value becomes the average of all other values + possible random variance.
var/current_cell = get_map_cell(x+hsize,y+hsize)
var/current_cell = GET_MAP_CELL(x+hsize,y+hsize)
map[current_cell] = round(( \
map[get_map_cell(x+hsize,y+isize)] + \
map[get_map_cell(x+hsize,y)] + \
map[get_map_cell(x,y+hsize)] + \
map[get_map_cell(x+isize,y)] \
map[GET_MAP_CELL(x+hsize,y+isize)] + \
map[GET_MAP_CELL(x+hsize,y)] + \
map[GET_MAP_CELL(x,y+hsize)] + \
map[GET_MAP_CELL(x+isize,y)] \
)/4)
if(prob(random_variance_chance))
@@ -125,35 +125,36 @@
var/total = 0
// Get the average neighboring value.
var/tmp_cell = get_map_cell(x+1,y+1)
var/tmp_cell
PREPARE_CELL(x+1,y+1)
if(tmp_cell)
total += map[tmp_cell]
val_count++
tmp_cell = get_map_cell(x-1,y-1)
PREPARE_CELL(x-1,y-1)
if(tmp_cell)
total += map[tmp_cell]
val_count++
tmp_cell = get_map_cell(x+1,y-1)
PREPARE_CELL(x+1,y-1)
if(tmp_cell)
total += map[tmp_cell]
val_count++
tmp_cell = get_map_cell(x-1,y+1)
PREPARE_CELL(x-1,y+1)
if(tmp_cell)
total += map[tmp_cell]
val_count++
tmp_cell = get_map_cell(x-1,y)
PREPARE_CELL(x-1,y)
if(tmp_cell)
total += map[tmp_cell]
val_count++
tmp_cell = get_map_cell(x,y-1)
PREPARE_CELL(x,y-1)
if(tmp_cell)
total += map[tmp_cell]
val_count++
tmp_cell = get_map_cell(x+1,y)
PREPARE_CELL(x+1,y)
if(tmp_cell)
total += map[tmp_cell]
val_count++
tmp_cell = get_map_cell(x,y+1)
PREPARE_CELL(x,y+1)
if(tmp_cell)
total += map[tmp_cell]
val_count++
+5 -3
View File
@@ -52,8 +52,10 @@
T.resources["silicates"] = rand(3,5)
T.resources["carbonaceous rock"] = rand(3,5)
var/current_cell = map[get_map_cell(x,y)]
if(current_cell < rare_val) // Surface metals.
var/tmp_cell
PREPARE_CELL(x, y)
if(tmp_cell < rare_val) // Surface metals.
T.resources["iron"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
T.resources["gold"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
T.resources["silver"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
@@ -62,7 +64,7 @@
T.resources["phoron"] = 0
T.resources["osmium"] = 0
T.resources["hydrogen"] = 0
else if(current_cell < deep_val) // Rare metals.
else if(tmp_cell < deep_val) // Rare metals.
T.resources["gold"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
T.resources["silver"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
T.resources["uranium"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)