Merge pull request #11 from ParadiseSS13/master

Merge from Master

code/game/objects/effects/portals.dm

@@ -31,6 +31,9 @@
 
 /obj/effect/portal/Destroy()
 	portals -= src
+	if(istype(creator, /obj/item/weapon/hand_tele))
+		var/obj/item/weapon/hand_tele/O = creator
+		O.active_portals--
 	return ..()
 
 /obj/effect/portal/proc/teleport(atom/movable/M as mob|obj)

code/game/objects/structures/engicart.dm

@@ -25,62 +25,65 @@
 	return
 /obj/structure/engineeringcart/attackby(obj/item/I, mob/user)
 	var/fail_msg = "<span class='notice'>There is already one of those in [src].</span>"
-	if(istype(I, /obj/item/stack/sheet/glass))
-		if(!myglass)
-			put_in_cart(I, user)
-			myglass=I
-			update_icon()
-		else
-			user << fail_msg
-	else if(istype(I, /obj/item/stack/sheet/metal))
-		if(!mymetal)
-			put_in_cart(I, user)
-			mymetal=I
-			update_icon()
-		else
-			user << fail_msg
-	else if(istype(I, /obj/item/stack/sheet/plasteel))
-		if(!myplasteel)
-			put_in_cart(I, user)
-			myplasteel=I
-			update_icon()
-		else
-			user << fail_msg
-	else if(istype(I, /obj/item/device/flashlight))
-		if(!myflashlight)
-			put_in_cart(I, user)
-			myflashlight=I
-			update_icon()
-		else
-			user << fail_msg
-	else if(istype(I, /obj/item/weapon/storage/toolbox/mechanical))
-		if(!mybluetoolbox)
-			put_in_cart(I, user)
-			mybluetoolbox=I
-			update_icon()
-		else
-			user << fail_msg
-	else if(istype(I, /obj/item/weapon/storage/toolbox/electrical))
-		if(!myyellowtoolbox)
-			put_in_cart(I, user)
-			myyellowtoolbox=I
-			update_icon()
-		else
-			user << fail_msg
-	else if(istype(I, /obj/item/weapon/storage/toolbox))
-		if(!myredtoolbox)
-			put_in_cart(I, user)
-			myredtoolbox=I
-			update_icon()
-		else
-			user << fail_msg
-	else if(istype(I, /obj/item/taperoll/engineering/))
-		if(!myengitape)
-			put_in_cart(I, user)
-			myengitape=I
-			update_icon()
-		else
-			user << fail_msg
+	if(!I.is_robot_module())
+		if(istype(I, /obj/item/stack/sheet/glass))
+			if(!myglass)
+				put_in_cart(I, user)
+				myglass=I
+				update_icon()
+			else
+				user << fail_msg
+		else if(istype(I, /obj/item/stack/sheet/metal))
+			if(!mymetal)
+				put_in_cart(I, user)
+				mymetal=I
+				update_icon()
+			else
+				user << fail_msg
+		else if(istype(I, /obj/item/stack/sheet/plasteel))
+			if(!myplasteel)
+				put_in_cart(I, user)
+				myplasteel=I
+				update_icon()
+			else
+				user << fail_msg
+		else if(istype(I, /obj/item/device/flashlight))
+			if(!myflashlight)
+				put_in_cart(I, user)
+				myflashlight=I
+				update_icon()
+			else
+				user << fail_msg
+		else if(istype(I, /obj/item/weapon/storage/toolbox/mechanical))
+			if(!mybluetoolbox)
+				put_in_cart(I, user)
+				mybluetoolbox=I
+				update_icon()
+			else
+				user << fail_msg
+		else if(istype(I, /obj/item/weapon/storage/toolbox/electrical))
+			if(!myyellowtoolbox)
+				put_in_cart(I, user)
+				myyellowtoolbox=I
+				update_icon()
+			else
+				user << fail_msg
+		else if(istype(I, /obj/item/weapon/storage/toolbox))
+			if(!myredtoolbox)
+				put_in_cart(I, user)
+				myredtoolbox=I
+				update_icon()
+			else
+				user << fail_msg
+		else if(istype(I, /obj/item/taperoll/engineering/))
+			if(!myengitape)
+				put_in_cart(I, user)
+				myengitape=I
+				update_icon()
+			else
+				user << fail_msg
+	else
+		usr << "<span class='warning'>You cannot interface your modules [src]!</span>"
 
 /obj/structure/engineeringcart/attack_hand(mob/user)
 	user.set_machine(src)

code/game/objects/structures/janicart.dm

@@ -445,50 +445,53 @@
 /obj/structure/janitorialcart/attackby(obj/item/I, mob/user)
 	var/fail_msg = "<span class='notice'>There is already one of those in [src].</span>"
 
-	if(istype(I, /obj/item/weapon/mop))
-		var/obj/item/weapon/mop/m=I
-		if(m.reagents.total_volume < m.reagents.maximum_volume)
-			wet_mop(m, user)
-			return
-		if(!mymop)
-			m.janicart_insert(user, src)
-		else
-			user << fail_msg
+	if(!I.is_robot_module())
+		if(istype(I, /obj/item/weapon/mop))
+			var/obj/item/weapon/mop/m=I
+			if(m.reagents.total_volume < m.reagents.maximum_volume)
+				wet_mop(m, user)
+				return
+			if(!mymop)
+				m.janicart_insert(user, src)
+			else
+				user << fail_msg
 
-	else if(istype(I, /obj/item/weapon/storage/bag/trash))
-		if(!mybag)
-			var/obj/item/weapon/storage/bag/trash/t=I
-			t.janicart_insert(user, src)
-		else
-			user <<  fail_msg
-	else if(istype(I, /obj/item/weapon/reagent_containers/spray/cleaner))
-		if(!myspray)
-			put_in_cart(I, user)
-			myspray=I
-			update_icon()
-		else
-			user << fail_msg
-	else if(istype(I, /obj/item/device/lightreplacer))
-		if(!myreplacer)
-			var/obj/item/device/lightreplacer/l=I
-			l.janicart_insert(user,src)
-		else
-			user << fail_msg
-	else if(istype(I, /obj/item/weapon/caution))
-		if(signs < max_signs)
-			put_in_cart(I, user)
-			signs++
-			update_icon()
-		else
-			user << "<span class='notice'>[src] can't hold any more signs.</span>"
-	else if(mybag)
-		mybag.attackby(I, user)
-	else if(istype(I, /obj/item/weapon/crowbar))
-		user.visible_message("<span class='warning'>[user] begins to empty the contents of [src].</span>")
-		if(do_after(user, 30))
-			usr << "<span class='notice'>You empty the contents of [src]'s bucket onto the floor.</span>"
-			reagents.reaction(src.loc)
-			src.reagents.clear_reagents()
+		else if(istype(I, /obj/item/weapon/storage/bag/trash))
+			if(!mybag)
+				var/obj/item/weapon/storage/bag/trash/t=I
+				t.janicart_insert(user, src)
+			else
+				user <<  fail_msg
+		else if(istype(I, /obj/item/weapon/reagent_containers/spray/cleaner))
+			if(!myspray)
+				put_in_cart(I, user)
+				myspray=I
+				update_icon()
+			else
+				user << fail_msg
+		else if(istype(I, /obj/item/device/lightreplacer))
+			if(!myreplacer)
+				var/obj/item/device/lightreplacer/l=I
+				l.janicart_insert(user,src)
+			else
+				user << fail_msg
+		else if(istype(I, /obj/item/weapon/caution))
+			if(signs < max_signs)
+				put_in_cart(I, user)
+				signs++
+				update_icon()
+			else
+				user << "<span class='notice'>[src] can't hold any more signs.</span>"
+		else if(mybag)
+			mybag.attackby(I, user)
+		else if(istype(I, /obj/item/weapon/crowbar))
+			user.visible_message("<span class='warning'>[user] begins to empty the contents of [src].</span>")
+			if(do_after(user, 30))
+				usr << "<span class='notice'>You empty the contents of [src]'s bucket onto the floor.</span>"
+				reagents.reaction(src.loc)
+				src.reagents.clear_reagents()
+	else
+		usr << "<span class='warning'>You cannot interface your modules [src]!</span>"
 
 /obj/structure/janitorialcart/attack_hand(mob/user)
 	user.set_machine(src)