From e94b6139cfb82ec2f5a107e4af69ff7b89c9b4d8 Mon Sep 17 00:00:00 2001
From: tralezab <40974010+tralezab@users.noreply.github.com>
Date: Mon, 29 Jul 2019 18:51:41 -0700
Subject: [PATCH] Fixes some issues with balloons (#45554)

* Ok, this was just embarrassing

* uno

* dos

* tres

* cuatro

* wait, these vending machines are crazy similar...?
---
 _maps/RandomZLevels/Cabin.dmm           | 2 +-
 code/game/objects/items/toys.dm         | 6 +++---
 code/modules/mining/abandoned_crates.dm | 2 +-
 code/modules/uplink/uplink_items.dm     | 2 +-
 code/modules/vending/liberation_toy.dm  | 4 ++--
 code/modules/vending/toys.dm            | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/_maps/RandomZLevels/Cabin.dmm b/_maps/RandomZLevels/Cabin.dmm
index 272fe6d56d8..b7ac733632e 100644
--- a/_maps/RandomZLevels/Cabin.dmm
+++ b/_maps/RandomZLevels/Cabin.dmm
@@ -130,7 +130,7 @@
 "ay" = (
 /obj/machinery/light/small,
 /obj/structure/table/wood,
-/obj/item/toy/syndicateballoon,
+/obj/item/toy/balloon/syndicate,
 /turf/open/floor/wood,
 /area/awaymission/cabin)
 "az" = (
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 64efa4a2565..09e99780868 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -148,18 +148,18 @@
 	item_state = "syndballoon"
 	random_color = FALSE
 
-/obj/item/toy/syndicateballoon/pickup(mob/user)
+/obj/item/toy/balloon/syndicate/pickup(mob/user)
 	. = ..()
 	if(user && user.mind && user.mind.has_antag_datum(/datum/antagonist, TRUE))
 		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "badass_antag", /datum/mood_event/badass_antag)
 
-/obj/item/toy/syndicateballoon/dropped(mob/user)
+/obj/item/toy/balloon/syndicate/dropped(mob/user)
 	if(user)
 		SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "badass_antag", /datum/mood_event/badass_antag)
 	. = ..()
 
 
-/obj/item/toy/syndicateballoon/Destroy()
+/obj/item/toy/balloon/syndicate/Destroy()
 	if(ismob(loc))
 		var/mob/M = loc
 		SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "badass_antag", /datum/mood_event/badass_antag)
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index 47a25a358a5..55c40b94432 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -64,7 +64,7 @@
 			var/newitem = pick(subtypesof(/obj/item/toy/prize))
 			new newitem(src)
 		if(57 to 58)
-			new /obj/item/toy/syndicateballoon(src)
+			new /obj/item/toy/balloon/syndicate(src)
 		if(59 to 60)
 			new /obj/item/borg/upgrade/modkit/aoe/mobs(src)
 			new /obj/item/clothing/suit/space(src)
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 57aabfa0b44..67596e6f592 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -1816,7 +1816,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	name = "Syndicate Balloon"
 	desc = "For showing that you are THE BOSS: A useless red balloon with the Syndicate logo on it. \
 			Can blow the deepest of covers."
-	item = /obj/item/toy/syndicateballoon
+	item = /obj/item/toy/balloon/syndicate
 	cost = 20
 	cant_discount = TRUE
 	illegal_tech = FALSE
diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm
index 63808856386..388528e046f 100644
--- a/code/modules/vending/liberation_toy.dm
+++ b/code/modules/vending/liberation_toy.dm
@@ -12,7 +12,7 @@
 					/obj/item/toy/sword = 10,
 					/obj/item/ammo_box/foambox = 20,
 					/obj/item/toy/foamblade = 10,
-					/obj/item/toy/syndicateballoon = 10,
+					/obj/item/toy/balloon/syndicate = 10,
 					/obj/item/clothing/suit/syndicatefake = 5,
 					/obj/item/clothing/head/syndicatefake = 5) //OPS IN DORMS oh wait it's just an assistant
 	contraband = list(/obj/item/gun/ballistic/shotgun/toy/crossbow = 10,   //Congrats, you unlocked the +18 setting!
@@ -27,4 +27,4 @@
 	refill_canister = /obj/item/vending_refill/donksoft
 	default_price = 25
 	extra_price = 50
-	payment_department = ACCOUNT_SRV
\ No newline at end of file
+	payment_department = ACCOUNT_SRV
diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm
index 21246e14e02..c4b08d21baa 100644
--- a/code/modules/vending/toys.dm
+++ b/code/modules/vending/toys.dm
@@ -13,7 +13,7 @@
 		/obj/item/toy/sword = 10,
 		/obj/item/ammo_box/foambox = 20,
 		/obj/item/toy/foamblade = 10,
-		/obj/item/toy/syndicateballoon = 10,
+		/obj/item/toy/balloon/syndicate = 10,
 		/obj/item/clothing/suit/syndicatefake = 5,
 		/obj/item/clothing/head/syndicatefake = 5)
 	contraband = list(