Merge branch 'BurgerLUA:master' into master

burgerstation.dme

@@ -221,8 +221,10 @@
 #include "code\_core\datum\ability\magic\_magic_projectile.dm"
 #include "code\_core\datum\ability\magic\_magic_summon_item.dm"
 #include "code\_core\datum\ability\magic\fireball.dm"
+#include "code\_core\datum\ability\magic\mana_armor.dm"
 #include "code\_core\datum\ability\magic\radial_blind.dm"
 #include "code\_core\datum\ability\magic\smite.dm"
+#include "code\_core\datum\ability\magic\soul_trap.dm"
 #include "code\_core\datum\ability\magic\tesla.dm"
 #include "code\_core\datum\ability\magic\wrath.dm"
 #include "code\_core\datum\addiction\_addiction.dm"
@@ -255,7 +257,6 @@
 #include "code\_core\datum\ai\advanced\space_soldier.dm"
 #include "code\_core\datum\ai\advanced\stand.dm"
 #include "code\_core\datum\ai\advanced\syndicate.dm"
-#include "code\_core\datum\ai\advanced\taxman.dm"
 #include "code\_core\datum\ai\advanced\zombie.dm"
 #include "code\_core\datum\ai\boss\_boss.dm"
 #include "code\_core\datum\ai\boss\ai_core.dm"
@@ -486,6 +487,7 @@
 #include "code\_core\datum\damagetype\ranged\magic\inferno.dm"
 #include "code\_core\datum\damagetype\ranged\magic\lightning.dm"
 #include "code\_core\datum\damagetype\ranged\magic\magic_missile.dm"
+#include "code\_core\datum\damagetype\ranged\magic\pillar.dm"
 #include "code\_core\datum\damagetype\ranged\magic\shock.dm"
 #include "code\_core\datum\damagetype\ranged\magic\spellblade.dm"
 #include "code\_core\datum\damagetype\ranged\magic\tesla.dm"
@@ -502,6 +504,7 @@
 #include "code\_core\datum\damagetype\unarmed\powerfist.dm"
 #include "code\_core\datum\damagetype\unarmed\slaughter.dm"
 #include "code\_core\datum\damagetype\unarmed\smite.dm"
+#include "code\_core\datum\damagetype\unarmed\soultrap.dm"
 #include "code\_core\datum\damagetype\unarmed\stand.dm"
 #include "code\_core\datum\damagetype\unarmed\cqc\_cqc.dm"
 #include "code\_core\datum\damagetype\unarmed\cqc\boss.dm"
@@ -515,7 +518,6 @@
 #include "code\_core\datum\dialogue\npc\mech_fabricator.dm"
 #include "code\_core\datum\dialogue\npc\merchant_goblin.dm"
 #include "code\_core\datum\dialogue\npc\nanotrasen_soldier.dm"
-#include "code\_core\datum\dialogue\npc\taxman.dm"
 #include "code\_core\datum\dialogue\npc\wizard_ambassador.dm"
 #include "code\_core\datum\dialogue\npc\job_providers\chief_engineer.dm"
 #include "code\_core\datum\dialogue\npc\job_providers\chief_medical_officer.dm"
@@ -619,8 +621,6 @@
 #include "code\_core\datum\loadout\runic.dm"
 #include "code\_core\datum\loadout\shaft_miner.dm"
 #include "code\_core\datum\loadout\skeleton_miner.dm"
-#include "code\_core\datum\loadout\tax.dm"
-#include "code\_core\datum\loadout\taxman.dm"
 #include "code\_core\datum\loadout\that_guy.dm"
 #include "code\_core\datum\loadout\virtual_reality.dm"
 #include "code\_core\datum\loadout\witch_hunter.dm"
@@ -652,12 +652,14 @@
 #include "code\_core\datum\loadout\syndicate\_syndicate.dm"
 #include "code\_core\datum\loadout\syndicate\antagonist.dm"
 #include "code\_core\datum\loadout\wizard\_wizard.dm"
+#include "code\_core\datum\loadout\wizard\raging_mage.dm"
 #include "code\_core\datum\loadout\zombie\_zombie.dm"
 #include "code\_core\datum\loadout\zombie\zombie_armored.dm"
 #include "code\_core\datum\loadout\zombie\zombie_bloated.dm"
 #include "code\_core\datum\loadout\zombie\zombie_civilian.dm"
 #include "code\_core\datum\loadout\zombie\zombie_clown.dm"
 #include "code\_core\datum\loadout\zombie\zombie_firefighter.dm"
+#include "code\_core\datum\loadout\zombie\zombie_mummy.dm"
 #include "code\_core\datum\loadout\zombie\zombie_roided.dm"
 #include "code\_core\datum\loadout\zombie\zombie_security.dm"
 #include "code\_core\datum\loadout\zombie\zombie_worker.dm"
@@ -814,6 +816,7 @@
 #include "code\_core\datum\status_effect\grab.dm"
 #include "code\_core\datum\status_effect\immortal.dm"
 #include "code\_core\datum\status_effect\last_breath.dm"
+#include "code\_core\datum\status_effect\mana_armor.dm"
 #include "code\_core\datum\status_effect\mana_void.dm"
 #include "code\_core\datum\status_effect\paralyzed.dm"
 #include "code\_core\datum\status_effect\parried.dm"
@@ -866,6 +869,7 @@
 #include "code\_core\mob\living\health.dm"
 #include "code\_core\mob\living\interaction.dm"
 #include "code\_core\mob\living\life.dm"
+#include "code\_core\mob\living\minion.dm"
 #include "code\_core\mob\living\mob_values.dm"
 #include "code\_core\mob\living\movement.dm"
 #include "code\_core\mob\living\nutrition.dm"
@@ -915,13 +919,12 @@
 #include "code\_core\mob\living\advanced\human\npc\hostage.dm"
 #include "code\_core\mob\living\advanced\human\npc\monkey.dm"
 #include "code\_core\mob\living\advanced\human\npc\nanotrasen.dm"
+#include "code\_core\mob\living\advanced\human\npc\raging_mage.dm"
 #include "code\_core\mob\living\advanced\human\npc\rev.dm"
 #include "code\_core\mob\living\advanced\human\npc\robot_assistant.dm"
 #include "code\_core\mob\living\advanced\human\npc\skeleton_miner.dm"
 #include "code\_core\mob\living\advanced\human\npc\space_soldier.dm"
 #include "code\_core\mob\living\advanced\human\npc\syndicate.dm"
-#include "code\_core\mob\living\advanced\human\npc\tax_man.dm"
-#include "code\_core\mob\living\advanced\human\npc\wizard.dm"
 #include "code\_core\mob\living\advanced\human\npc\wizard_federation_guard.dm"
 #include "code\_core\mob\living\advanced\human\npc\unique\_unique.dm"
 #include "code\_core\mob\living\advanced\human\npc\unique\burger_challenge.dm"
@@ -950,6 +953,7 @@
 #include "code\_core\mob\living\advanced\human\npc\zombie\zombie_armored.dm"
 #include "code\_core\mob\living\advanced\human\npc\zombie\zombie_bloated.dm"
 #include "code\_core\mob\living\advanced\human\npc\zombie\zombie_clown.dm"
+#include "code\_core\mob\living\advanced\human\npc\zombie\zombie_mummy.dm"
 #include "code\_core\mob\living\advanced\human\npc\zombie\zombie_normal.dm"
 #include "code\_core\mob\living\advanced\human\npc\zombie\zombie_roided.dm"
 #include "code\_core\mob\living\advanced\human\npc\zombie\zombie_security.dm"
@@ -1477,6 +1481,7 @@
 #include "code\_core\obj\item\clothing\overwear\armor\lizard_shaman.dm"
 #include "code\_core\obj\item\clothing\overwear\armor\medium.dm"
 #include "code\_core\obj\item\clothing\overwear\armor\molded.dm"
+#include "code\_core\obj\item\clothing\overwear\armor\mummy_suit.dm"
 #include "code\_core\obj\item\clothing\overwear\armor\nanotrasen.dm"
 #include "code\_core\obj\item\clothing\overwear\armor\old.dm"
 #include "code\_core\obj\item\clothing\overwear\armor\reinforced_vest.dm"
@@ -1702,12 +1707,12 @@
 #include "code\_core\obj\item\material\ingot.dm"
 #include "code\_core\obj\item\material\ore.dm"
 #include "code\_core\obj\item\material\pellets.dm"
+#include "code\_core\obj\item\material\plank.dm"
 #include "code\_core\obj\item\material\rod.dm"
 #include "code\_core\obj\item\material\shard.dm"
 #include "code\_core\obj\item\material\sheet.dm"
 #include "code\_core\obj\item\material\sheet_types.dm"
 #include "code\_core\obj\item\material\trash_cube.dm"
-#include "code\_core\obj\item\material\wood.dm"
 #include "code\_core\obj\item\organs\_organs.dm"
 #include "code\_core\obj\item\organs\antennae.dm"
 #include "code\_core\obj\item\organs\arms.dm"
@@ -1975,6 +1980,7 @@
 #include "code\_core\obj\item\weapon\ranged\spellgem\lightning.dm"
 #include "code\_core\obj\item\weapon\ranged\spellgem\magic_missile.dm"
 #include "code\_core\obj\item\weapon\ranged\spellgem\oozey.dm"
+#include "code\_core\obj\item\weapon\ranged\spellgem\pillar.dm"
 #include "code\_core\obj\item\weapon\ranged\spellgem\shock.dm"
 #include "code\_core\obj\item\weapon\ranged\spellgem\tesla.dm"
 #include "code\_core\obj\item\weapon\ranged\spellgem\unholy_skull.dm"
@@ -2351,7 +2357,6 @@
 #include "code\_core\world\subsystems\dirty.dm"
 #include "code\_core\world\subsystems\discord.dm"
 #include "code\_core\world\subsystems\dmm_suite.dm"
-#include "code\_core\world\subsystems\economy.dm"
 #include "code\_core\world\subsystems\emote.dm"
 #include "code\_core\world\subsystems\events.dm"
 #include "code\_core\world\subsystems\experience.dm"
@@ -2396,7 +2401,6 @@
 #include "code\_core\world\subsystems\squad.dm"
 #include "code\_core\world\subsystems\status.dm"
 #include "code\_core\world\subsystems\sunlight.dm"
-#include "code\_core\world\subsystems\tax.dm"
 #include "code\_core\world\subsystems\text.dm"
 #include "code\_core\world\subsystems\thinking.dm"
 #include "code\_core\world\subsystems\tracks.dm"

code/__defines/_defines.dm

@@ -1,7 +1,7 @@
 #define TARGETABLE_LIMBS list(BODY_HEAD, BODY_TORSO, BODY_GROIN, BODY_ARM_LEFT, BODY_ARM_RIGHT , BODY_HAND_LEFT, BODY_HAND_RIGHT, BODY_LEG_LEFT, BODY_LEG_RIGHT, BODY_FOOT_LEFT, BODY_FOOT_RIGHT	)
 #define TARGETABLE_LIMBS_KV list(BODY_HEAD = 0, BODY_TORSO = 0, BODY_GROIN = 0, BODY_ARM_LEFT = 0, BODY_ARM_RIGHT = 0, BODY_HAND_LEFT = 0, BODY_HAND_RIGHT = 0, BODY_LEG_LEFT = 0, BODY_LEG_RIGHT = 0, BODY_FOOT_LEFT = 0, BODY_FOOT_RIGHT = 0	)
 
-#define DEFAULT_COLORS list("#303E66","#3B517B","#466E93","#F7F7F7","#36393F","#BE3333","#F4B25A")
+#define DEFAULT_COLORS list("#303E66","#3B517B","#466E93","#EAEAEA","#36393F","#BE3333","#F4B25A")
 #define DEFAULT_COLORS_CLASSIC list("#498eb1","#4f7081","#326068","#eaeaea","#333333","#fe0000","#F4B25A")
 #define PURPLE_NURPLE list("#3B5A8E","#3F3F7F","#283E82","#EAEAEA","#1E1E1E","#BE3333","#F4B25A")
 #define TEAL_DREAM list("#006C90","#006C6C","#4B9090","#EAEAEA","#EAEAEA","#BE3333","#F4B25A")

code/__defines/_range.dm

@@ -10,7 +10,7 @@
 #define AI_DETECTION_RANGE (1 + VIEW_RANGE * 0.5)
 #define AI_DETECTION_RANGE_NOISE (1 + VIEW_RANGE * 0.75)
 #define AI_DETECTION_RANGE_CAUTION (1 + VIEW_RANGE)
-#define AI_DETECTION_RANGE_COMBAT (1 + VIEW_RANGE + ZOOM_RANGE*0.25)
+#define AI_DETECTION_RANGE_COMBAT (1 + VIEW_RANGE*2)
 
 #define BOSS_RANGE (VIEW_RANGE + ZOOM_RANGE*2) //If you're out of this range, you're out of the boss fight.
 

code/__defines/currency.dm

@@ -1,3 +1,8 @@
 #define GOLD_AMOUNT_MAX 1000
 
-#define GOLD_DROP_AMOUNT_MAX 250
+#define GOLD_DROP_AMOUNT_MAX 250
+
+#define CREDITS_PER_GOLD 8
+
+
+#define SELL_MULTIPLIER 0.5

code/__defines/damage.dm

@@ -48,7 +48,7 @@
 #define ARMOR_VALUE_TO_CONSIDER 150 //The armor value of which to consider the value of weapons, bullets, and armor for.
 
 #define ARMOR_AP_MUL 3
-#define ARMOR_DAM_MUL 0.9
+#define ARMOR_DAM_MUL 0.8
 #define SURPLUS_MUL 0.75
 #define PREMIUM_MUL 1.25
 #define DU_MUL 1.5

code/__defines/game.dm

@@ -7,10 +7,12 @@
 #define GAMEMODE_BREAK 6
 
 #define WORLD_END_SHUTDOWN 0
-#define WORLD_END_NANOTRASEN_VICTORY 1
-#define WORLD_END_SYNDICATE_VICTORY 2
+#define WORLD_END_SYNDICATE_VICTORY 1
+#define WORLD_END_BORING_VICTORY 2
+#define WORLD_END_MINOR_NANOTRASEN_VICTORY 3
+#define WORLD_END_NANOTRASEN_VICTORY 4
 
 #define FAILED "FAILED"
 #define COMPLETED "COMPLETED"
 #define ACTIVE "ACTIVE"
-#define IMPOSSIBLE "IMPOSSIBLE"
+#define IMPOSSIBLE "IMPOSSIBLE"

code/__defines/shuttle.dm

@@ -1,6 +1,6 @@
-#define SHUTTLE_DEFAULT_TRANSIT_TIME 30 //In seconds.
-#define SHUTTLE_DEFAULT_TRANSIT_TIME_NO_LIVING 15
-#define SHUTTLE_DEFAULT_WAITING_TIME 30
+#define SHUTTLE_DEFAULT_TRANSIT_TIME 10 //In seconds.
+#define SHUTTLE_DEFAULT_TRANSIT_TIME_NO_LIVING 5
+#define SHUTTLE_DEFAULT_WAITING_TIME 10
 #define SHUTTLE_DEFAULT_IDLE_TIME 10
 
 #define SHUTTLE_STATE_NONE "none"
@@ -10,4 +10,4 @@
 #define SHUTTLE_STATE_LANDED "landed" //We have landed.
 #define SHUTTLE_STATE_WAITING "preparing" //We have enough people to launch, now we wait just for more, just in case.
 
-#define CHEESE_PROCESS_TIME 40 //In seconds.
+#define CHEESE_PROCESS_TIME 40 //In seconds.

code/__defines/soul.dm

@@ -3,4 +3,4 @@
 #define SOUL_SIZE_UNCOMMON 2500
 #define SOUL_SIZE_RARE 5000
 #define SOUL_SIZE_MYSTIC 10000
-#define SOUL_SIZE_GODLY 30000
+#define SOUL_SIZE_GODLY 20000

code/__defines/status.dm

@@ -110,3 +110,6 @@
 
 #define BLINDED "blinded"
 
+#define MANA_ARMOR "mana_armor"
+
+#define DUMMY "dummy"

code/__defines/types.dm

@@ -22,6 +22,7 @@ var/global/list/all_typecaches = list()
 
 #define is_living(A) istypecache(A,/mob/living/)
 
+#define is_simple(A) istypecache(A,/mob/living/simple)
 
 #define is_advanced(A) istypecache(A,/mob/living/advanced/)
 
@@ -74,6 +75,8 @@ var/global/list/all_typecaches = list()
 
 #define is_ranged_bullet_weapon(A) istypecache(A,/obj/item/weapon/ranged/bullet)
 
+#define is_spell_gem(A) istypecache(A,/obj/item/weapon/ranged/spellgem)
+
 #define is_bow(A) istypecache(A,/obj/item/weapon/ranged/bow)
 
 #define is_wand(A) istypecache(A,/obj/item/weapon/ranged/wand)

code/__helpers/alert.dm

@@ -39,10 +39,10 @@
 
 	if(is_living(alert_source))
 		var/mob/living/L = alert_source
-		if(L.master)
-			if(L.master.next_alert > world.time)
+		if(L.minion_master)
+			if(L.minion_master.next_alert > world.time)
 				return FALSE
-			L.master.next_alert = world.time + SECONDS_TO_DECISECONDS(1)
+			L.minion_master.next_alert = world.time + SECONDS_TO_DECISECONDS(1)
 		else
 			if(L.next_alert > world.time)
 				return FALSE

code/_core/atom/moveable/throwing.dm

@@ -49,5 +49,5 @@
 	src.force_move(P) //Move it to contents.
 	return P
 
-/atom/movable/proc/on_thrown(var/atom/owner,var/atom/hit_atom) //What happens after the person is thrown and it hits an object.
+/atom/movable/proc/on_thrown(var/atom/owner,var/atom/hit_atom) //What happens after the movable is thrown and it hits an object.
 	return TRUE

code/_core/client/View-Variables.dm

@@ -483,10 +483,8 @@ client/proc/debug_variable(name, value, level, var/datum/DA = null)
 			return
 		if(M.has_status_effect(IMMORTAL))
 			M.remove_status_effect(IMMORTAL)
-			M.movement_delay = initial(M.movement_delay)
 		else
 			M.add_status_effect(IMMORTAL)
-			M.movement_delay = 0.5
 		href_list["datumrefresh"] = href_list["godmode"]
 
 	else if(href_list["drop_everything"])

code/_core/client/_client.dm

@@ -30,7 +30,7 @@
 
 	mouse_pointer_icon = 'icons/pointers/help.dmi'
 
-	var/current_music_track //Id of music track that last played.
+	var/track/current_music_track //Id of music track that last played.
 	var/next_music_track = 0 //When the next music track should be triggered.
 
 	var/current_ambient_sound
@@ -94,7 +94,7 @@
 
 	var/last_control = 0 //Prevents race conditions.
 
-
+	var/guest = FALSE //Are we a guest?
 
 
 /client/proc/is_player_controlled()
@@ -155,8 +155,13 @@
 
 var/global/total_clients = 0
 
+var/global/regex/guest_regex = regex(@'guest-\d+$',"m")
+
 /client/New()
 
+	if(guest_regex.Find(src.ckey))
+		guest = TRUE
+
 	total_clients++
 
 	SSclient.all_clients[src.ckey] = src
@@ -301,6 +306,7 @@ var/global/total_clients = 0
 
 	return TRUE
 
+
 /*
 /client/Command(command as command_text)
 	mob.say(command)

code/_core/client/life.dm

@@ -1,12 +1,13 @@
 /client/proc/on_life()
 
 	if(length(queued_chat_messages) && queued_chat_messages[1])
-		var/list/queued_message = queued_chat_messages[1]
-		var/text = queued_message["text"]
-		var/list/targets = queued_message["output_target_list"]
-		for(var/target in targets)
-			src << output(text,target)
-		queued_chat_messages.Cut(1,2)
+		for(var/i in 1 to length(queued_chat_messages) > 20 ? 3 : 1) // If they have an excessive amount of messages, lets speed up.
+			var/list/queued_message = queued_chat_messages[1]
+			var/text = queued_message["text"]
+			var/list/targets = queued_message["output_target_list"]
+			for(var/target in targets)
+				src << output(text,target)
+			queued_chat_messages.Cut(1,2)
 
 	if(mob)
 		mob.on_life_client()
@@ -82,4 +83,4 @@
 	else
 		animate(src,pixel_x = 0, pixel_y = 0, time = SECONDS_TO_DECISECONDS(0.5), flags = ANIMATION_LINEAR_TRANSFORM )
 	*/
-	return TRUE
+	return TRUE

code/_core/client/mob.dm

@@ -115,12 +115,13 @@
 	U.loaded_data = U.load_json_data_from_id(file_num)
 	U.loaded_data["id"] = file_num
 	to_chat(span("notice","Successfully loaded character [U.loaded_data["name"]]."))
-	stop_music_track(src)
 
 	var/turf/T = length(world_spawnpoints) ? pick(world_spawnpoints) : FALLBACK_TURF
 
 	var/mob/living/advanced/player/P = new(T,src)
 	INITIALIZE(P)
 	FINALIZE(P)
 
+	stop_music_track(src)
+
 	return P