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

Conflicts:
	code/game/gamemodes/cult/talisman.dm
	maps/exodus-1.dmm

code/WorkInProgress/computer3/computers/camera.dm

@@ -147,7 +147,7 @@
 			if(temp.len)
 				L.Add(C)
 
-		//camera_sort(L)
+		camera_sort(L)
 
 		return L
 	verify_machine(var/obj/machinery/camera/C,var/datum/file/camnet_key/key = null)

code/__HELPERS/global_lists.dm

@@ -26,7 +26,7 @@ var/global/list/language_keys[0]					//table of say codes for all languages
 var/global/list/whitelisted_species = list("Human")
 
 // Posters
-var/global/list/datum/poster/poster_designs = typesof(/datum/poster) - /datum/poster
+var/global/list/poster_designs = list()
 
 // Uplinks
 var/list/obj/item/device/uplink/world_uplinks = list()
@@ -121,6 +121,12 @@ var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Al
 		if(S.flags & IS_WHITELISTED)
 			whitelisted_species += S.name
 
+	//Posters
+	paths = typesof(/datum/poster) - /datum/poster
+	for(var/T in paths)
+		var/datum/poster/P = new T
+		poster_designs += P
+	
 	return 1
 
 /* // Uncomment to debug chemical reaction list.

code/__HELPERS/turfs.dm

@@ -5,3 +5,6 @@
 	while(mloc && mloc.loc && !istype(mloc.loc, /turf/))
 		mloc = mloc.loc
 	return mloc
+
+/proc/iswall(turf/T)
+	return (istype(T, /turf/simulated/wall) || istype(T, /turf/unsimulated/wall) || istype(T, /turf/simulated/shuttle/wall))

code/game/gamemodes/cult/talisman.dm

@@ -2,7 +2,7 @@
 	icon_state = "paper_talisman"
 	var/imbue = null
 	var/uses = 0
-	info = "<img src='talisman.png'><br/><br/>"
+	info = "<center><img src='talisman.png'></center><br/><br/>"
 
 	attack_self(mob/living/user as mob)
 		if(iscultist(user))

code/game/jobs/job/medical.dm

@@ -68,8 +68,8 @@
 					H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
 					H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(H), slot_head)
 				if("Virologist")
-					H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(H), slot_wear_suit)
 					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform)
+					H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(H), slot_wear_suit)
 					H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), slot_wear_mask)
 					switch(H.backbag)
 						if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/virology(H), slot_back)
@@ -195,4 +195,4 @@
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
 		else
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)

code/game/machinery/cryopod.dm

@@ -15,6 +15,7 @@
 	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "cellconsole"
 	circuit = "/obj/item/weapon/circuitboard/cryopodcontrol"
+	density = 0
 	interact_offline = 1
 	var/mode = null
 

code/game/machinery/jukebox.dm

@@ -34,6 +34,7 @@ datum/track/New(var/title_name, var/audio)
 
 /obj/machinery/media/jukebox/Del()
 	StopPlaying()
+	..()
 
 /obj/machinery/media/jukebox/power_change()
 	if(!powered(power_channel) || !anchored)

code/game/mecha/mecha.dm

@@ -492,14 +492,17 @@
 		src.visible_message("The [src.name] armor deflects the projectile")
 		src.log_append_to_last("Armor saved.")
 		return
-	var/ignore_threshold
-	if(Proj.flag == "taser")
-		use_power(200)
-		return
-	if(istype(Proj, /obj/item/projectile/beam/pulse))
-		ignore_threshold = 1
-	src.take_damage(Proj.damage,Proj.flag)
-	src.check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),ignore_threshold)
+
+	if(Proj.damage_type == HALLOSS)
+		use_power(Proj.agony * 5)
+
+	if(!(Proj.nodamage))
+		var/ignore_threshold
+		if(istype(Proj, /obj/item/projectile/beam/pulse))
+			ignore_threshold = 1
+		src.take_damage(Proj.damage,Proj.flag)
+		src.check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),ignore_threshold)
+
 	Proj.on_hit(src)
 	return
 

code/game/objects/effects/decals/contraband.dm

@@ -23,9 +23,63 @@
 	name += " - No. [serial_number]"
 	..(loc)
 
+//Places the poster on a wall
+/obj/item/weapon/contraband/poster/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams)
+	if (!adjacent)
+		return
+
+	//must place on a wall and user must not be inside a closet/mecha/whatever
+	var/turf/W = A
+	if (!iswall(W) || !isturf(user.loc))
+		user << "\red You can't place this here!"
+		return
+	
+	var/placement_dir = get_dir(user, W)
+	if (!(placement_dir in cardinal))
+		user << "<span class='warning'>You must stand directly in front of the wall you wish to place that on.</span>"
+		return
+
+	//just check if there is a poster on or adjacent to the wall
+	var/stuff_on_wall = 0
+	if (locate(/obj/structure/sign/poster) in W)
+		stuff_on_wall = 1
+	
+	//crude, but will cover most cases. We could do stuff like check pixel_x/y but it's not really worth it.
+	for (var/dir in cardinal)
+		var/turf/T = get_step(W, dir)
+		if (locate(/obj/structure/sign/poster) in T)
+			stuff_on_wall = 1
+			break
+
+	if (stuff_on_wall)
+		user << "<span class='notice'>There is already a poster there!</span>"
+		return
+
+	user << "<span class='notice'>You start placing the poster on the wall...</span>" //Looks like it's uncluttered enough. Place the poster.
+
+	var/obj/structure/sign/poster/P = new(user.loc, placement_dir=get_dir(user, W), serial=serial_number)
+
+	flick("poster_being_set", P)
+	//playsound(W, 'sound/items/poster_being_created.ogg', 100, 1) //why the hell does placing a poster make printer sounds?
+	
+	var/oldsrc = src //get a reference to src so we can delete it after detaching ourselves
+	src = null
+	spawn(17)
+		if(!P) return
+
+		if(iswall(W) && user && P.loc == user.loc) //Let's check if everything is still there
+			user << "<span class='notice'>You place the poster!</span>"
+		else
+			P.roll_and_drop(P.loc)
+	
+	del(oldsrc)	//delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway
+
+//I'm 
+/obj/structure/sign/poster/proc/placement_check()
+
 //############################## THE ACTUAL DECALS ###########################
 
-obj/structure/sign/poster
+/obj/structure/sign/poster
 	name = "poster"
 	desc = "A large piece of space-resistant printed paper. "
 	icon = 'icons/obj/contraband.dmi'
@@ -34,22 +88,42 @@ obj/structure/sign/poster
 	var/poster_type		//So mappers can specify a desired poster
 	var/ruined = 0
 
-obj/structure/sign/poster/New(var/serial)
-	var/designtype
-	if (poster_type)
-		designtype = text2path(poster_type)
-	else
-		if(serial_number == loc)
-			serial_number = rand(1, poster_designs.len)	//This is for the mappers that want individual posters without having to use rolled posters.	
-		designtype = poster_designs[serial_number]
-	
-	var/datum/poster/design=new designtype()
-	name += " - [design.name]"
-	desc += " [design.desc]"
-	icon_state = design.icon_state // poster[serial_number]
-	..()
+/obj/structure/sign/poster/New(var/newloc, var/placement_dir=null, var/serial=null)
+	..(newloc)
 
-obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(!serial)
+		serial = rand(1, poster_designs.len) //use a random serial if none is given
+	
+	serial_number = serial
+	var/datum/poster/design = poster_designs[serial_number]
+	set_poster(design)
+	
+	switch (placement_dir)
+		if (NORTH)
+			pixel_x = 0
+			pixel_y = 32
+		if (SOUTH)
+			pixel_x = 0
+			pixel_y = -32
+		if (EAST)
+			pixel_x = 32
+			pixel_y = 0
+		if (WEST)
+			pixel_x = -32
+			pixel_y = 0
+
+/obj/structure/sign/poster/initialize()
+	if (poster_type)
+		var/path = text2path(poster_type)
+		var/datum/poster/design = new path
+		set_poster(design)
+
+/obj/structure/sign/poster/proc/set_poster(var/datum/poster/design)
+	name = "[initial(name)] - [design.name]"
+	desc = "[initial(desc)] [design.desc]"
+	icon_state = design.icon_state // poster[serial_number]
+
+/obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/wirecutters))
 		playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
 		if(ruined)

code/game/objects/effects/decals/posters/bs12.dm

@@ -234,12 +234,12 @@
 	name = "Security pinup"
 	desc = "This is a pin-up poster. A dark skinned white haired girl poses in the sunlight wearing a tank top with her stomach exposed. The text on the poster states \"M, Succubus of Security.\" and a lipstick mark stains the top right corner, as if kissed by the model herself."
 
- /datum/poster/bay_48
+/datum/poster/bay_48
 	icon_state="bsposter48"
 	name = "Borg pinup?"
 	desc = "This is a.. pin-up poster? It is a diagram on an old model of cyborg with a note scribbled in marker on the bottom, on the top there is a large XO written in red marker."
 
- /datum/poster/bay_49
+/datum/poster/bay_49
 	icon_state="bsposter49"
 	name = "Engineering recruitment"
 	desc = "This is a poster showing an engineer relaxing by a computer, the text states \"Living the life! Join Engineering today!\""

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

@@ -1048,10 +1048,10 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	// Do nothing
 
 /obj/item/device/pda/proc/new_message_from_pda(var/obj/item/device/pda/sending_device, var/message)
-	new_message(sending_device.name, sending_device.owner, sending_device.ownjob, message)
+	new_message(sending_device, sending_device.owner, sending_device.ownjob, message)
 
 /obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message)
-	var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;notap=[istype(loc, /mob/living/silicon)];skiprefresh=1;target=\ref[src]'>Reply</a>)"
+	var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;notap=[istype(loc, /mob/living/silicon)];skiprefresh=1;target=\ref[sending_unit]'>Reply</a>)"
 	new_info(news_silent, newstone, reception_message)
 
 	log_pda("[usr] (PDA: [sending_unit]) sent \"[message]\" to [name]")

code/game/objects/random/random.dm

@@ -102,4 +102,5 @@
 					prob(3);/obj/item/stack/cable_coil,\
 					prob(2);/obj/random/toolbox,\
 					prob(2);/obj/item/weapon/storage/belt/utility,\
-					prob(5);/obj/random/tool)
+					prob(5);/obj/random/tool,\
+					prob(2);/obj/item/weapon/tape_roll)

code/modules/clothing/spacesuits/rig/suits/combat.dm

@@ -1,5 +1,5 @@
 /obj/item/clothing/head/helmet/space/rig/combat
-	light_overlay = "helmet_light_green_dual"
+	light_overlay = "helmet_light_dual_green"
 
 /obj/item/weapon/rig/combat
 	name = "combat hardsuit control module"
@@ -22,22 +22,4 @@
 		/obj/item/rig_module/power_sink,
 		/obj/item/rig_module/electrowarfare_suite,
 		/obj/item/rig_module/chem_dispenser/combat
-		)
-
-/obj/item/weapon/rig/combat/merc
-	name = "crimson hardsuit control module"
-	desc = "A blood-red hardsuit featuring some fairly illegal technology."
-	icon_state = "merc_rig"
-	suit_type = "crimson hardsuit"
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/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)
-
-	initial_modules = list(
-		/obj/item/rig_module/mounted,
-		/obj/item/rig_module/vision/thermal,
-		/obj/item/rig_module/grenade_launcher,
-		/obj/item/rig_module/ai_container,
-		/obj/item/rig_module/power_sink,
-		/obj/item/rig_module/electrowarfare_suite,
-		/obj/item/rig_module/chem_dispenser/combat,
-		/obj/item/rig_module/fabricator/energy_net
 		)

code/modules/clothing/spacesuits/rig/suits/ert.dm

@@ -1,5 +1,6 @@
 /obj/item/clothing/head/helmet/space/rig/ert
 	light_overlay = "helmet_light_dual"
+	camera_networks = list("ERT","SS13")
 
 /obj/item/weapon/rig/ert
 	name = "ERT-C hardsuit control module"

code/modules/clothing/spacesuits/rig/suits/merc.dm

@@ -0,0 +1,27 @@
+/obj/item/clothing/head/helmet/space/rig/merc
+	light_overlay = "helmet_light_dual_green"
+	camera_networks = list("NUKE")
+
+/obj/item/weapon/rig/merc
+	name = "crimson hardsuit control module"
+	desc = "A blood-red hardsuit featuring some fairly illegal technology."
+	icon_state = "merc_rig"
+	suit_type = "crimson hardsuit"
+	armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60)
+	slowdown = 1
+	offline_slowdown = 3
+	offline_vision_restriction = 1
+
+	helm_type = /obj/item/clothing/head/helmet/space/rig/merc
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/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)
+
+	initial_modules = list(
+		/obj/item/rig_module/mounted,
+		/obj/item/rig_module/vision/thermal,
+		/obj/item/rig_module/grenade_launcher,
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/power_sink,
+		/obj/item/rig_module/electrowarfare_suite,
+		/obj/item/rig_module/chem_dispenser/combat,
+		/obj/item/rig_module/fabricator/energy_net
+		)

code/modules/clothing/spacesuits/rig/suits/station.dm

@@ -59,7 +59,8 @@
 	offline_slowdown = 3
 	offline_vision_restriction = 1
 
-	//Todo: add xenoarch gear.
+	helm_type = /obj/item/clothing/head/helmet/space/rig/ert
+
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/weapon/storage/box/excavation,/obj/item/weapon/pickaxe,/obj/item/device/healthanalyzer,/obj/item/device/measuring_tape,/obj/item/device/ano_scanner,/obj/item/device/depth_scanner,/obj/item/device/core_sampler,/obj/item/device/gps,/obj/item/device/beacon_locator,/obj/item/device/radio/beacon,/obj/item/weapon/pickaxe/hand,/obj/item/weapon/storage/bag/fossils)
 
 	req_access = list(access_rd)
@@ -102,6 +103,8 @@
 	offline_slowdown = 3
 	offline_vision_restriction = 1
 
+	helm_type = /obj/item/clothing/head/helmet/space/rig/ert
+
 	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton)
 
 	req_access = null

code/modules/clothing/under/miscellaneous.dm

@@ -395,9 +395,9 @@
 /obj/item/clothing/under/sundress_white
 	name = "white sundress"
 	desc = "A white sundress decorated with purple lilies."
-	icon_state = "whitesundress"
-	item_state = "whitesundress"
-	item_color = "whitesundress"
+	icon_state = "sundress_white"
+	item_state = "sundress_white"
+	item_color = "sundress_white"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
 /obj/item/clothing/under/captainformal
@@ -476,4 +476,4 @@
 	icon_state = "mai_yang"
 	item_state = "mai_yang"
 	item_color = "mai_yang"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS

code/modules/mob/living/silicon/pai/examine.dm

@@ -1,26 +1,19 @@
-/mob/living/silicon/pai/examine(mob/user) //removed as it was pointless...moved to the pai-card instead.
-	/*..(user)
+/mob/living/silicon/pai/examine(mob/user)
+	..(user, infix = ", personal AI")
 
 	var/msg = ""
-	if (src.stat == DEAD)
-		msg += "<span class='deadsay'>It appears to be offline.</span>\n"
-	else
-		msg += "<span class='warning'>"
-		if (src.getBruteLoss())
-			if (src.getBruteLoss() < 30)
-				msg += "It looks slightly dented.\n"
-			else
-				msg += "<B>Its casing appears cracked and broken!</B>\n"
-		if (src.getFireLoss())
-			if (src.getFireLoss() < 30)
-				msg += "It looks slightly charred!\n"
-			else
-				msg += "<B>Its casing is melted and heat-warped!</B>\n"
-		if (src.stat == UNCONSCIOUS)
-			msg += "It doesn't seem to be responding and its text-output is lagging.\n"
-		msg += "</span>"
-	msg += "*---------*</span>"
+	switch(src.stat)
+		if(CONSCIOUS)
+			if(!src.client)	msg += "\nIt appears to be in stand-by mode." //afk
+		if(UNCONSCIOUS)		msg += "\n<span class='warning'>It doesn't seem to be responding.</span>"
+		if(DEAD)			msg += "\n<span class='deadsay'>It looks completely unsalvageable.</span>"
+	msg += "\n*---------*</span>"
 
-	user << msg
-	*/
-	return
+	if(print_flavor_text()) msg += "\n[print_flavor_text()]\n"
+
+	if (pose)
+		if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
+			pose = addtext(pose,".") //Makes sure all emotes end with a period.
+		msg += "\nIt is [pose]"
+
+	user << msg

code/modules/mob/living/silicon/pai/pai.dm

@@ -391,26 +391,6 @@
 		else
 			src << "<span class='warning'>You are too small to pull that.</span>"
 
-/mob/living/silicon/pai/examine(mob/user)
-	..(user)
-
-	var/msg = ""
-	switch(src.stat)
-		if(CONSCIOUS)
-			if(!src.client)	msg += "\nIt appears to be in stand-by mode." //afk
-		if(UNCONSCIOUS)		msg += "\n<span class='warning'>It doesn't seem to be responding.</span>"
-		if(DEAD)			msg += "\n<span class='deadsay'>It looks completely unsalvageable.</span>"
-	msg += "\n*---------*</span>"
-
-	if(print_flavor_text()) msg += "\n[print_flavor_text()]\n"
-
-	if (pose)
-		if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
-			pose = addtext(pose,".") //Makes sure all emotes end with a period.
-		msg += "\nIt is [pose]"
-
-	user << msg
-
 // No binary for pAIs.
 /mob/living/silicon/pai/binarycheck()
-	return 0
+	return 0

code/modules/mob/living/silicon/robot/robot.dm

@@ -1289,9 +1289,9 @@ var/list/robot_verbs_default = list(
 	if(!connected_ai)
 		return
 	switch(notifytype)
-		if(1) //New Cyborg
-			connected_ai << "<br><br><span class='notice'>NOTICE - New cyborg connection detected: <a href='byond://?src=\ref[connected_ai];track2=\ref[connected_ai];track=\ref[src]'>[name]</a></span><br>"
+		if(1) //New Robot
+			connected_ai << "<br><br><span class='notice'>NOTICE - New [lowertext(braintype)] connection detected: <a href='byond://?src=\ref[connected_ai];track2=\ref[connected_ai];track=\ref[src]'>[name]</a></span><br>"
 		if(2) //New Module
-			connected_ai << "<br><br><span class='notice'>NOTICE - Cyborg module change detected: [name] has loaded the [module.name] module.</span><br>"
+			connected_ai << "<br><br><span class='notice'>NOTICE - [braintype] module change detected: [name] has loaded the [module.name].</span><br>"
 		if(3) //New Name
-			connected_ai << "<br><br><span class='notice'>NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].</span><br>"
+			connected_ai << "<br><br><span class='notice'>NOTICE - [braintype] reclassification detected: [oldname] is now designated as [newname].</span><br>"

code/modules/projectiles/projectile/force.dm

@@ -8,12 +8,11 @@
 /obj/item/projectile/forcebolt/strong
 	name = "force bolt"
 
-/obj/item/projectile/forcebolt/on_hit(var/atom/target, var/blocked = 0)
-
-	var/obj/T = target
-	var/throwdir = get_dir(firer,target)
-	T.throw_at(get_edge_target_turf(target, throwdir),10,10)
-	return 1
+/obj/item/projectile/forcebolt/on_hit(var/atom/movable/target, var/blocked = 0)
+	if(istype(target))
+		var/throwdir = get_dir(firer,target)
+		target.throw_at(get_edge_target_turf(target, throwdir),10,10)
+		return 1
 
 /*
 /obj/item/projectile/forcebolt/strong/on_hit(var/atom/target, var/blocked = 0)