Merge remote-tracking branch 'upstream/dev' into reagent_dispenser

2025-12-10 10:12:45 +00:00 · 2015-03-16 21:21:56 +00:00
parent 30cfa30c73 c067db801f
commit 458970a617
263 changed files with 6218 additions and 5173 deletions
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -72,11 +72,11 @@ datum/mind
 				current.remove_changeling_powers()
 				current.verbs -= /datum/changeling/proc/EvolutionMenu
 			current.mind = null
+			
+			nanomanager.user_transferred(current, new_character) // transfer active NanoUI instances to new user
 		if(new_character.mind)		//remove any mind currently in our new body's mind variable
 			new_character.mind.current = null

-		nanomanager.user_transferred(current, new_character) // transfer active NanoUI instances to new user
-
 		current = new_character		//link ourself to our new body
 		new_character.mind = src	//and link our new body to ourself

--- a/code/datums/spells/knock.dm
+++ b/code/datums/spells/knock.dm
@@ -14,6 +14,7 @@
 		for(var/obj/machinery/door/door in T.contents)
 			spawn(1)
 				if(istype(door,/obj/machinery/door/airlock))
-					door:unlock(1)	//forced because it's magic!
+					var/obj/machinery/door/airlock/A = door
+					A.unlock(1)	//forced because it's magic!
 				door.open()
-	return
+	return
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -696,20 +696,31 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	name = "Weapons crate"
 	contains = list(/obj/item/weapon/melee/baton,
 					/obj/item/weapon/melee/baton,
-					/obj/item/weapon/gun/energy/laser,
-					/obj/item/weapon/gun/energy/laser,
+					/obj/item/weapon/gun/energy/gun,
+					/obj/item/weapon/gun/energy/gun,
 					/obj/item/weapon/gun/energy/taser,
 					/obj/item/weapon/gun/energy/taser,
 					/obj/item/weapon/gun/projectile/sec,
 					/obj/item/weapon/gun/projectile/sec,
 					/obj/item/weapon/storage/box/flashbangs,
 					/obj/item/weapon/storage/box/flashbangs)
-	cost = 30
+	cost = 40
 	containertype = /obj/structure/closet/crate/secure/weapon
 	containername = "Weapons crate"
 	access = access_security
 	group = "Security"

+/datum/supply_packs/flareguns
+	name = "Flare guns crate"
+	contains = list(/obj/item/weapon/gun/projectile/sec/flash,
+					/obj/item/ammo_magazine/c45m/flash,
+					/obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare,
+					/obj/item/weapon/storage/box/flashshells)
+	cost = 25
+	containertype = /obj/structure/closet/crate/secure/weapon
+	containername = "Flare gun crate"
+	access = access_security
+	group = "Security"

 /datum/supply_packs/eweapons
 	name = "Experimental weapons crate"
@@ -777,7 +788,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	name = "Energy weapons crate"
 	contains = list(/obj/item/weapon/gun/energy/laser,
 					/obj/item/weapon/gun/energy/laser,
-					/obj/item/weapon/gun/energy/gun)
+					/obj/item/weapon/gun/energy/laser)
 	cost = 50
 	containertype = /obj/structure/closet/crate/secure
 	containername = "energy weapons crate"
@@ -789,9 +800,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	contains = list(/obj/item/clothing/suit/armor/bulletproof,
 					/obj/item/clothing/suit/armor/bulletproof,
 					/obj/item/weapon/storage/box/shotgunammo,
-					/obj/item/weapon/gun/projectile/shotgun/pump,
+					/obj/item/weapon/storage/box/shotgunshells,
+					/obj/item/weapon/gun/projectile/shotgun/pump/combat,
 					/obj/item/weapon/gun/projectile/shotgun/pump/combat)
-	cost = 50
+	cost = 65
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Shotgun crate"
 	access = access_armory
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -35,9 +35,9 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
 /datum/wires/airlock/GetInteractWindow()
 	var/obj/machinery/door/airlock/A = holder
 	var/haspower = A.arePowerSystemsOn() //If there's no power, then no lights will be on.
-	
+
 	. += ..()
-	. += text("<br>\n[]<br>\n[]<br>\n[]<br>\n[]<br>\n[]<br>\n[]<br>\n[]", 
+	. += text("<br>\n[]<br>\n[]<br>\n[]<br>\n[]<br>\n[]<br>\n[]<br>\n[]",
 	(A.locked ? "The door bolts have fallen!" : "The door bolts look up."),
 	((A.lights && haspower) ? "The door bolt lights are on." : "The door bolt lights are off!"),
 	((haspower) ? "The test light is on." : "The test light is off!"),
@@ -59,9 +59,8 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
 				A.loseMainPower()
 				A.shock(usr, 50)
 			else
-				if((!IsIndexCut(AIRLOCK_WIRE_MAIN_POWER1)) && (!IsIndexCut(AIRLOCK_WIRE_MAIN_POWER2)))
-					A.regainMainPower()
-					A.shock(usr, 50)
+				A.regainMainPower()
+				A.shock(usr, 50)

 		if(AIRLOCK_WIRE_BACKUP_POWER1, AIRLOCK_WIRE_BACKUP_POWER2)

@@ -70,16 +69,14 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
 				A.loseBackupPower()
 				A.shock(usr, 50)
 			else
-				if((!IsIndexCut(AIRLOCK_WIRE_BACKUP_POWER1)) && (!IsIndexCut(AIRLOCK_WIRE_BACKUP_POWER2)))
-					A.regainBackupPower()
-					A.shock(usr, 50)
+				A.regainBackupPower()
+				A.shock(usr, 50)

 		if(AIRLOCK_WIRE_DOOR_BOLTS)

 			if(!mended)
 				//Cutting this wire also drops the door bolts, and mending it does not raise them. (This is what happens now, except there are a lot more wires going to door bolts at present)
-				if(A.locked!=1)
-					A.locked = 1
+				A.lock(1)
 				A.update_icon()

 		if(AIRLOCK_WIRE_AI_CONTROL)
@@ -98,16 +95,11 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
 					A.aiControlDisabled = -1

 		if(AIRLOCK_WIRE_ELECTRIFY)
-
 			if(!mended)
 				//Cutting this wire electrifies the door, so that the next person to touch the door without insulated gloves gets electrocuted.
-				if(A.secondsElectrified != -1)
-					A.shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
-					add_logs(usr, A, "electrified", admin=0, addition="at [A.x],[A.y],[A.z]")
-					A.secondsElectrified = -1
+				A.electrify(-1)
 			else
-				if(A.secondsElectrified == -1)
-					A.secondsElectrified = 0
+				A.electrify(0)
 			return // Don't update the dialog.

 		if (AIRLOCK_WIRE_SAFETY)
@@ -139,13 +131,9 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
 			//one wire for door bolts. Sending a pulse through this drops door bolts if they're not down (whether power's on or not),
 			//raises them if they are down (only if power's on)
 			if(!A.locked)
-				A.locked = 1
-				A.audible_message("You hear a click from the bottom of the door.", null,  1)
+				A.lock()
 			else
-				if(A.arePowerSystemsOn()) //only can raise bolts if power's on
-					A.locked = 0
-					A.audible_message("You hear a click from the bottom of the door.", null, 1)
-			A.update_icon()
+				A.unlock()

 		if(AIRLOCK_WIRE_BACKUP_POWER1 || AIRLOCK_WIRE_BACKUP_POWER2)
 			//two wires for backup power. Sending a pulse through either one causes a breaker to trip, but this does not disable it unless main power is down too (in which case it is disabled for 1 minute or however long it takes main power to come back, whichever is shorter).
@@ -165,19 +153,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048

 		if(AIRLOCK_WIRE_ELECTRIFY)
 			//one wire for electrifying the door. Sending a pulse through this electrifies the door for 30 seconds.
-			if(A.secondsElectrified==0)
-				A.shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
-				add_logs(usr, A, "electrified", admin=0, addition="at [A.x],[A.y],[A.z]")
-				A.secondsElectrified = 30
-				spawn(10)
-					if(A)
-						//TODO: Move this into process() and make pulsing reset secondsElectrified to 30
-						while (A.secondsElectrified>0)
-							A.secondsElectrified-=1
-							if(A.secondsElectrified<0)
-								A.secondsElectrified = 0
-							sleep(10)
-				return
+			A.electrify(30)
 		if(AIRLOCK_WIRE_OPEN_DOOR)
 			//tries to open the door without ID
 			//will succeed only if the ID wire is cut or the door requires no access and it's not emagged
--- a/code/datums/wires/robot.dm
+++ b/code/datums/wires/robot.dm
@@ -34,8 +34,7 @@ var/const/BORG_WIRE_CAMERA = 16

 		if (BORG_WIRE_AI_CONTROL) //Cut the AI wire to reset AI control
 			if(!mended)
-				if (R.connected_ai)
-					R.connected_ai = null
+				R.disconnect_from_ai()

 		if (BORG_WIRE_CAMERA)
 			if(!isnull(R.camera) && !R.scrambledcodes)
@@ -56,12 +55,8 @@ var/const/BORG_WIRE_CAMERA = 16
 		if (BORG_WIRE_AI_CONTROL) //pulse the AI wire to make the borg reselect an AI
 			if(!R.emagged)
 				var/mob/living/silicon/ai/new_ai = select_active_ai(R)
-				if(new_ai && (new_ai != R.connected_ai))
-					R.connected_ai.connected_robots -= src
-					R.connected_ai = new_ai
-					new_ai.connected_robots += src
-					R.notify_ai(1)
-					R.sync()
+				R.connect_to_ai(new_ai)
+
 		if (BORG_WIRE_CAMERA)
 			if(!isnull(R.camera) && R.camera.can_use() && !R.scrambledcodes)
 				R.camera.kick_viewers() // Kick anyone watching the Cyborg's camera