From 634efb135bc8d063139a0ca3a1d371771fd8a0c8 Mon Sep 17 00:00:00 2001 From: Archemagus <32466328+Archemagus@users.noreply.github.com> Date: Wed, 18 May 2022 14:50:56 +0300 Subject: [PATCH 1/4] Damn --- nsv13/code/modules/overmap/ai-skynet.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsv13/code/modules/overmap/ai-skynet.dm b/nsv13/code/modules/overmap/ai-skynet.dm index c683dbcd327..9f988205dc9 100644 --- a/nsv13/code/modules/overmap/ai-skynet.dm +++ b/nsv13/code/modules/overmap/ai-skynet.dm @@ -337,7 +337,7 @@ Adding tasks is easy! Just define a datum for it. SSovermap_mode.modify_threat_elevation(TE_FLEET_THREAT_DYNAMIC ? (TE_FLEET_KILL_THREAT * applied_size ) : TE_FLEET_KILL_THREAT) QDEL_NULL(src) -/datum/fleet/nanotrasen/earth/defeat() +/datum/fleet/solgov/earth/defeat() . = ..() //If you lose sol...game over man, game over. priority_announce("SolGov command do you read?! Requesting immediate assistance, we have a foothold situation, repeat, a foothold sit##----///", "White Rapids Fleet Command") SSticker.mode.check_finished(TRUE) From ad4cd1a44dbf5655693801453fb916857e27814c Mon Sep 17 00:00:00 2001 From: Archemagus <32466328+Archemagus@users.noreply.github.com> Date: Wed, 18 May 2022 14:53:28 +0300 Subject: [PATCH 2/4] BRUH --- nsv13/code/modules/overmap/ai-skynet.dm | 35 ++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/nsv13/code/modules/overmap/ai-skynet.dm b/nsv13/code/modules/overmap/ai-skynet.dm index 9f988205dc9..c55271c3444 100644 --- a/nsv13/code/modules/overmap/ai-skynet.dm +++ b/nsv13/code/modules/overmap/ai-skynet.dm @@ -337,7 +337,7 @@ Adding tasks is easy! Just define a datum for it. SSovermap_mode.modify_threat_elevation(TE_FLEET_THREAT_DYNAMIC ? (TE_FLEET_KILL_THREAT * applied_size ) : TE_FLEET_KILL_THREAT) QDEL_NULL(src) -/datum/fleet/solgov/earth/defeat() +/datum/fleet/nanotrasen/earth/defeat() . = ..() //If you lose sol...game over man, game over. priority_announce("SolGov command do you read?! Requesting immediate assistance, we have a foothold situation, repeat, a foothold sit##----///", "White Rapids Fleet Command") SSticker.mode.check_finished(TRUE) @@ -954,6 +954,39 @@ Adding tasks is easy! Just define a datum for it. audio_cues = list() fleet_trait = FLEET_TRAIT_DEFENSE +// SHITCODE FIX START +/datum/fleet/nanotrasen/earth + name = "\proper Earth Defense Force" + taunts = list("You're foolish to venture this deep into Solgov space! Main batteries stand ready.", "All hands, set condition 1 throughout the fleet, enemy vessel approaching.", "Defense force, stand ready!", "We shall protect our homeland!") + size = FLEET_DIFFICULTY_HARD + allow_difficulty_scaling = FALSE + audio_cues = list() + fleet_trait = FLEET_TRAIT_DEFENSE + +/datum/fleet/nanotrasen/earth/assemble(datum/star_system/SS, difficulty) + . = ..() + if(!scanning) + addtimer(CALLBACK(src, .proc/scan), scan_delay) + scanning = TRUE + +/datum/fleet/nanotrasen/earth/proc/scan() + scanning = FALSE + if(!current_system) + return FALSE + for(var/obj/structure/overmap/OM in current_system.system_contents) + OM.relay('nsv13/sound/effects/ship/solgov_scan.ogg') + sleep(5 SECONDS) + for(var/obj/structure/overmap/shield_scan_target in current_system.system_contents) + if(istype(shield_scan_target, /obj/structure/overmap/nanotrasen/solgov)) + continue //We don't scan our own boys. + //Ruh roh.... (Persona non gratas do not need to be scanned again.) + if((shield_scan_target.faction != shield_scan_target.name) && shield_scan_target.shields && shield_scan_target.shields.active && length(shield_scan_target.occupying_levels)) + shield_scan_target.hail("Scans have detected that you are in posession of prohibited technology. \n Your IFF signature has been marked as 'persona non grata'. \n In accordance with SGC-reg #10124, your ship and lives are now forfeit. Evacuate all civilian personnel immediately and surrender yourselves.", name) + shield_scan_target.relay_to_nearby('nsv13/sound/effects/ship/solgov_scan_alert.ogg', ignore_self=FALSE) + shield_scan_target.faction = shield_scan_target.name + +// SHITCODE FIX END + /datum/fleet/solgov/assemble(datum/star_system/SS, difficulty) . = ..() if(!scanning) From 2c7d3fc0d0fbed41a37da0fd4c75ced2143e323c Mon Sep 17 00:00:00 2001 From: ArcheAccount <92991746+ArcheAccount@users.noreply.github.com> Date: Wed, 18 May 2022 15:16:14 +0300 Subject: [PATCH 3/4] TestMergeConflicts --- nsv13/code/modules/Security/genpop.dm | 35 +++++++++++++++++++++++++ nsv13/code/modules/overmap/ai-skynet.dm | 33 ----------------------- 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/nsv13/code/modules/Security/genpop.dm b/nsv13/code/modules/Security/genpop.dm index f280500bea5..ac6d535d06f 100644 --- a/nsv13/code/modules/Security/genpop.dm +++ b/nsv13/code/modules/Security/genpop.dm @@ -5,6 +5,41 @@ #define PRESET_MEDIUM 3 MINUTES #define PRESET_LONG 5 MINUTES + +// SHITCODE FIX START +/datum/fleet/nanotrasen/earth + name = "\proper Earth Defense Force" + taunts = list("You're foolish to venture this deep into Solgov space! Main batteries stand ready.", "All hands, set condition 1 throughout the fleet, enemy vessel approaching.", "Defense force, stand ready!", "We shall protect our homeland!") + size = FLEET_DIFFICULTY_HARD + allow_difficulty_scaling = FALSE + audio_cues = list() + fleet_trait = FLEET_TRAIT_DEFENSE + +/datum/fleet/nanotrasen/earth/assemble(datum/star_system/SS, difficulty) + . = ..() + if(!scanning) + addtimer(CALLBACK(src, .proc/scan), scan_delay) + scanning = TRUE + +/datum/fleet/nanotrasen/earth/proc/scan() + scanning = FALSE + if(!current_system) + return FALSE + for(var/obj/structure/overmap/OM in current_system.system_contents) + OM.relay('nsv13/sound/effects/ship/solgov_scan.ogg') + sleep(5 SECONDS) + for(var/obj/structure/overmap/shield_scan_target in current_system.system_contents) + if(istype(shield_scan_target, /obj/structure/overmap/nanotrasen/solgov)) + continue //We don't scan our own boys. + //Ruh roh.... (Persona non gratas do not need to be scanned again.) + if((shield_scan_target.faction != shield_scan_target.name) && shield_scan_target.shields && shield_scan_target.shields.active && length(shield_scan_target.occupying_levels)) + shield_scan_target.hail("Scans have detected that you are in posession of prohibited technology. \n Your IFF signature has been marked as 'persona non grata'. \n In accordance with SGC-reg #10124, your ship and lives are now forfeit. Evacuate all civilian personnel immediately and surrender yourselves.", name) + shield_scan_target.relay_to_nearby('nsv13/sound/effects/ship/solgov_scan_alert.ogg', ignore_self=FALSE) + shield_scan_target.faction = shield_scan_target.name + +// SHITCODE FIX END +// Do not ask why + /obj/machinery/turnstile name = "turnstile" desc = "A mechanical door that permits one-way access to the brig." diff --git a/nsv13/code/modules/overmap/ai-skynet.dm b/nsv13/code/modules/overmap/ai-skynet.dm index c55271c3444..c683dbcd327 100644 --- a/nsv13/code/modules/overmap/ai-skynet.dm +++ b/nsv13/code/modules/overmap/ai-skynet.dm @@ -954,39 +954,6 @@ Adding tasks is easy! Just define a datum for it. audio_cues = list() fleet_trait = FLEET_TRAIT_DEFENSE -// SHITCODE FIX START -/datum/fleet/nanotrasen/earth - name = "\proper Earth Defense Force" - taunts = list("You're foolish to venture this deep into Solgov space! Main batteries stand ready.", "All hands, set condition 1 throughout the fleet, enemy vessel approaching.", "Defense force, stand ready!", "We shall protect our homeland!") - size = FLEET_DIFFICULTY_HARD - allow_difficulty_scaling = FALSE - audio_cues = list() - fleet_trait = FLEET_TRAIT_DEFENSE - -/datum/fleet/nanotrasen/earth/assemble(datum/star_system/SS, difficulty) - . = ..() - if(!scanning) - addtimer(CALLBACK(src, .proc/scan), scan_delay) - scanning = TRUE - -/datum/fleet/nanotrasen/earth/proc/scan() - scanning = FALSE - if(!current_system) - return FALSE - for(var/obj/structure/overmap/OM in current_system.system_contents) - OM.relay('nsv13/sound/effects/ship/solgov_scan.ogg') - sleep(5 SECONDS) - for(var/obj/structure/overmap/shield_scan_target in current_system.system_contents) - if(istype(shield_scan_target, /obj/structure/overmap/nanotrasen/solgov)) - continue //We don't scan our own boys. - //Ruh roh.... (Persona non gratas do not need to be scanned again.) - if((shield_scan_target.faction != shield_scan_target.name) && shield_scan_target.shields && shield_scan_target.shields.active && length(shield_scan_target.occupying_levels)) - shield_scan_target.hail("Scans have detected that you are in posession of prohibited technology. \n Your IFF signature has been marked as 'persona non grata'. \n In accordance with SGC-reg #10124, your ship and lives are now forfeit. Evacuate all civilian personnel immediately and surrender yourselves.", name) - shield_scan_target.relay_to_nearby('nsv13/sound/effects/ship/solgov_scan_alert.ogg', ignore_self=FALSE) - shield_scan_target.faction = shield_scan_target.name - -// SHITCODE FIX END - /datum/fleet/solgov/assemble(datum/star_system/SS, difficulty) . = ..() if(!scanning) From bc576c49f6af83892e2649c240ddf01697740d1c Mon Sep 17 00:00:00 2001 From: Archemagus <32466328+Archemagus@users.noreply.github.com> Date: Wed, 18 May 2022 15:59:30 +0300 Subject: [PATCH 4/4] It's testmerge-shit --- nsv13/code/modules/Security/genpop.dm | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/nsv13/code/modules/Security/genpop.dm b/nsv13/code/modules/Security/genpop.dm index ac6d535d06f..365504f26a3 100644 --- a/nsv13/code/modules/Security/genpop.dm +++ b/nsv13/code/modules/Security/genpop.dm @@ -15,28 +15,6 @@ audio_cues = list() fleet_trait = FLEET_TRAIT_DEFENSE -/datum/fleet/nanotrasen/earth/assemble(datum/star_system/SS, difficulty) - . = ..() - if(!scanning) - addtimer(CALLBACK(src, .proc/scan), scan_delay) - scanning = TRUE - -/datum/fleet/nanotrasen/earth/proc/scan() - scanning = FALSE - if(!current_system) - return FALSE - for(var/obj/structure/overmap/OM in current_system.system_contents) - OM.relay('nsv13/sound/effects/ship/solgov_scan.ogg') - sleep(5 SECONDS) - for(var/obj/structure/overmap/shield_scan_target in current_system.system_contents) - if(istype(shield_scan_target, /obj/structure/overmap/nanotrasen/solgov)) - continue //We don't scan our own boys. - //Ruh roh.... (Persona non gratas do not need to be scanned again.) - if((shield_scan_target.faction != shield_scan_target.name) && shield_scan_target.shields && shield_scan_target.shields.active && length(shield_scan_target.occupying_levels)) - shield_scan_target.hail("Scans have detected that you are in posession of prohibited technology. \n Your IFF signature has been marked as 'persona non grata'. \n In accordance with SGC-reg #10124, your ship and lives are now forfeit. Evacuate all civilian personnel immediately and surrender yourselves.", name) - shield_scan_target.relay_to_nearby('nsv13/sound/effects/ship/solgov_scan_alert.ogg', ignore_self=FALSE) - shield_scan_target.faction = shield_scan_target.name - // SHITCODE FIX END // Do not ask why