Fixes Gamemode Voting & Map Edits (#1937)

* fixes roundtype voting

* keg spawner

* maint bar to box and kinkmates to delta+meta

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -97996,14 +97996,13 @@
 	dir = 1;
 	pixel_y = -22
 	},
-/obj/item/weapon/twohanded/required/kirbyplants/random,
 /turf/open/floor/wood{
 	icon_state = "wood-broken3"
 	},
 /area/crew_quarters/theatre/abandoned)
 "dHc" = (
-/obj/machinery/vending/cigarette,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/vending/kink,
 /turf/open/floor/plating,
 /area/crew_quarters/theatre/abandoned)
 "dHd" = (
@@ -113134,6 +113133,10 @@
 	dir = 4
 	},
 /area/construction/mining/aux_base)
+"epU" = (
+/obj/machinery/vending/kink,
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
 
 (1,1,1) = {"
 aaa
@@ -143540,7 +143543,7 @@ aib
 asx
 atw
 auQ
-aic
+epU
 awX
 aye
 azn
@@ -162923,7 +162926,7 @@ dCb
 dDu
 dEp
 dFs
-dHa
+dFs
 dHU
 aaf
 dJp

_maps/map_files/MetaStation/MetaStation.dmm

@@ -64988,10 +64988,10 @@
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "cto" = (
-/obj/machinery/vending/assist,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/vending/kink,
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "ctp" = (
@@ -90163,6 +90163,10 @@
 	},
 /turf/closed/wall/r_wall,
 /area/engine/atmos)
+"dBD" = (
+/obj/machinery/vending/kink,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
 
 (1,1,1) = {"
 aaa
@@ -129574,7 +129578,7 @@ aqp
 dnh
 dnR
 aus
-dnS
+dBD
 dnh
 aAm
 dnS

code/citadel/cit_spawners.dm

@@ -0,0 +1,7 @@
+/obj/effect/spawner/lootdrop/keg
+	name = "random keg spawner"
+	lootcount = 1
+	loot = list(/obj/structure/reagent_dispensers/keg/mead = 5,
+		/obj/structure/reagent_dispensers/keg/aphro = 1,
+		/obj/structure/reagent_dispensers/keg/aphro/strong = 1,
+		/obj/structure/reagent_dispensers/keg/gargle = 1)

code/controllers/subsystem/ticker.dm

@@ -87,11 +87,11 @@ SUBSYSTEM_DEF(ticker)
 			current_state = GAME_STATE_PREGAME
 			//Everyone who wants to be an observer is now spawned
 			create_observers()
-			if(!modevoted)
-				send_gamemode_vote()
 			fire()
 		if(GAME_STATE_PREGAME)
 				//lobby stats for statpanels
+			if(!modevoted)
+				send_gamemode_vote()
 			if(isnull(timeLeft))
 				timeLeft = max(0,start_at - world.time)
 			totalPlayers = 0
@@ -666,6 +666,9 @@ SUBSYSTEM_DEF(ticker)
 	return current_state == GAME_STATE_PLAYING
 
 /proc/send_gamemode_vote()
+	if(SSticker.current_state == GAME_STATE_PREGAME)
+		if(SSticker.timeLeft < 900)
+			SSticker.timeLeft = 900
 		SSticker.modevoted = TRUE
 		SSvote.initiate_vote("roundtype","server")
 

code/controllers/subsystem/vote.dm

@@ -113,6 +113,13 @@ SUBSYSTEM_DEF(vote)
 	var/restart = 0
 	if(.)
 		switch(mode)
+			if("roundtype")
+				if(SSticker.current_state > GAME_STATE_PREGAME)//Don't change the mode if the round already started.
+					return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
+				GLOB.master_mode = .
+				SSticker.save_mode(.)
+				to_chat(world, "<span class='adminnotice'><b>The mode is now: [GLOB.master_mode]</b></span>")
+				log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].")
 			if("restart")
 				if(. == "Restart Round")
 					restart = 1

tgstation.dme

@@ -166,6 +166,7 @@
 #include "code\citadel\cit_guns.dm"
 #include "code\citadel\cit_kegs.dm"
 #include "code\citadel\cit_reagents.dm"
+#include "code\citadel\cit_spawners.dm"
 #include "code\citadel\cit_uniforms.dm"
 #include "code\citadel\cit_vendors.dm"
 #include "code\citadel\dogborgstuff.dm"