Merge branch 'master' into placeholder

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

@@ -490,6 +490,8 @@ RFD Mining-Class
 		stored_matter--
 		to_chat(user, SPAN_NOTICE("The RFD now holds <b>[stored_matter]/30</b> fabrication-units."))
 
+	return TRUE
+
 
 // Malf AI RFD Transformer.
 
@@ -546,6 +548,8 @@ RFD Mining-Class
 		if(R.cell)
 			R.cell.use(used_energy)
 
+	return TRUE
+
 
 /*
 RFD Piping-Class

code/game/objects/items/weapons/circuitboards/machinery/miscboards.dm

@@ -139,6 +139,18 @@
 							"/obj/item/stock_parts/scanning_module" = 1,
 							"/obj/item/stock_parts/matter_bin" = 2)
 
+/obj/item/circuitboard/grill
+	name = T_BOARD("grill")
+	desc = "The circuitboard for a grill."
+	build_path = /obj/machinery/appliance/cooker/grill
+	origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 3)
+	board_type = "machine"
+	req_components = list(
+			"/obj/item/stock_parts/capacitor" = 2,
+			"/obj/item/stock_parts/micro_laser" = 1,
+			"/obj/item/stack/cable_coil" = 5
+	)
+
 /obj/item/circuitboard/candymachine
 	name = T_BOARD("candy machine")
 	desc = "The circuitboard for a candy machine."

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

@@ -78,7 +78,7 @@ Frequency:
 										direct = "very weak"
 							src.temp += "[W.code]-[dir2text(get_dir(sr, tr))]-[direct]<BR>"
 
-				src.temp += "<B>Extranneous Signals:</B><BR>"
+				src.temp += "<B>Extraneous Signals:</B><BR>"
 				for (var/obj/item/implant/tracking/W in implants)
 					if (!W.implanted || !(istype(W.loc,/obj/item/organ/external) || ismob(W.loc)))
 						continue

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

@@ -125,6 +125,10 @@
 		bear.instant_aggro()
 
 /obj/item/trap/Crossed(atom/movable/AM)
+	if(ishuman(AM))
+		var/mob/living/carbon/human/H = AM
+		if(H.shoes?.item_flags & LIGHTSTEP)
+			return
 	if(deployed && isliving(AM))
 		var/mob/living/L = AM
 		L.visible_message(
@@ -138,8 +142,6 @@
 		deployed = FALSE
 		update_icon()
 		shake_animation()
-	..()
-
 
 /obj/item/trap/update_icon()
 	icon_state = "[icon_base][deployed]"

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -42,7 +42,7 @@
 	new /obj/item/clothing/mask/breath/medical(src)
 
 /obj/structure/closet/secure_closet/medical3
-	name = "physician's locker"
+	name = "medical equipment locker"
 	req_access = list(access_medical_equip)
 	icon_state = "securemed1"
 	icon_closed = "securemed"
@@ -87,6 +87,40 @@
 	new /obj/item/clothing/glasses/eyepatch/hud/medical(src)
 	new /obj/item/clothing/suit/storage/medical_chest_rig(src)
 	new /obj/item/clothing/suit/storage/medical_chest_rig/first_responder(src)
+	new /obj/item/clothing/head/hardhat/first_responder(src)
+
+/obj/structure/closet/secure_closet/medical_fr
+	name = "first responder's locker"
+	desc = "An immobile, card-locked storage unit containing all the necessary equipment for a first responder."
+	req_access = list(access_first_responder)
+	icon_state = "securemed1"
+	icon_closed = "securemed"
+	icon_locked = "securemed1"
+	icon_opened = "securemedopen"
+	icon_broken = "securemedbroken"
+	icon_off = "securemedoff"
+
+/obj/structure/closet/secure_closet/medical_fr/fill()
+	..()
+	new /obj/item/storage/backpack/satchel_med(src)
+	new /obj/item/storage/backpack/duffel/med(src)
+	new /obj/item/clothing/head/hardhat/first_responder(src)
+	new /obj/item/device/radio/headset/headset_med(src)
+	new /obj/item/clothing/glasses/hud/health(src)
+	new /obj/item/clothing/suit/storage/medical_chest_rig(src)
+	new /obj/item/clothing/suit/storage/medical_chest_rig/first_responder(src)
+	new /obj/item/clothing/under/rank/medical/first_responder(src)
+	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/device/flashlight/pen(src)
+	new /obj/item/clothing/accessory/stethoscope(src)
+	new /obj/item/storage/belt/medical/first_responder(src)
+	new /obj/item/device/gps(src)
+	new /obj/item/reagent_containers/hypospray(src)
+	new /obj/item/taperoll/medical(src)
+	new /obj/item/device/radio(src)
+	new /obj/item/roller(src)
+	new /obj/item/crowbar/red(src)
+
 
 
 /obj/structure/closet/secure_closet/CMO