Merge pull request #984 from Erthilo/master

TG Updates up to r3502

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

@@ -125,6 +125,16 @@
 	icon_state = "pda-lawyer"
 	ttone = "objection"
 
+/obj/item/device/pda/botanist
+	//default_cartridge = /obj/item/weapon/cartridge/botanist
+	icon_state = "pda-hydro"
+
+/obj/item/device/pda/librarian
+	icon_state = "pda-libb"
+	desc = "A portable microcomputer by Thinktronic Systems, LTD. This is 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!
+
 /*
  *	The Actual PDA
  */

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

@@ -13,6 +13,7 @@
 	var/access_clown = 0
 	var/access_mime = 0
 	var/access_janitor = 0
+//	var/access_flora = 0
 	var/access_reagent_scanner = 0
 	var/access_remote_door = 0 //Control some blast doors remotely!!
 	var/remote_door_id = ""
@@ -73,6 +74,12 @@
 		icon_state = "cart-mi"
 		access_mime = 1
 		var/mime_charges = 5
+/*
+	botanist
+		name = "Green Thumb v4.20"
+		icon_state = "cart-b"
+		access_flora = 1
+*/
 
 	signal
 		name = "generic signaler cartridge"

code/game/objects/items/item.dm

@@ -297,39 +297,46 @@ mob/proc/flash_weak_pain()
 									Metroid.SStun = 0
 
 						spawn(0)
-							Metroid.canmove = 0
-							step_away(Metroid, user)
-							if(prob(25 + power*2))
-								sleep(2)
+							if(Metroid)
+								Metroid.canmove = 0
 								step_away(Metroid, user)
-							Metroid.canmove = 1
+								if(prob(25 + power))
+									sleep(2)
+									if(Metroid && user)
+										step_away(Metroid, user)
+								Metroid.canmove = 1
 
 				else
 					if(prob(10 + power*2))
+						if(Metroid)
+							if(Metroid.Victim)
+								if(prob(80) && !Metroid.client)
+									Metroid.Discipline++
 
-						if(Metroid.Victim)
-							if(prob(80) && !Metroid.client)
-								Metroid.Discipline++
+									if(Metroid.Discipline == 1)
+										Metroid.attacked = 0
 
-								if(Metroid.Discipline == 1)
-									Metroid.attacked = 0
+								spawn()
+									if(Metroid)
+										Metroid.SStun = 1
+										sleep(rand(5,20))
+										if(Metroid)
+											Metroid.SStun = 0
 
-							spawn()
-								Metroid.SStun = 1
-								sleep(rand(5,20))
-								Metroid.SStun = 0
-
-						Metroid.Victim = null
-						Metroid.anchored = 0
+							Metroid.Victim = null
+							Metroid.anchored = 0
 
 
 						spawn(0)
-							step_away(Metroid, user)
-							Metroid.canmove = 0
-							if(prob(25 + power*4))
-								sleep(2)
+							if(Metroid && user)
 								step_away(Metroid, user)
-							Metroid.canmove = 1
+								Metroid.canmove = 0
+								if(prob(25 + power*4))
+									sleep(2)
+									if(Metroid && user)
+										step_away(Metroid, user)
+								Metroid.canmove = 1
+
 
 		var/showname = "."
 		if(user)

code/game/objects/items/weapons/surgery_tools.dm

@@ -1548,6 +1548,10 @@ CIRCULAR SAW
 					return
 
 			if(3.0)
+				if(M.changeling && M.changeling.changeling_fakedeath)
+					user << "\red The neural tissue regrows before your eyes as you cut it."
+					return
+
 				if(M != user)
 					for(var/mob/O in (viewers(M) - user - M))
 						O.show_message("\red [M] has \his spine's connection to the brain severed with [src] by [user].", 1)

code/game/objects/items/weapons/tools.dm

@@ -13,7 +13,7 @@ WELDINGTOOOL
 	desc = "A wrench with common uses. Can be found in your hand."
 	icon = 'items.dmi'
 	icon_state = "wrench"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
 	force = 5.0
 	throwforce = 7.0
 	w_class = 2.0
@@ -44,7 +44,7 @@ WELDINGTOOOL
 	name = "Welding Tool"
 	icon = 'items.dmi'
 	icon_state = "welder"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
 	force = 3.0
 	throwforce = 5.0
 	throw_speed = 1
@@ -310,7 +310,7 @@ WELDINGTOOOL
 	desc = "This cuts wires."
 	icon = 'items.dmi'
 	icon_state = "cutters"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
 	force = 6.0
 	throw_speed = 2
 	throw_range = 9

code/game/objects/radio/radio.dm

@@ -441,6 +441,9 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 	  	// Oh my god; the comms are down or something because the signal hasn't been broadcasted yet.
 	  	// Send a mundane broadcast with limited targets:
 
+		//THIS IS TEMPORARY.
+		if(!connection)	return	//~Carn
+
 		Broadcast_Message(connection, M, voicemask, M.voice_message,
 						  src, message, displayname, jobname, real_name, M.voice_name,
 		                  filter_type, signal.data["compression"])

code/game/objects/stacks/minerals.dm

@@ -10,6 +10,7 @@ SILVER
 
 //Sandstone
 var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
+	new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
 /*	new/datum/stack_recipe("sandstone wall", ???), \
 		new/datum/stack_recipe("sandstone floor", ???),\*/

code/game/objects/structures.dm

@@ -160,6 +160,58 @@ obj/structure
 /obj/structure/girder/reinforced
 	icon_state = "reinforced"
 	state = 2
+
+/obj/structure/cultgirder
+	icon= 'cult.dmi'
+	icon_state= "cultgirder"
+	anchored = 1
+	density = 1
+	layer = 2
+
+	attackby(obj/item/W as obj, mob/user as mob)
+		if(istype(W, /obj/item/weapon/wrench))
+			playsound(src.loc, 'Ratchet.ogg', 100, 1)
+			user << "\blue Now disassembling the girder"
+			if(do_after(user,40))
+				user << "\blue You dissasembled the girder!"
+				new /obj/effect/decal/remains/human(get_turf(src))
+				del(src)
+
+		else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter))
+			user << "\blue Now slicing apart the girder"
+			if(do_after(user,30))
+				user << "\blue You slice apart the girder!"
+			new /obj/effect/decal/remains/human(get_turf(src))
+			del(src)
+
+		else if(istype(W, /obj/item/weapon/pickaxe/diamonddrill))
+			user << "\blue You drill through the girder!"
+			new /obj/effect/decal/remains/human(get_turf(src))
+			del(src)
+
+	blob_act()
+		if(prob(40))
+			del(src)
+
+
+	ex_act(severity)
+		switch(severity)
+			if(1.0)
+				del(src)
+				return
+			if(2.0)
+				if (prob(30))
+					new /obj/effect/decal/remains/human(loc)
+					del(src)
+				return
+			if(3.0)
+				if (prob(5))
+					new /obj/effect/decal/remains/human(loc)
+					del(src)
+				return
+			else
+		return
+
 // LATTICE
 
 

code/game/objects/transfer_valve.dm

@@ -75,7 +75,6 @@
 		onclose(user, "trans_valve")
 		return
 
-	//CARN: MARKER
 	Topic(href, href_list)
 		..()
 		if ( usr.stat || usr.restrained() )