From 1a467c839a781d6e6f0a47e278c75e7837165cdd Mon Sep 17 00:00:00 2001 From: cowbot92 Date: Tue, 27 Aug 2024 16:25:14 -0400 Subject: [PATCH 1/2] bye --- .../nukeop/equipment/nuclearbomb.dm | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index e0d48477184b..9dac04e613e0 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -631,29 +631,29 @@ This is here to make the tiles around the station mininuke change when it's arme START_PROCESSING(SSobj, src) AddComponent(/datum/component/stationloving, !fake) -/obj/item/disk/nuclear/process() - if(fake) - STOP_PROCESSING(SSobj, src) - CRASH("A fake nuke disk tried to call process(). Who the fuck and how the fuck") - var/turf/newturf = get_turf(src) - if(newturf && lastlocation == newturf) - if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.0001)) - var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control - if(istype(loneop) && loneop.occurrences < loneop.max_occurrences) - loneop.weight += 1 - if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1) - message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") - log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].") - - else - lastlocation = newturf - last_disk_move = world.time - var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control - if(istype(loneop) && loneop.occurrences < loneop.max_occurrences && prob(loneop.weight)) - loneop.weight = max(loneop.weight - 1, 0) - if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1) - message_admins("[src] is on the move (currently in [ADMIN_VERBOSEJMP(newturf)]). The weight of Lone Operative is now [loneop.weight].") - log_game("[src] being on the move has reduced the weight of the Lone Operative event to [loneop.weight].") +// /obj/item/disk/nuclear/process() +// if(fake) +// STOP_PROCESSING(SSobj, src) +// CRASH("A fake nuke disk tried to call process(). Who the fuck and how the fuck") +// var/turf/newturf = get_turf(src) +// if(newturf && lastlocation == newturf) +// if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.0001)) +// var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control +// if(istype(loneop) && loneop.occurrences < loneop.max_occurrences) +// loneop.weight += 1 +// if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1) +// message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") +// log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].") + +// else +// lastlocation = newturf +// last_disk_move = world.time +// var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control +// if(istype(loneop) && loneop.occurrences < loneop.max_occurrences && prob(loneop.weight)) +// loneop.weight = max(loneop.weight - 1, 0) +// if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1) +// message_admins("[src] is on the move (currently in [ADMIN_VERBOSEJMP(newturf)]). The weight of Lone Operative is now [loneop.weight].") +// log_game("[src] being on the move has reduced the weight of the Lone Operative event to [loneop.weight].") /obj/item/disk/nuclear/examine(mob/user) . = ..() From 4fbc1500b8b8b6f491d78a81f429af2ca31ddd07 Mon Sep 17 00:00:00 2001 From: cowbot92 Date: Tue, 27 Aug 2024 16:36:43 -0400 Subject: [PATCH 2/2] biome request --- .../nukeop/equipment/nuclearbomb.dm | 46 +++++++++---------- code/modules/events/operative.dm | 1 + 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 9dac04e613e0..e363744e8b01 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -631,29 +631,29 @@ This is here to make the tiles around the station mininuke change when it's arme START_PROCESSING(SSobj, src) AddComponent(/datum/component/stationloving, !fake) -// /obj/item/disk/nuclear/process() -// if(fake) -// STOP_PROCESSING(SSobj, src) -// CRASH("A fake nuke disk tried to call process(). Who the fuck and how the fuck") -// var/turf/newturf = get_turf(src) -// if(newturf && lastlocation == newturf) -// if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.0001)) -// var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control -// if(istype(loneop) && loneop.occurrences < loneop.max_occurrences) -// loneop.weight += 1 -// if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1) -// message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") -// log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].") - -// else -// lastlocation = newturf -// last_disk_move = world.time -// var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control -// if(istype(loneop) && loneop.occurrences < loneop.max_occurrences && prob(loneop.weight)) -// loneop.weight = max(loneop.weight - 1, 0) -// if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1) -// message_admins("[src] is on the move (currently in [ADMIN_VERBOSEJMP(newturf)]). The weight of Lone Operative is now [loneop.weight].") -// log_game("[src] being on the move has reduced the weight of the Lone Operative event to [loneop.weight].") +/obj/item/disk/nuclear/process() + if(fake) + STOP_PROCESSING(SSobj, src) + CRASH("A fake nuke disk tried to call process(). Who the fuck and how the fuck") + var/turf/newturf = get_turf(src) + if(newturf && lastlocation == newturf) + if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.0001)) + var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control + if(istype(loneop) && (loneop.occurrences < loneop.max_occurrences) && SSticker.totalPlayers >= 25) + loneop.weight += 1 + if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1) + message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") + log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].") + + else + lastlocation = newturf + last_disk_move = world.time + var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control + if(istype(loneop) && loneop.occurrences < loneop.max_occurrences && prob(loneop.weight)) + loneop.weight = max(loneop.weight - 1, 0) + if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1) + message_admins("[src] is on the move (currently in [ADMIN_VERBOSEJMP(newturf)]). The weight of Lone Operative is now [loneop.weight].") + log_game("[src] being on the move has reduced the weight of the Lone Operative event to [loneop.weight].") /obj/item/disk/nuclear/examine(mob/user) . = ..() diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm index 6120bccab6e6..a114bcb36929 100644 --- a/code/modules/events/operative.dm +++ b/code/modules/events/operative.dm @@ -3,6 +3,7 @@ typepath = /datum/round_event/ghost_role/operative weight = 0 //Admin only max_occurrences = 1 + min_players = 25 dynamic_should_hijack = TRUE /datum/round_event/ghost_role/operative