mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 20:48:56 +01:00
[MIRROR] Fixes the clown reinforcement spawning with TC (#28855)
* Fixes the clown reinforcement spawning with TC (#84918) ## About The Pull Request Fixes the very hilarious issue of reinforcements spawning with... the same amount of TC a normal clown operative would get, leading to... infinite TC glitch. Fixes #84915 ## Why It's Good For The Game Fixes a bug which breaks the intended balance of clown op uplink. ## Changelog 🆑 MrDas fix: Clown operative reinforcements' uplink no longer break the syndicates' economy by creating TC from nothingness. /🆑 * Fixes the clown reinforcement spawning with TC --------- Co-authored-by: MrDas <62486730+Das15@users.noreply.github.com>
This commit is contained in:
@@ -187,7 +187,7 @@
|
||||
desc = "A single-use beacon designed to quickly launch reinforcement clown operatives into the field."
|
||||
special_role_name = ROLE_CLOWN_OPERATIVE
|
||||
outfit = /datum/outfit/syndicate/clownop/no_crystals
|
||||
antag_datum = /datum/antagonist/nukeop/clownop
|
||||
antag_datum = /datum/antagonist/nukeop/reinforcement/clownop
|
||||
pod_style = STYLE_HONK
|
||||
use_subtypes = FALSE
|
||||
|
||||
|
||||
@@ -65,6 +65,11 @@
|
||||
if(liver)
|
||||
ADD_TRAIT(liver, TRAIT_COMEDY_METABOLISM, CLOWNOP_TRAIT)
|
||||
|
||||
// Clown op reinforcements
|
||||
/datum/antagonist/nukeop/reinforcement/clownop
|
||||
name = "Clown Operative Reinforcement"
|
||||
nukeop_outfit = /datum/outfit/syndicate/clownop/no_crystals
|
||||
|
||||
/datum/outfit/clown_operative
|
||||
name = "Clown Operative (Preview only)"
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
id_trim = /datum/id_trim/chameleon/operative/clown
|
||||
|
||||
/datum/outfit/syndicate/clownop/no_crystals
|
||||
name = "Clown Operative - Reinforcement"
|
||||
tc = 0
|
||||
|
||||
/datum/outfit/syndicate/clownop/leader
|
||||
|
||||
@@ -52,8 +52,7 @@
|
||||
if(command_radio)
|
||||
radio.command = TRUE
|
||||
radio.use_command = TRUE
|
||||
|
||||
if(ispath(uplink_type, /obj/item/uplink/nuclear) || tc) // /obj/item/uplink/nuclear understands 0 tc
|
||||
if(ispath(uplink_type, /obj/item/uplink) || tc) // /obj/item/uplink understands 0 tc
|
||||
var/obj/item/uplink = new uplink_type(nukie, nukie.key, tc)
|
||||
nukie.equip_to_slot_or_del(uplink, ITEM_SLOT_BACKPACK, indirect_action = TRUE)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user