From f51ac8e588e91164cddeb8cc81686ea6ea7d5862 Mon Sep 17 00:00:00 2001
From: ReturnToZender <donwest947@gmail.com>
Date: Tue, 7 Nov 2023 11:49:45 -0600
Subject: [PATCH] [Not Modular] Drifting contractor adjustments (#667)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Removes the duplicate contractor event, and makes it so there can only
be one contractor spawn at a time.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game
Contractors are easily able to fight off the entire security team,
especially when left to fester. This removes the duplicate event so
spawns can actually be controlled via config, and makes it so only one
contractor can spawn at a given time.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
del: extra contractors
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com>
---
 .../modules/contractor/code/datums/midround/event.dm        | 4 ++--
 .../modules/contractor/code/datums/midround/ruleset.dm      | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modular_skyrat/modules/contractor/code/datums/midround/event.dm b/modular_skyrat/modules/contractor/code/datums/midround/event.dm
index d90a2b90dff..24ac9c1e21c 100644
--- a/modular_skyrat/modules/contractor/code/datums/midround/event.dm
+++ b/modular_skyrat/modules/contractor/code/datums/midround/event.dm
@@ -1,4 +1,4 @@
-/datum/round_event_control/contractor
+/*/datum/round_event_control/contractor
 	name = "Drifting Contractor"
 	typepath = /datum/round_event/ghost_role/contractor
 	weight = 8
@@ -37,4 +37,4 @@
 	message_admins("[ADMIN_LOOKUPFLW(operative)] has been made into [src] by an event.")
 	log_game("[key_name(operative)] was spawned as a [src] by an event.")
 	spawned_mobs += operative
-	return SUCCESSFUL_SPAWN
+	return SUCCESSFUL_SPAWN*/ //BUBBER EDIT: REMOVES THE EXTRA CONTRACTOR EVENT
diff --git a/modular_skyrat/modules/contractor/code/datums/midround/ruleset.dm b/modular_skyrat/modules/contractor/code/datums/midround/ruleset.dm
index d5ae8c7b59c..4ba0478cda9 100644
--- a/modular_skyrat/modules/contractor/code/datums/midround/ruleset.dm
+++ b/modular_skyrat/modules/contractor/code/datums/midround/ruleset.dm
@@ -20,8 +20,10 @@
 	var/list/spawn_locs = list()
 
 /datum/dynamic_ruleset/midround/from_ghosts/contractor/ready(forced = FALSE)
-	if(prob(33))
-		required_candidates++
+	//BUBBER EDIT: LESS CONTRACTORS
+	//if(prob(33))
+	//	required_candidates++
+	//BUBBER EDIT: LESS CONTRACTORS
 	if (required_candidates > (length(dead_players) + length(list_observers)))
 		return FALSE
 	for(var/obj/effect/landmark/carpspawn/carp in GLOB.landmarks_list)