Merge branch 'master' into upstream-merge-28681

code/game/objects/items/devices/PDA/PDA_types.dm

@@ -111,11 +111,13 @@
 /obj/item/device/pda/heads/rd
 	name = "research director PDA"
 	default_cartridge = /obj/item/weapon/cartridge/rd
+	inserted_item = /obj/item/weapon/pen/fountain
 	icon_state = "pda-rd"
 
 /obj/item/device/pda/captain
 	name = "captain PDA"
 	default_cartridge = /obj/item/weapon/cartridge/captain
+	inserted_item = /obj/item/weapon/pen/fountain/captain
 	icon_state = "pda-captain"
 	detonate = 0
 
@@ -127,6 +129,7 @@
 /obj/item/device/pda/quartermaster
 	name = "quartermaster PDA"
 	default_cartridge = /obj/item/weapon/cartridge/quartermaster
+	inserted_item = /obj/item/weapon/pen/fountain
 	icon_state = "pda-qm"
 
 /obj/item/device/pda/shaftminer
@@ -148,6 +151,7 @@
 /obj/item/device/pda/lawyer
 	name = "lawyer PDA"
 	default_cartridge = /obj/item/weapon/cartridge/lawyer
+	inserted_item = /obj/item/weapon/pen/fountain
 	icon_state = "pda-lawyer"
 	ttone = "objection"
 
@@ -166,6 +170,7 @@
 	icon_state = "pda-library"
 	icon_alert = "pda-r-library"
 	default_cartridge = /obj/item/weapon/cartridge/curator
+	inserted_item = /obj/item/weapon/pen/fountain
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a WGW-11 series e-reader."
 	note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
 	silent = 1 //Quiet in the library!
@@ -184,6 +189,7 @@
 /obj/item/device/pda/bar
 	name = "bartender PDA"
 	icon_state = "pda-bartender"
+	inserted_item = /obj/item/weapon/pen/fountain
 
 /obj/item/device/pda/atmos
 	name = "atmospherics PDA"

code/game/objects/items/devices/radio/intercom.dm

@@ -10,15 +10,64 @@
 	var/mob/living/silicon/ai/ai = list()
 	var/last_tick //used to delay the powercheck
 	dog_fashion = null
+	var/unfastened = FALSE
+
+/obj/item/device/radio/intercom/unscrewed
+	unfastened = TRUE
 
-/obj/item/device/radio/intercom/Initialize()
+/obj/item/device/radio/intercom/Initialize(mapload, ndir, building)
 	. = ..()
+	if(building)
+		setDir(ndir)
 	START_PROCESSING(SSobj, src)
 
 /obj/item/device/radio/intercom/Destroy()
 	STOP_PROCESSING(SSobj, src)
 	return ..()
 
+/obj/item/device/radio/intercom/examine(mob/user)
+	..()
+	if(!unfastened)
+		to_chat(user, "<span class='notice'>It's <b>screwed</b> and secured to the wall.</span>")
+	else
+		to_chat(user, "<span class='notice'>It's <i>unscrewed</i> from the wall, and can be <b>detached</b>.</span>")
+
+/obj/item/device/radio/intercom/attackby(obj/item/I, mob/living/user, params)
+	if(istype(I, /obj/item/weapon/screwdriver))
+		var/obj/item/weapon/screwdriver/S = I
+		if(unfastened)
+			user.visible_message("<span class='notice'>[user] starts tightening [src]'s screws...</span>", "<span class='notice'>You start screwing in [src]...</span>")
+			playsound(src, S.usesound, 50, 1)
+			if(!do_after(user, 30 * S.toolspeed, target = src))
+				return
+			user.visible_message("<span class='notice'>[user] tightens [src]'s screws!</span>", "<span class='notice'>You tighten [src]'s screws.</span>")
+			playsound(src, 'sound/items/screwdriver2.ogg', 50, 1)
+			unfastened = FALSE
+		else
+			user.visible_message("<span class='notice'>[user] starts loosening [src]'s screws...</span>", "<span class='notice'>You start unscrewing [src]...</span>")
+			playsound(src, S.usesound, 50, 1)
+			if(!do_after(user, 60 * S.toolspeed, target = src))
+				return
+			user.visible_message("<span class='notice'>[user] loosens [src]'s screws!</span>", "<span class='notice'>You unscrew [src], loosening it from the wall.</span>")
+			playsound(src, 'sound/items/screwdriver2.ogg', 50, 1)
+			unfastened = TRUE
+		return
+	else if(istype(I, /obj/item/weapon/wrench))
+		if(!unfastened)
+			to_chat(user, "<span class='warning'>You need to unscrew [src] from the wall first!</span>")
+			return
+		var/obj/item/weapon/wrench/W = I
+		user.visible_message("<span class='notice'>[user] starts unsecuring [src]...</span>", "<span class='notice'>You start unsecuring [src]...</span>")
+		playsound(src, W.usesound, 50, 1)
+		if(!do_after(user, 80 * W.toolspeed, target = src))
+			return
+		user.visible_message("<span class='notice'>[user] unsecures [src]!</span>", "<span class='notice'>You detach [src] from the wall.</span>")
+		playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
+		new/obj/item/wallframe/intercom(get_turf(src))
+		qdel(src)
+		return
+	return ..()
+
 /obj/item/device/radio/intercom/attack_ai(mob/user)
 	interact(user)
 
@@ -69,3 +118,13 @@
 
 /obj/item/device/radio/intercom/add_blood(list/blood_dna)
 	return 0
+
+//Created through the autolathe or through deconstructing intercoms. Can be applied to wall to make a new intercom on it!
+/obj/item/wallframe/intercom
+	name = "intercom frame"
+	desc = "A ready-to-go intercom. Just slap it on a wall and screw it in!"
+	icon_state = "intercom"
+	result_path = /obj/item/device/radio/intercom/unscrewed
+	pixel_shift = 29
+	inverse = TRUE
+	materials = list(MAT_METAL = 75, MAT_GLASS = 25)