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
@@ -1,8 +1,3 @@
#define NTR_NORMAL 0
#define NTR_OVERLOAD 1
#define NTR_DISABLE 2
#define NTR_POWERLOSS 3
// Relays don't handle any actual communication. Global NTNet datum does that, relays only tell the datum if it should or shouldn't work.
/obj/machinery/ntnet_relay
name = "NTNet Quantum Relay"
@@ -24,8 +19,6 @@
var/dos_capacity = 500 // Amount of DoS "packets" in buffer required to crash the relay
var/dos_dissipate = 1 // Amount of DoS "packets" dissipated over time.
var/overlay_cache = list()
// TODO: Implement more logic here. For now it's only a placeholder.
/obj/machinery/ntnet_relay/operable()
if(!..(EMPED))
@@ -36,44 +29,25 @@
return 0
return 1
/obj/machinery/ntnet_relay/proc/get_state()
if (!enabled)
return NTR_DISABLE
if (dos_failure)
return NTR_OVERLOAD
if (!operable())
return NTR_POWERLOSS
return NTR_NORMAL
/obj/machinery/ntnet_relay/update_icon()
var/state = get_state()
icon_state = initial(icon_state)
cut_overlays()
if (panel_open)
icon_state += "_o"
switch (state)
if (NTR_NORMAL)
overlays += overlay_cache["ok"]
overlays -= overlay_cache["problem"]
overlays -= overlay_cache["error"]
if (!operable())
icon_state += "_off"
if (NTR_OVERLOAD)
overlays -= overlay_cache["ok"]
overlays += overlay_cache["problem"]
overlays -= overlay_cache["error"]
if (NTR_DISABLE)
overlays -= overlay_cache["ok"]
overlays -= overlay_cache["problem"]
overlays += overlay_cache["error"]
else if (dos_failure)
add_overlay("ntnet_o_problem")
else if (!enabled)
add_overlay("ntnet_o_error")
if (NTR_POWERLOSS)
overlays -= overlay_cache["ok"]
overlays -= overlay_cache["problem"]
overlays -= overlay_cache["error"]
icon_state += "_off"
else
add_overlay("ntnet_o_ok")
/obj/machinery/ntnet_relay/process()
if(operable())
@@ -133,11 +107,6 @@
component_parts += new /obj/item/stack/cable_coil(src,15)
component_parts += new /obj/item/weapon/circuitboard/ntnet_relay(src)
overlay_cache = list()
overlay_cache["ok"] = image('icons/obj/machines/telecomms.dmi', "ntnet_o_ok")
overlay_cache["problem"] = image('icons/obj/machines/telecomms.dmi', "ntnet_o_problem")
overlay_cache["error"] = image('icons/obj/machines/telecomms.dmi', "ntnet_o_error")
update_icon()
if(ntnet_global)
@@ -154,7 +123,7 @@
for(var/datum/computer_file/program/ntnet_dos/D in dos_sources)
D.target = null
D.error = "Connection to quantum relay severed"
..()
return ..()
/obj/machinery/ntnet_relay/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
if(istype(W, /obj/item/weapon/screwdriver))
@@ -175,7 +144,3 @@
qdel(src)
return
..()
#undef NTR_NORMAL
#undef NTR_OVERLOAD
#undef NTR_DISABLE
@@ -50,24 +50,25 @@
for (var/datum/computer_file/program/prog in programs)
hard_drive.store_file(prog)
/obj/item/modular_computer/New()
processing_objects.Add(src)
/obj/item/modular_computer/Initialize()
. = ..()
START_PROCESSING(SSprocessing, src)
install_default_hardware()
if(hard_drive)
install_default_programs()
update_icon()
..()
/obj/item/modular_computer/Destroy()
kill_program(1)
for(var/obj/item/weapon/computer_hardware/CH in src.get_all_components())
uninstall_component(null, CH)
qdel(CH)
STOP_PROCESSING(SSprocessing, src)
return ..()
/obj/item/modular_computer/emag_act(var/remaining_charges, var/mob/user)
if(computer_emagged)
to_chat(user, "\The [src] was already emagged.")
to_chat(user, "\The [src] has already been emagged.")
return NO_EMAG_ACT
else
computer_emagged = 1
@@ -77,14 +78,14 @@
/obj/item/modular_computer/update_icon()
icon_state = icon_state_unpowered
overlays.Cut()
cut_overlays()
if(!enabled)
var/probably_working = hard_drive && processor_unit && damage < broken_damage && (apc_power(0) || battery_power(0))
if(icon_state_screensaver && probably_working)
if (is_holographic)
holographic_overlay(src, src.icon, icon_state_screensaver)
else
overlays += image(icon_state_screensaver)
add_overlay(icon_state_screensaver)
if (screensaver_light_range && probably_working)
set_light(screensaver_light_range, 1, screensaver_light_color ? screensaver_light_color : "#FFFFFF")
@@ -96,13 +97,13 @@
if (is_holographic)
holographic_overlay(src, src.icon, state)
else
overlays += image(state)
add_overlay(state)
set_light(light_strength, l_color = active_program.color)
else
if (is_holographic)
holographic_overlay(src, src.icon, icon_state_menu)
else
overlays += image(icon_state_menu)
add_overlay(icon_state_menu)
set_light(light_strength, l_color = menu_light_color)
/obj/item/modular_computer/proc/turn_on(var/mob/user)
@@ -14,7 +14,7 @@
H.forceMove(newloc)
if(prob(25))
H.take_damage(rand(10,30))
//relay_qdel()
qdel(src)
/obj/item/modular_computer/proc/take_damage(var/amount, var/component_probability, var/damage_casing = 1, var/randomize = 1)
@@ -29,5 +29,5 @@
if(anchored)
..()
else
overlays.Cut()
cut_overlays()
icon_state = icon_state_closed
@@ -23,7 +23,7 @@ var/global/file_uid = 0
if(holder.holder2 && holder.holder2.active_program == src)
holder.holder2.kill_program(1)
holder = null
..()
return ..()
// Returns independent copy of this file.
/datum/computer_file/proc/clone(var/rename = 0)
@@ -36,4 +36,4 @@ var/global/file_uid = 0
else
temp.filename = filename
temp.filetype = filetype
return temp
return temp
@@ -243,7 +243,7 @@
/datum/nano_module/program/comm/proc/post_status(var/command, var/data1, var/data2)
var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435)
var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)
if(!frequency) return
@@ -40,4 +40,4 @@
if(stored_card)
stored_card.forceMove(get_turf(holder2))
holder2 = null
..()
return ..()
@@ -15,4 +15,4 @@
if(stored_card)
stored_card.forceMove(get_turf(holder2))
holder2 = null
..()
return ..()
@@ -162,7 +162,7 @@
if(holder2 && (holder2.hard_drive == src))
holder2.hard_drive = null
stored_files = null
..()
return ..()
/obj/item/weapon/computer_hardware/hard_drive/New()
install_default_programs()
@@ -43,4 +43,4 @@
if(holder2 && (holder2.nano_printer == src))
holder2.nano_printer = null
holder2 = null
..()
return ..()
@@ -52,7 +52,7 @@ var/global/ntnet_card_uid = 1
if(holder2 && (holder2.network_card == src))
holder2.network_card = null
holder2 = null
..()
return ..()
// Returns a string identifier of this network card
/obj/item/weapon/computer_hardware/network_card/proc/get_network_tag()
@@ -92,4 +92,4 @@ var/global/ntnet_card_uid = 1
/obj/item/weapon/computer_hardware/network_card/Destroy()
if(holder2 && (holder2.network_card == src))
holder2.network_card = null
..()
return ..()
@@ -42,7 +42,8 @@
desc = "A crate containing a backup of all the NT Software available"
name = "Backup Software Crate"
/obj/structure/closet/crate/software_backup/initialize()
/obj/structure/closet/crate/software_backup/Initialize()
. = ..()
for(var/F in typesof(/datum/computer_file/program))
var/datum/computer_file/program/prog = new F
// Invalid type (shouldn't be possible but just in case), invalid filetype (not executable program) or invalid filename (unset program)
@@ -12,4 +12,4 @@
/obj/item/weapon/computer_hardware/tesla_link/Destroy()
if(holder2 && (holder2.tesla_link == src))
holder2.tesla_link = null
..()
return ..()