Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

Conflicts: baystation12.dme code/ATMOSPHERICS/components/unary/vent_pump.dm code/ATMOSPHERICS/components/unary/vent_scrubber.dm code/__HELPERS/game.dm code/controllers/shuttle_controller.dm code/datums/datumvars.dm code/datums/supplypacks.dm code/defines/obj/storage.dm code/defines/obj/vending.dm code/defines/obj/weapon.dm code/defines/procs/command_alert.dm code/game/area/Space Station 13 areas.dm code/game/atoms.dm code/game/gamemodes/changeling/modularchangling.dm code/game/gamemodes/cult/runes.dm code/game/gamemodes/events.dm code/game/gamemodes/events/dust.dm code/game/gamemodes/events/miniblob.dm code/game/gamemodes/events/ninja_equipment.dm code/game/gamemodes/factions.dm code/game/gamemodes/game_mode.dm code/game/gamemodes/gameticker.dm code/game/jobs/access.dm code/game/jobs/job/assistant.dm code/game/jobs/job/captain.dm code/game/jobs/job/civilian.dm code/game/jobs/job/engineering.dm code/game/jobs/job/medical.dm code/game/jobs/job/science.dm code/game/jobs/job/security.dm code/game/jobs/job_controller.dm code/game/machinery/alarm.dm code/game/machinery/atmo_control.dm code/game/machinery/atmoalter/area_atmos_computer.dm code/game/machinery/bots/medbot.dm code/game/machinery/computer/HolodeckControl.dm code/game/machinery/computer/ai_core.dm code/game/machinery/computer/atmos_alert.dm code/game/machinery/computer/card.dm code/game/machinery/computer/cloning.dm code/game/machinery/computer/computer.dm code/game/machinery/computer/message.dm code/game/machinery/computer/pod.dm code/game/machinery/computer/prisoner.dm code/game/machinery/computer/syndicate_shuttle.dm code/game/machinery/constructable_frame.dm code/game/machinery/doors/door.dm code/game/machinery/doors/firedoor.dm code/game/machinery/newscaster.dm code/game/machinery/recharger.dm code/game/machinery/spaceheater.dm code/game/machinery/telecomms/broadcaster.dm code/game/machinery/telecomms/logbrowser.dm code/game/machinery/telecomms/machine_interactions.dm code/game/machinery/teleporter.dm code/game/machinery/wishgranter.dm code/game/mecha/mech_fabricator.dm code/game/mecha/working/ripley.dm code/game/objects/items.dm code/game/objects/items/blueprints.dm code/game/objects/items/devices/flashlight.dm code/game/objects/items/devices/radio/encryptionkey.dm code/game/objects/items/devices/uplinks.dm code/game/objects/items/stacks/medical.dm code/game/objects/items/weapons/cards_ids.dm code/game/objects/items/weapons/gift_wrappaper.dm code/game/objects/items/weapons/hydroponics.dm code/game/objects/items/weapons/manuals.dm code/game/objects/items/weapons/secstorage/secstorage.dm code/game/objects/items/weapons/storage/backpack.dm code/game/objects/items/weapons/storage/firstaid.dm code/game/objects/items/weapons/storage/kit.dm code/game/objects/items/weapons/storage/storage.dm code/game/objects/items/weapons/storage/toolbox.dm code/game/objects/items/weapons/storage/uplink_kits.dm code/game/objects/items/weapons/stunbaton.dm code/game/objects/items/weapons/surgery_tools.dm code/game/objects/items/weapons/tools.dm code/game/objects/structures/crates_lockers/closets/secure/cargo.dm code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm code/game/objects/structures/crates_lockers/closets/secure/scientist.dm code/game/objects/structures/crates_lockers/closets/secure/security.dm code/game/objects/structures/electricchair.dm code/game/objects/structures/extinguisher.dm code/game/objects/structures/watercloset.dm code/game/objects/weapons.dm code/game/turfs/turf.dm code/game/vehicles/airtight/airtight.dm code/game/vehicles/vehicle.dm code/global.dm code/modules/DetectiveWork/evidence.dm code/modules/admin/IsBanned.dm code/modules/admin/player_panel.dm code/modules/admin/verbs/diagnostics.dm code/modules/admin/verbs/getlogs.dm code/modules/client/preferences.dm code/modules/clothing/masks/miscellaneous.dm code/modules/clothing/spacesuits/rig.dm code/modules/clothing/suits/miscellaneous.dm code/modules/critters/critter_defenses.dm code/modules/detectivework/scanner.dm code/modules/flufftext/Hallucination.dm code/modules/food/recipes_microwave.dm code/modules/mining/mine_items.dm code/modules/mining/mine_turfs.dm code/modules/mining/satchel_ore_boxdm.dm code/modules/mob/dead/observer/observer.dm code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm code/modules/mob/living/carbon/alien/special/facehugger.dm code/modules/mob/living/carbon/carbon.dm code/modules/mob/living/carbon/carbon_defines.dm code/modules/mob/living/carbon/human/human.dm code/modules/mob/living/carbon/human/human_attackhand.dm code/modules/mob/living/carbon/human/life.dm code/modules/mob/living/carbon/human/say.dm code/modules/mob/living/carbon/human/update_icons.dm code/modules/mob/living/carbon/metroid/metroid.dm code/modules/mob/living/living.dm code/modules/mob/living/silicon/ai/life.dm code/modules/mob/living/silicon/robot/robot.dm code/modules/mob/mob_cleanup.dm code/modules/mob/mob_defines.dm code/modules/mob/mob_transformation_simple.dm code/modules/paperwork/clipboard.dm code/modules/paperwork/folders.dm code/modules/paperwork/paper.dm code/modules/paperwork/paperbin.dm code/modules/paperwork/pen.dm code/modules/power/cable.dm code/modules/projectiles/guns/energy/special.dm code/modules/projectiles/guns/projectile/revolver.dm code/modules/projectiles/projectile/change.dm code/modules/projectiles/projectile/special.dm code/modules/reagents/Chemistry-Reagents.dm code/modules/reagents/reagent_containers/glass.dm code/modules/reagents/reagent_containers/hypospray.dm code/modules/recycling/sortingmachinery.dm code/modules/research/designs.dm config/config.txt html/changelog.html icons/mob/head.dmi icons/mob/hud.dmi icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi icons/mob/mask.dmi icons/mob/suit.dmi icons/mob/ties.dmi icons/mob/uniform.dmi icons/obj/clothing/hats.dmi icons/obj/clothing/masks.dmi icons/obj/clothing/suits.dmi icons/obj/clothing/ties.dmi icons/obj/grenade.dmi icons/obj/projectiles.dmi Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2025-12-11 10:43:20 +00:00 · 2013-01-11 22:10:41 +10:00
parent 891ae8e063 2855cd6237
commit bdeb96b7e5
637 changed files with 28812 additions and 21593 deletions
--- a/code/unused/Agouri_stuff.dm
+++ b/code/unused/Agouri_stuff.dm
@@ -1,3 +1,387 @@
+/*
+/obj/vehicle/airtight
+	//inner atmos
+	var/use_internal_tank = 0
+	var/internal_tank_valve = ONE_ATMOSPHERE
+	var/obj/machinery/portable_atmospherics/canister/internal_tank
+	var/datum/gas_mixture/cabin_air
+	var/obj/machinery/atmospherics/portables_connector/connected_port = null
+
+	var/datum/global_iterator/pr_int_temp_processor //normalizes internal air mixture temperature
+	var/datum/global_iterator/pr_give_air //moves air from tank to cabin
+
+
+/obj/vehicle/airtight/New()
+	..()
+	src.add_airtank()
+	src.add_cabin()
+	src.add_airtight_iterators()
+
+
+
+
+//######################################### Helpers for airtight vehicles #########################################
+
+/obj/vehicle/airtight/proc/add_cabin()
+	cabin_air = new
+	cabin_air.temperature = T20C
+	cabin_air.volume = 200
+	cabin_air.oxygen = O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
+	cabin_air.nitrogen = N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
+	return cabin_air
+
+/obj/vehicle/airtight/proc/add_airtank()
+	internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src)
+	return internal_tank
+
+/obj/vehicle/airtight/proc/add_airtight_iterators()
+	pr_int_temp_processor = new /datum/global_iterator/vehicle_preserve_temp(list(src))
+	pr_give_air = new /datum/global_iterator/vehicle_tank_give_air(list(src))
+
+
+//######################################### Specific datums for airtight vehicles #################################
+
+
+/datum/global_iterator/vehicle_preserve_temp  //normalizing cabin air temperature to 20 degrees celsium
+	delay = 20
+
+	process(var/obj/vehicle/airtight/V)
+		if(V.cabin_air && V.cabin_air.return_volume() > 0)
+			var/delta = V.cabin_air.temperature - T20C
+			V.cabin_air.temperature -= max(-10, min(10, round(delta/4,0.1)))
+		return
+
+
+/datum/global_iterator/vehicle_tank_give_air
+	delay = 15
+
+	process(var/obj/vehicle/airtight/V)
+		if(V.internal_tank)
+			var/datum/gas_mixture/tank_air = V.internal_tank.return_air()
+			var/datum/gas_mixture/cabin_air = V.cabin_air
+
+			var/release_pressure = V.internal_tank_valve
+			var/cabin_pressure = cabin_air.return_pressure()
+			var/pressure_delta = min(release_pressure - cabin_pressure, (tank_air.return_pressure() - cabin_pressure)/2)
+			var/transfer_moles = 0
+			if(pressure_delta > 0) //cabin pressure lower than release pressure
+				if(tank_air.return_temperature() > 0)
+					transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION)
+					var/datum/gas_mixture/removed = tank_air.remove(transfer_moles)
+					cabin_air.merge(removed)
+			else if(pressure_delta < 0) //cabin pressure higher than release pressure
+				var/datum/gas_mixture/t_air = V.get_turf_air()
+				pressure_delta = cabin_pressure - release_pressure
+				if(t_air)
+					pressure_delta = min(cabin_pressure - t_air.return_pressure(), pressure_delta)
+				if(pressure_delta > 0) //if location pressure is lower than cabin pressure
+					transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION)
+					var/datum/gas_mixture/removed = cabin_air.remove(transfer_moles)
+					if(t_air)
+						t_air.merge(removed)
+					else //just delete the cabin gas, we're in space or some shit
+						del(removed)
+		else
+			return stop()
+		return
+
+
+//######################################### Atmospherics for vehicles #############################################
+
+
+/obj/vehicle/proc/get_turf_air()
+	var/turf/T = get_turf(src)
+	if(T)
+		. = T.return_air()
+	return
+
+/obj/vehicle/airtight/remove_air(amount)
+	if(use_internal_tank)
+		return cabin_air.remove(amount)
+	else
+		var/turf/T = get_turf(src)
+		if(T)
+			return T.remove_air(amount)
+	return
+
+/obj/vehicle/airtight/return_air()
+	if(use_internal_tank)
+		return cabin_air
+	return get_turf_air()
+
+/obj/vehicle/airtight/proc/return_pressure()
+	. = 0
+	if(use_internal_tank)
+		. =  cabin_air.return_pressure()
+	else
+		var/datum/gas_mixture/t_air = get_turf_air()
+		if(t_air)
+			. = t_air.return_pressure()
+	return
+
+
+/obj/vehicle/airtight/proc/return_temperature()
+	. = 0
+	if(use_internal_tank)
+		. = cabin_air.return_temperature()
+	else
+		var/datum/gas_mixture/t_air = get_turf_air()
+		if(t_air)
+			. = t_air.return_temperature()
+	return
+
+/obj/vehicle/airtight/proc/connect(obj/machinery/atmospherics/portables_connector/new_port)
+	//Make sure not already connected to something else
+	if(connected_port || !new_port || new_port.connected_device)
+		return 0
+
+	//Make sure are close enough for a valid connection
+	if(new_port.loc != src.loc)
+		return 0
+
+	//Perform the connection
+	connected_port = new_port
+	connected_port.connected_device = src
+
+	//Actually enforce the air sharing
+	var/datum/pipe_network/network = connected_port.return_network(src)
+	if(network && !(internal_tank.return_air() in network.gases))
+		network.gases += internal_tank.return_air()
+		network.update = 1
+	log_message("Vehicle airtank connected to external port.")
+	return 1
+
+/obj/vehicle/airtight/proc/disconnect()
+	if(!connected_port)
+		return 0
+
+	var/datum/pipe_network/network = connected_port.return_network(src)
+	if(network)
+		network.gases -= internal_tank.return_air()
+
+	connected_port.connected_device = null
+	connected_port = null
+	src.log_message("Vehicle airtank disconnected from external port.")
+	return 1
+
+
+
+
+/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
+
+
+
+/obj/vehicle
+	name = "Vehicle"
+	icon = 'icons/vehicles/vehicles.dmi'
+	density = 1
+	anchored = 1
+	unacidable = 1 //To avoid the pilot-deleting shit that came with mechas
+	layer = MOB_LAYER
+	//var/can_move = 1
+	var/mob/living/carbon/occupant = null
+	//var/step_in = 10 //make a step in step_in/10 sec.
+	//var/dir_in = 2//What direction will the mech face when entered/powered on? Defaults to South.
+	//var/step_energy_drain = 10
+	var/health = 300 //health is health
+	//var/deflect_chance = 10 //chance to deflect the incoming projectiles, hits, or lesser the effect of ex_act.
+	//the values in this list show how much damage will pass through, not how much will be absorbed.
+	var/list/damage_absorption = list("brute"=0.8,"fire"=1.2,"bullet"=0.9,"laser"=1,"energy"=1,"bomb"=1)
+	var/obj/item/weapon/cell/cell //Our power source
+	var/state = 0
+	var/list/log = new
+	var/last_message = 0
+	var/add_req_access = 1
+	var/maint_access = 1
+	//var/dna	//dna-locking the mech
+	var/list/proc_res = list() //stores proc owners, like proc_res["functionname"] = owner reference
+	var/datum/effect/effect/system/spark_spread/spark_system = new
+	var/lights = 0
+	var/lights_power = 6
+
+	//inner atmos 						//These go in airtight.dm, not all vehicles are space-faring -Agouri
+	//var/use_internal_tank = 0
+	//var/internal_tank_valve = ONE_ATMOSPHERE
+	//var/obj/machinery/portable_atmospherics/canister/internal_tank
+	//var/datum/gas_mixture/cabin_air
+	//var/obj/machinery/atmospherics/portables_connector/connected_port = null
+
+	var/obj/item/device/radio/radio = null
+
+	var/max_temperature = 2500
+	//var/internal_damage_threshold = 50 //health percentage below which internal damage is possible
+	var/internal_damage = 0 //contains bitflags
+
+	var/list/operation_req_access = list()//required access level for mecha operation
+	var/list/internals_req_access = list(access_engine,access_robotics)//required access level to open cell compartment
+
+	//var/datum/global_iterator/pr_int_temp_processor //normalizes internal air mixture temperature     //In airtight.dm you go -Agouri
+	var/datum/global_iterator/pr_inertial_movement //controls intertial movement in spesss
+
+	//var/datum/global_iterator/pr_give_air //moves air from tank to cabin   //Y-you too -Agouri
+
+	var/datum/global_iterator/pr_internal_damage //processes internal damage
+
+
+	var/wreckage
+
+	var/list/equipment = new
+	var/obj/selected
+	//var/max_equip = 3
+
+	var/datum/events/events
+
+
+
+/obj/vehicle/New()
+	..()
+	events = new
+	icon_state += "-unmanned"
+	add_radio()
+	//add_cabin() //No cabin for non-airtights
+
+	spark_system.set_up(2, 0, src)
+	spark_system.attach(src)
+	add_cell()
+	add_iterators()
+	removeVerb(/obj/mecha/verb/disconnect_from_port)
+	removeVerb(/atom/movable/verb/pull)
+	log_message("[src.name]'s functions initialised. Work protocols active - Entering IDLE mode.")
+	loc.Entered(src)
+	return
+
+
+//################ Helpers ###########################################################
+
+
+/obj/vehicle/proc/removeVerb(verb_path)
+	verbs -= verb_path
+
+/obj/vehicle/proc/addVerb(verb_path)
+	verbs += verb_path
+
+/*/obj/vehicle/proc/add_airtank() //In airtight.dm -Agouri
+	internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src)
+	return internal_tank*/
+
+/obj/vehicle/proc/add_cell(var/obj/item/weapon/cell/C=null)
+	if(C)
+		C.forceMove(src)
+		cell = C
+		return
+	cell = new(src)
+	cell.charge = 15000
+	cell.maxcharge = 15000
+
+/*/obj/vehicle/proc/add_cabin()   //In airtight.dm -Agouri
+	cabin_air = new
+	cabin_air.temperature = T20C
+	cabin_air.volume = 200
+	cabin_air.oxygen = O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
+	cabin_air.nitrogen = N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
+	return cabin_air*/
+
+/obj/vehicle/proc/add_radio()
+	radio = new(src)
+	radio.name = "[src] radio"
+	radio.icon = icon
+	radio.icon_state = icon_state
+	radio.subspace_transmission = 1
+
+/obj/vehicle/proc/add_iterators()
+	pr_inertial_movement = new /datum/global_iterator/vehicle_intertial_movement(null,0)
+	//pr_internal_damage = new /datum/global_iterator/vehicle_internal_damage(list(src),0)
+	//pr_int_temp_processor = new /datum/global_iterator/vehicle_preserve_temp(list(src)) //In airtight.dm's add_airtight_iterators -Agouri
+	//pr_give_air = new /datum/global_iterator/vehicle_tank_give_air(list(src)            //Same here -Agouri
+
+/obj/vehicle/proc/check_for_support()
+	if(locate(/obj/structure/grille, orange(1, src)) || locate(/obj/structure/lattice, orange(1, src)) || locate(/turf/simulated, orange(1, src)) || locate(/turf/unsimulated, orange(1, src)))
+		return 1
+	else
+		return 0
+
+//################ Logs and messages ############################################
+
+
+/obj/vehicle/proc/log_message(message as text,red=null)
+	log.len++
+	log[log.len] = list("time"=world.timeofday,"message"="[red?"<font color='red'>":null][message][red?"</font>":null]")
+	return log.len
+
+
+
+//################ Global Iterator Datums ######################################
+
+
+/datum/global_iterator/vehicle_intertial_movement //inertial movement in space
+	delay = 7
+
+	process(var/obj/vehicle/V as obj, direction)
+		if(direction)
+			if(!step(V, direction)||V.check_for_support())
+				src.stop()
+		else
+			src.stop()
+		return
+
+
+/datum/global_iterator/mecha_internal_damage // processing internal damage
+
+	process(var/obj/mecha/mecha)
+		if(!mecha.hasInternalDamage())
+			return stop()
+		if(mecha.hasInternalDamage(MECHA_INT_FIRE))
+			if(!mecha.hasInternalDamage(MECHA_INT_TEMP_CONTROL) && prob(5))
+				mecha.clearInternalDamage(MECHA_INT_FIRE)
+			if(mecha.internal_tank)
+				if(mecha.internal_tank.return_pressure()>mecha.internal_tank.maximum_pressure && !(mecha.hasInternalDamage(MECHA_INT_TANK_BREACH)))
+					mecha.setInternalDamage(MECHA_INT_TANK_BREACH)
+				var/datum/gas_mixture/int_tank_air = mecha.internal_tank.return_air()
+				if(int_tank_air && int_tank_air.return_volume()>0) //heat the air_contents
+					int_tank_air.temperature = min(6000+T0C, int_tank_air.temperature+rand(10,15))
+			if(mecha.cabin_air && mecha.cabin_air.return_volume()>0)
+				mecha.cabin_air.temperature = min(6000+T0C, mecha.cabin_air.return_temperature()+rand(10,15))
+				if(mecha.cabin_air.return_temperature()>mecha.max_temperature/2)
+					mecha.take_damage(4/round(mecha.max_temperature/mecha.cabin_air.return_temperature(),0.1),"fire")
+		if(mecha.hasInternalDamage(MECHA_INT_TEMP_CONTROL)) //stop the mecha_preserve_temp loop datum
+			mecha.pr_int_temp_processor.stop()
+		if(mecha.hasInternalDamage(MECHA_INT_TANK_BREACH)) //remove some air from internal tank
+			if(mecha.internal_tank)
+				var/datum/gas_mixture/int_tank_air = mecha.internal_tank.return_air()
+				var/datum/gas_mixture/leaked_gas = int_tank_air.remove_ratio(0.10)
+				if(mecha.loc && hascall(mecha.loc,"assume_air"))
+					mecha.loc.assume_air(leaked_gas)
+				else
+					del(leaked_gas)
+		if(mecha.hasInternalDamage(MECHA_INT_SHORT_CIRCUIT))
+			if(mecha.get_charge())
+				mecha.spark_system.start()
+				mecha.cell.charge -= min(20,mecha.cell.charge)
+				mecha.cell.maxcharge -= min(20,mecha.cell.maxcharge)
+		return
+
+
+*/
+
+
+
+
+
+/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
+
+
+
+
 /*/turf/DblClick()
 	if(istype(usr, /mob/living/silicon/ai))
 		return move_camera_by_click()
@@ -219,7 +603,7 @@
 					else
 						M.inertia_dir = 0
 						return
-				else if(!istype(M, /mob/living/carbon/metroid))
+				else if(!istype(M, /mob/living/carbon/slime))
 					if (M.m_intent == "run")
 						M.stop_pulling()
 						step(M, M.dir)
@@ -232,7 +616,7 @@
 						return

 			if(2) //lube
-				if(!istype(M, /mob/living/carbon/metroid))
+				if(!istype(M, /mob/living/carbon/slime))
 					M.stop_pulling()
 					step(M, M.dir)
 					spawn(1) step(M, M.dir)
--- a/code/unused/_debug.dm
+++ b/code/unused/_debug.dm
@@ -28,7 +28,7 @@
 			if(!O)
 				O = new /obj/effect/mark(T)
 			else
-				O.overlays = null
+				O.overlays.Cut()

 			var/obj/move/OM = locate(/obj/move/, T)

@@ -137,7 +137,7 @@ Doing this because FindTurfs() isn't even used
 		if(!O)
 			O = new /obj/effect/mark(T)
 		else
-			O.overlays = null
+			O.overlays.Cut()


 		var/temp = round(T.temp-T0C, 0.1)
@@ -168,7 +168,7 @@ Doing this because FindTurfs() isn't even used
 				if(!O)
 					O = new /obj/effect/mark(T)
 				else
-					O.overlays = null
+					O.overlays.Cut()

 				if(istype(M, /obj/machinery/pipes))
 					var/obj/machinery/pipes/P = M
@@ -199,7 +199,7 @@ Doing this because FindTurfs() isn't even used
 			if(!O)
 				O = new /obj/effect/mark(T)
 			else
-				O.overlays = null
+				O.overlays.Cut()

 			var/marked = 0
 			for(var/obj/M in T)
@@ -242,7 +242,7 @@ Doing this because FindTurfs() isn't even used
 			if(!O)
 				O = new /obj/effect/mark(T)
 			else
-				O.overlays = null
+				O.overlays.Cut()


 			var/obj/machinery/power/solar/S
--- a/code/unused/asteroiddevice.dm
+++ b/code/unused/asteroiddevice.dm
@@ -80,7 +80,7 @@
 	new /obj/item/device/flashlight(src)
 	new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
 	new /obj/item/weapon/reagent_containers/food/snacks/chips(src)
-	new /obj/item/weapon/cigpacket(src)
+	new /obj/item/weapon/storage/fancy/cigarettes(src)
 	var/obj/item/weapon/reagent_containers/pill/P = new/obj/item/weapon/reagent_containers/pill(src)
 	P.reagents.add_reagent("nutriment", 500)
 	P.name = "Cyanide pill"
--- a/code/unused/dna_mutations.dm
+++ b/code/unused/dna_mutations.dm
@@ -66,7 +66,7 @@ This system could be expanded to migrate all of our current mutations to. Maybe.
 		required = 2

 		get_mutation(var/mob/living/carbon/M)
-			M << "\blue You a pleasant warmth pulse throughout your body..."
+			M << "\blue You feel a pleasant warmth pulse throughout your body..."
 			M.mutations.Add(HEAL)

 /* /datum/mutationreq :
--- a/code/unused/filter_control.dm
+++ b/code/unused/filter_control.dm
@@ -112,7 +112,7 @@
 		return

 /obj/machinery/filter_control/proc/updateicon()
-	overlays = null
+	overlays.Cut()
 	if(stat & NOPOWER)
 		icon_state = "filter_control-nopower"
 		return
--- a/code/unused/hivebot/hivebot.dm
+++ b/code/unused/hivebot/hivebot.dm
@@ -278,7 +278,7 @@

 /mob/living/silicon/hivebot/proc/updateicon()

-	src.overlays = null
+	src.overlays.Cut()

 	if(src.stat == 0)
 		src.overlays += "eyes"
--- a/code/unused/hivebot/hud.dm
+++ b/code/unused/hivebot/hud.dm
@@ -240,7 +240,7 @@


 	mymob.zone_sel = new /obj/screen/zone_sel( null )
-	mymob.zone_sel.overlays = null
+	mymob.zone_sel.overlays.Cut()
 	mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))

 	mymob.client.screen = null
--- a/code/unused/mining/rail_unused.dm
+++ b/code/unused/mining/rail_unused.dm
@@ -223,7 +223,7 @@ for (var/client/C)
 	if(!load)
 		return

-	overlays = null
+	overlays.Cut()

 	load.loc = src.loc
 	load.pixel_y -= 9
--- a/code/unused/pda2/base_os.dm
+++ b/code/unused/pda2/base_os.dm
@@ -95,7 +95,7 @@
 				if(2)
 					//Messenger.  Uses Radio.  Is a messenger.
 					//TO-DO: ~file sharing~
-					src.master.overlays = null //Remove existing alerts
+					src.master.overlays.Cut() //Remove existing alerts
 					dat += "<h4>SpaceMessenger V4.0.5</h4>"

 					if (!src.message_mode)
--- a/code/unused/pda2/pda2.dm
+++ b/code/unused/pda2/pda2.dm
@@ -254,7 +254,7 @@
 			for (var/mob/O in hearers(3, src.loc))
 				O.show_message(text("\icon[src] *[alert_message]*"))

-		src.overlays = null
+		src.overlays.Cut()
 		src.overlays += image('icons/obj/pda.dmi', "pda-r")
 		return

--- a/code/unused/pipe.dm
+++ b/code/unused/pipe.dm
@@ -348,7 +348,7 @@ var/linenums = 0
 	src.icon_state = is

 	if(node1 && node2)
-		overlays = null
+		overlays.Cut()
 	else if(!node1 && !node2)
 		overlays += image('icons/obj/pipes.dmi', "discon", FLY_LAYER, dirs[1])
 		overlays += image('icons/obj/pipes.dmi', "discon", FLY_LAYER, dirs[2])
--- a/code/unused/pipe_filter.dm
+++ b/code/unused/pipe_filter.dm
@@ -222,7 +222,7 @@
 		updateicon()

 /obj/machinery/pipefilter/proc/updateicon()
-	src.overlays = null
+	src.overlays.Cut()
 	if(stat & NOPOWER)
 		icon_state = "filter-off"
 	else