Merge pull request #11718 from PsiOmegaDelta/dev

Dev

.travis.yml

@@ -5,7 +5,7 @@ sudo: false
 env:
   BYOND_MAJOR="508"
   BYOND_MINOR="1293"
-  MACRO_COUNT=1061
+  MACRO_COUNT=1060
   
 cache:
   directories:

baystation12.dme

@@ -669,7 +669,6 @@
 #include "code\game\objects\items\weapons\gift_wrappaper.dm"
 #include "code\game\objects\items\weapons\handcuffs.dm"
 #include "code\game\objects\items\weapons\improvised_components.dm"
-#include "code\game\objects\items\weapons\kitchen.dm"
 #include "code\game\objects\items\weapons\manuals.dm"
 #include "code\game\objects\items\weapons\mop.dm"
 #include "code\game\objects\items\weapons\paint.dm"

code/__defines/machinery.dm

@@ -87,7 +87,7 @@ var/list/restricted_camera_networks = list(NETWORK_ERT,NETWORK_MERCENARY,"Secret
 
 // Will not bother pumping or filtering if the gas source as fewer than this amount of moles, to help with performance.
 #define MINIMUM_MOLES_TO_PUMP   0.01
-#define MINIMUM_MOLES_TO_FILTER 0.1
+#define MINIMUM_MOLES_TO_FILTER 0.04
 
 // The flow rate/effectiveness of various atmos devices is limited by their internal volume,
 // so for many atmos devices these will control maximum flow rates in L/s.

code/_onclick/click.dm

@@ -269,7 +269,7 @@
 			user.listed_turf = null
 		else
 			user.listed_turf = T
-			user.client.statpanel = T.name
+			user.client.statpanel = "Turf"
 	return 1
 
 /mob/proc/TurfAdjacent(var/turf/T)

code/game/objects/buckling.dm

@@ -56,7 +56,8 @@
 		user << "<span class='warning'>You can't buckle anyone in before the game starts.</span>"
 	if(!user.Adjacent(M) || user.restrained() || user.lying || user.stat || istype(user, /mob/living/silicon/pai))
 		return
-
+	if(M == buckled_mob)
+		return
 	if(istype(M, /mob/living/carbon/slime))
 		user << "<span class='warning'>The [M] is too squishy to buckle in.</span>"
 		return

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

@@ -320,7 +320,7 @@
 		qdel(src)
 
 /obj/item/device/paicard/see_emote(mob/living/M, text)
-	if(pai && pai.client)
+	if(pai && pai.client && !pai.canmove)
 		var/rendered = "<span class='message'>[text]</span>"
 		pai.show_message(rendered, 2)
 	..()

code/game/objects/items/weapons/material/kitchen.dm

@@ -34,20 +34,23 @@
 		else
 			return ..()
 
-	if(!M.can_eat(src))
-		return
-
 	if (reagents.total_volume > 0)
 		reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
 		if(M == user)
+			if(!M.can_eat(loaded))
+				return
 			M.visible_message("<span class='notice'>\The [user] eats some [loaded] from \the [src].</span>")
 		else
+			user.visible_message("<span class='warning'>\The [user] begins to feed \the [M]!</span>")
+			if(!(M.can_force_feed(user, loaded) && do_mob(user, M, 5 SECONDS)))
+				return
 			M.visible_message("<span class='notice'>\The [user] feeds some [loaded] to \the [M] with \the [src].</span>")
 		playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1)
 		overlays.Cut()
 		return
 	else
-		..()
+		user << "<span class='warning'>You don't have anything on \the [src].</span>"	//if we have help intent and no food scooped up DON'T STAB OURSELVES WITH THE FORK
+		return
 
 /obj/item/weapon/material/kitchen/utensil/fork
 	name = "fork"
@@ -91,7 +94,7 @@
 
 /obj/item/weapon/material/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
 	if ((CLUMSY in user.mutations) && prob(50))
-		user << "<span class='warning'>You accidentally cut yourself with the [src].</span>"
+		user << "<span class='warning'>You accidentally cut yourself with \the [src].</span>"
 		user.take_organ_damage(20)
 		return
 	return ..()
@@ -114,7 +117,7 @@
 
 /obj/item/weapon/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob)
 	if ((CLUMSY in user.mutations) && prob(50))
-		user << "<span class='warning'>The [src] slips out of your hand and hits your head.</span>"
+		user << "<span class='warning'>\The [src] slips out of your hand and hits your head.</span>"
 		user.drop_from_inventory(src)
 		user.take_organ_damage(10)
 		user.Paralyse(2)

code/game/objects/structures.dm

@@ -70,7 +70,7 @@
 		return ..()
 
 /obj/structure/proc/can_climb(var/mob/living/user, post_climb_check=0)
-	if (!can_touch(user) || !climbable || (!post_climb_check && (user in climbers)))
+	if (!climbable || !can_touch(user) || (!post_climb_check && (user in climbers)))
 		return 0
 
 	if (!user.Adjacent(src))

code/game/objects/structures/window.dm

@@ -135,7 +135,7 @@
 		return 1
 	if(is_full_window())
 		return 0	//full tile window, you can't move into it!
-	if(get_dir(loc, target) == dir)
+	if(get_dir(loc, target) & dir)
 		return !density
 	else
 		return 1

code/modules/mob/living/carbon/human/life.dm

@@ -406,7 +406,7 @@
 			safe_pressure_min *= 1.25
 
 	var/safe_exhaled_max = 10
-	var/safe_toxins_max = 0.005
+	var/safe_toxins_max = 0.2
 	var/SA_para_min = 1
 	var/SA_sleep_min = 5
 	var/inhaled_gas_used = 0

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

@@ -165,7 +165,6 @@ var/list/ai_verbs_default = list(
 	spawn(5)
 		new /obj/machinery/ai_powersupply(src)
 
-
 	hud_list[HEALTH_HUD]      = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[STATUS_HUD]      = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[LIFE_HUD] 		  = image('icons/mob/hud.dmi', src, "hudblank")
@@ -213,8 +212,22 @@ var/list/ai_verbs_default = list(
 	aiRadio = null
 
 	ai_list -= src
+
 	qdel(eyeobj)
 	eyeobj = null
+
+	qdel(psupply)
+	psupply = null
+
+	qdel(aiMulti)
+	aiMulti = null
+
+	qdel(aiRadio)
+	aiRadio = null
+
+	qdel(aiCamera)
+	aiCamera = null
+
 	return ..()
 
 /mob/living/silicon/ai/proc/setup_icon()
@@ -270,20 +283,22 @@ var/list/ai_verbs_default = list(
 /obj/machinery/ai_powersupply/New(var/mob/living/silicon/ai/ai=null)
 	powered_ai = ai
 	powered_ai.psupply = src
-	if(isnull(powered_ai))
-		qdel(src)
-
-	loc = powered_ai.loc
-	use_power(1) // Just incase we need to wake up the power system.
+	forceMove(powered_ai.loc)
 
 	..()
+	use_power(1) // Just incase we need to wake up the power system.
+
+/obj/machinery/ai_powersupply/Destroy()
+	. = ..()
+	powered_ai = null
 
 /obj/machinery/ai_powersupply/process()
-	if(!powered_ai || powered_ai.stat & DEAD)
-		qdel()
+	if(!powered_ai || powered_ai.stat == DEAD)
+		qdel(src)
 		return
 	if(powered_ai.psupply != src) // For some reason, the AI has different powersupply object. Delete this one, it's no longer needed.
 		qdel(src)
+		return
 	if(powered_ai.APU_power)
 		use_power = 0
 		return

code/modules/mob/mob.dm

@@ -156,8 +156,13 @@
 /mob/proc/buckled()
 	// Preliminary work for a future buckle rewrite,
 	// where one might be fully restrained (like an elecrical chair), or merely secured (shuttle chair, keeping you safe but not otherwise restrained from acting)
-	return buckled ? FULLY_BUCKLED : UNBUCKLED
+	if(!buckled)
+		return UNBUCKLED
+	return restrained() ? FULLY_BUCKLED : PARTIALLY_BUCKLED
 
+/mob/proc/is_physically_disabled()
+	return incapacitated(INCAPACITATION_DISABLED)
+	
 /mob/proc/incapacitated(var/incapacitation_flags = INCAPACITATION_DEFAULT)
 	if ((incapacitation_flags & INCAPACITATION_DISABLED) && (stat || paralysis || stunned || weakened || resting || sleeping || (status_flags & FAKEDEATH)))
 		return 1
@@ -697,17 +702,17 @@
 			if(!TurfAdjacent(listed_turf))
 				listed_turf = null
 			else
-				statpanel(listed_turf.name, null, listed_turf)
-				for(var/atom/A in listed_turf)
-					if(!A.mouse_opacity)
-						continue
-					if(A.invisibility > see_invisible)
-						continue
-					if(is_type_in_list(A, shouldnt_see))
-						continue
-					statpanel(listed_turf.name, null, A)
+				if(statpanel("Turf"))
+					stat("\icon[listed_turf]", listed_turf.name)
+					for(var/atom/A in listed_turf)
+						if(!A.mouse_opacity)
+							continue
+						if(A.invisibility > see_invisible)
+							continue
+						if(is_type_in_list(A, shouldnt_see))
+							continue
+						stat(A)
 
-	sleep(4) //Prevent updating the stat panel for the next .4 seconds, prevents clientside latency from updates
 
 // facing verbs
 /mob/proc/canface()
@@ -733,7 +738,7 @@
 	else
 		if(istype(buckled, /obj/vehicle))
 			var/obj/vehicle/V = buckled
-			if(incapacitated(INCAPACITATION_DISABLED))
+			if(is_physically_disabled())
 				lying = 1
 				canmove = 0
 				pixel_y = V.mob_offset_y - 5

code/modules/reagents/reagent_dispenser.dm

@@ -163,7 +163,9 @@
 		qdel(src)
 
 /obj/structure/reagent_dispensers/fueltank/fire_act(datum/gas_mixture/air, temperature, volume)
-	if(temperature > T0C+500)
+	if (modded)
+		explode()
+	else if (temperature > T0C+500)
 		explode()
 	return ..()
 

code/modules/supermatter/supermatter.dm

@@ -349,6 +349,8 @@
 
 
 /obj/machinery/power/supermatter/Bumped(atom/AM as mob|obj)
+	if(istype(AM, /obj/effect))
+		return
 	if(istype(AM, /mob/living))
 		AM.visible_message("<span class=\"warning\">\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.</span>",\
 		"<span class=\"danger\">You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"</span>",\

html/changelog.html

@@ -56,6 +56,16 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">20 December 2015</h2>
+			<h3 class="author">PsiOmegaDelta updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Can now use the Antag Uplink to buy a door hacking device with endless uses and which leaves doors unharmed, but instead needs some time to do its work.</li>
+			</ul>
+			<h3 class="author">Zuhayr updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Aiming has been rewritten, keep an eye out for weird behavior.</li>
+			</ul>
+
 			<h2 class="date">13 December 2015</h2>
 			<h3 class="author">Atlantis updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -2445,3 +2445,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Added differing card decks, including a Tarot deck and two trading card
       games.
   - rscadd: Remade /TG/Station's Orion Trail arcade machine with bay-specific modifications.
+2015-12-20:
+  PsiOmegaDelta:
+  - rscadd: Can now use the Antag Uplink to buy a door hacking device with endless
+      uses and which leaves doors unharmed, but instead needs some time to do its
+      work.
+  Zuhayr:
+  - tweak: Aiming has been rewritten, keep an eye out for weird behavior.

html/changelogs/PsiOmegaDelta-Hacktool.yml

@@ -1,4 +0,0 @@
-author: PsiOmegaDelta
-delete-after: True
-changes: 
-  - rscadd: "Can now use the Antag Uplink to buy a door hacking device with endless uses and which leaves doors unharmed, but instead needs some time to do its work."

html/changelogs/Zuhayr-aiming.yml

@@ -1,4 +0,0 @@
-author: Zuhayr
-delete-after: True
-changes: 
-  - tweak: "Aiming has been rewritten, keep an eye out for weird behavior."