Merge pull request #2233 from caelaislinn/master

Misc fixes and issue resolutions

code/datums/supplypacks.dm

@@ -618,8 +618,7 @@
 	"/obj/item/weapon/reagent_containers/glass/paint/remover",
 	"/obj/item/weapon/wrapping_paper",
 	"/obj/item/weapon/wrapping_paper",
-	"/obj/item/weapon/wrapping_paper",
-	"/obj/item/weapon/contraband/poster")
+	"/obj/item/weapon/wrapping_paper")
 	cost = 5
 	containertype = "/obj/structure/closet/crate"
 	containername = "Arts and Crafts crate"
@@ -628,8 +627,9 @@
 /datum/supply_packs/randomised/contraband
 	num_contained = 5
 	contains = list("/obj/item/seeds/bloodtomatoseed",
-	"/obj/item/weapon/storage/pill_bottle/zoom",
-	"/obj/item/weapon/storage/pill_bottle/happy",
+	//"/obj/item/weapon/storage/pill_bottle/zoom",
+	//"/obj/item/weapon/storage/pill_bottle/happy",,
+	"/obj/item/weapon/contraband/poster",
 	"/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe")
 	name = "Contraband crate"
 	cost = 30
@@ -659,12 +659,12 @@
 					"/obj/item/weapon/surgicaldrill",
 					"/obj/item/clothing/mask/breath/medical",
 					"/obj/item/weapon/tank/anesthetic",
-					"/obj/item/weapon/FixOVein",
+					//"/obj/item/weapon/FixOVein",
 					"/obj/item/weapon/hemostat",
 					"/obj/item/weapon/scalpel",
-					"/obj/item/weapon/surgical_tool/bonegel",
+					//"/obj/item/weapon/surgical_tool/bonegel",
 					"/obj/item/weapon/retractor",
-					"/obj/item/weapon/surgical_tool/bonesetter",
+					//"/obj/item/weapon/surgical_tool/bonesetter",
 					"/obj/item/weapon/circular_saw")
 	cost = 25
 	containertype = "/obj/structure/closet/crate/secure"

code/game/gamemodes/gameticker.dm

@@ -313,7 +313,10 @@ var/global/datum/controller/gameticker/ticker
 
 				if(!delay_end)
 					sleep(restart_timeout)
-					world.Reboot()
+					if(!delay_end)
+						world.Reboot()
+					else
+						world << "\blue <B>An admin has delayed the round end</B>"
 				else
 					world << "\blue <B>An admin has delayed the round end</B>"
 

code/modules/admin/admin.dm

@@ -799,10 +799,16 @@ var/global/floorIsLava = 0
 
 /datum/admins/proc/delay()
 	set category = "Server"
-	set desc="Delay the game start"
+	set desc="Delay the game start/end"
 	set name="Delay"
 	if (!ticker || ticker.current_state != GAME_STATE_PREGAME)
-		return alert("Too late... The game has already started!", null, null, null, null, null)
+		if (src.rank in list("Badmin", "Game Admin", "Game Master"))
+			ticker.delay_end = !ticker.delay_end
+			log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
+			message_admins("\blue [key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
+		else
+			usr << "\red You are not a high enough rank."
+		return //alert("Round end delayed", null, null, null, null, null)
 	going = !( going )
 	if (!( going ))
 		world << "<b>The game start has been delayed.</b>"

code/modules/clothing/spacesuits/rig.dm

@@ -57,6 +57,7 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/satchel,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE
+	slowdown = 1.0
 
 
 //Chief Engineer's rig
@@ -70,6 +71,7 @@
 	icon_state = "rig-white"
 	name = "advanced hardsuit"
 	item_state = "ce_hardsuit"
+	slowdown = 1.0
 
 
 //Mining rig
@@ -83,6 +85,7 @@
 	icon_state = "rig-mining"
 	name = "mining hardsuit"
 	item_state = "mining_hardsuit"
+	slowdown = 1.0
 
 
 //Syndicate rig
@@ -92,6 +95,7 @@
 	item_state = "syndie_helm"
 	color = "syndi"
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
+	slowdown = 1.0
 
 /obj/item/clothing/suit/space/rig/syndi
 	icon_state = "rig-syndi"
@@ -102,6 +106,7 @@
 	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
 
+
 //Security rig
 /obj/item/clothing/head/helmet/space/rig/security
 	name = "security hardsuit helmet"
@@ -117,6 +122,8 @@
 	slowdown = 1
 	armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
 	allowed = list(/obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/pulse_rifle, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/gun/energy/taser, /obj/item/weapon/melee/baton)
+	slowdown = 1.0
+
 
 //Wizard Rig
 /obj/item/clothing/head/helmet/space/rig/wizard
@@ -136,6 +143,7 @@
 	unacidable = 1
 	armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
 	allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen)
+	slowdown = 1.0
 
 //Atmos Rig
 /obj/item/clothing/head/helmet/space/rig/atmos
@@ -143,21 +151,11 @@
 	icon_state = "rig0-atmos"
 	item_state = "atmos_helm"
 	color = "atmos"
-	flags = STOPSPRESSUREDMAGE
 	armor = list(melee = 40, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 0)
-	gas_transfer_coefficient = 0
-	permeability_coefficient = 0
-	heat_protection = HEAD
-	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECITON_TEMPERATURE
 
 /obj/item/clothing/suit/space/rig/atmos
 	icon_state = "rig-atmos"
 	name = "atmospherics pressure suit"
 	item_state = "atmos_hardsuit"
-	flags = STOPSPRESSUREDMAGE
 	armor = list(melee = 40, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 0)
-	gas_transfer_coefficient = 0
-	permeability_coefficient = 0
 	slowdown = 1.0
-	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECITON_TEMPERATURE