Merge branch 'master' of https://github.com/PolarisSS13/Polaris into tracking_implant

code/modules/mob/_modifiers/cloning.dm

@@ -0,0 +1,37 @@
+/*
+ *	Modifier applied to newly cloned people.
+ */
+
+// Gives rather nasty downsides for awhile, making them less robust.
+/datum/modifier/cloning_sickness
+	name = "cloning sickness"
+	desc = "You feel rather weak, having been cloned not so long ago."
+
+	on_created_text = "<span class='warning'><font size='3'>You feel really weak.</font></span>"
+	on_expired_text = "<span class='notice'><font size='3'>You feel your strength returning to you.</font></span>"
+
+	max_health_percent = 0.6				// -40% max health.
+	incoming_damage_percent = 1.1			// 10% more incoming damage.
+	outgoing_melee_damage_percent = 0.7		// 30% less melee damage.
+	disable_duration_percent = 1.25			// Stuns last 25% longer.
+	slowdown = 1							// Slower.
+	evasion = -1							// 15% easier to hit.
+
+// Tracks number of deaths, one modifier added per cloning
+/datum/modifier/cloned
+	name = "cloned"
+	desc = "You died and were cloned, and you can never forget that."
+
+	flags = MODIFIER_GENETIC			// So it gets copied if they die and get cloned again.
+	stacks = MODIFIER_STACK_ALLOWED		// Two deaths means two instances of this.
+
+// Prevents cloning, actual effect is on the cloning machine
+/datum/modifier/no_clone
+	name = "Cloning Incompatability"
+	desc = "For whatever reason, you cannot be cloned."
+
+	//WIP, but these may never be seen anyway, so *shrug
+	on_created_text = "<span class='warning'>Life suddenly feels more precious.</span>"
+	on_expired_text = "<span class='notice'>Death is cheap again.</span>"
+
+	flags = MODIFIER_GENETIC

code/modules/mob/_modifiers/traits.dm

@@ -0,0 +1,10 @@
+/datum/modifier/frail
+	name = "frail"
+	desc = "You are more delicate than the average person."
+
+	flags = MODIFIER_GENETIC
+
+	on_created_text = "<span class='warning'>You feel really weak.</span>"
+	on_expired_text = "<span class='notice'>You feel your strength returning to you.</span>"
+
+	max_health_percent = 0.9

code/modules/mob/language/station.dm

@@ -83,7 +83,7 @@
 	key = "k"
 	space_chance = 30
 	flags = WHITELISTED
-	syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix","*","!", "'")
+	syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix")
 
 /datum/language/human
 	name = LANGUAGE_SOL_COMMON
@@ -244,4 +244,4 @@
 "tod", "ser", "su", "no", "nue", "el",
 "ad", "al", "an", "ar", "as", "ci", "co", "de", "do", "el", "en", "er", "es", "ie", "in", "la", "lo", "me", "na",
 "no", "nt", "or", "os", "pa", "qu", "ra", "re", "ro", "se", "st", "ta", "te", "to", "ue", "un",
-"tod", "ser", "su", "no", "nue", "el")
+"tod", "ser", "su", "no", "nue", "el")

code/modules/mob/living/carbon/brain/MMI.dm

@@ -128,7 +128,8 @@
 		return
 	var/obj/item/weapon/rig/rig = src.get_rig()
 	if(rig)
-		rig.forced_move(direction, user)
+		if(istype(rig,/obj/item/weapon/rig))
+			rig.forced_move(direction, user)
 
 /obj/item/device/mmi/Destroy()
 	if(isrobot(loc))
@@ -260,7 +261,7 @@
 		src.brainmob.mind.reset()
 	src.brainmob.ckey = candidate.ckey
 	src.name = "[name] ([src.brainmob.name])"
-	src.brainmob << "<b>You are a [src], brought into existence on [station_name()].</b>"
+	src.brainmob << "<b>You are [src.name], brought into existence on [station_name()].</b>"
 	src.brainmob << "<b>As a synthetic intelligence, you are designed with organic values in mind.</b>"
 	src.brainmob << "<b>However, unless placed in a lawed chassis, you are not obligated to obey any individual crew member.</b>" //it's not like they can hurt anyone
 //	src.brainmob << "<b>Use say #b to speak to other artificial intelligences.</b>"
@@ -283,7 +284,6 @@
 	..()
 	src.brainmob.name = "[pick(list("ADA","DOS","GNU","MAC","WIN","NJS","SKS","DRD","IOS","CRM","IBM","TEX","LVM","BSD",))]-[rand(1000, 9999)]"
 	src.brainmob.real_name = src.brainmob.name
-	src.name = "robotic intelligence circuit ([src.brainmob.name])"
 
 /obj/item/device/mmi/digital/robot/transfer_identity(var/mob/living/carbon/H)
 	..()

code/modules/mob/living/simple_animal/animals/crab.dm

@@ -5,6 +5,7 @@
 	icon_state = "crab"
 	icon_living = "crab"
 	icon_dead = "crab_dead"
+	faction = "crabs"
 	intelligence_level = SA_ANIMAL
 
 	wander = 0
@@ -45,3 +46,37 @@
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "stomps"
+
+//Sif Crabs
+/mob/living/simple_animal/giant_crab
+	name = "Giant Crab"
+	desc = "A large, hard-shelled crustacean. This one is mostly grey."
+	icon_state = "sif_crab"
+	icon_living = "sif_crab"
+	icon_dead = "sif_crab_dead"
+	faction = "crabs"
+	intelligence_level = SA_ANIMAL
+
+	maxHealth = 200
+	health = 200
+
+	mob_size = MOB_LARGE
+	cooperative = 1
+	retaliate = 1
+	turns_per_move = 3
+
+	minbodytemp = 175
+
+	melee_damage_lower = 15
+	melee_damage_upper = 35
+
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "stomps"
+	friendly = "pinches"
+
+	speak_chance = 1
+	speak_emote = list("clicks")
+	emote_hear = list("clicks")
+	emote_see = list("clacks")

code/modules/mob/mob_movement.dm

@@ -533,3 +533,23 @@
 
 /mob/proc/update_gravity()
 	return
+
+// The real Move() proc is above, but touching that massive block just to put this in isn't worth it.
+/mob/Move(var/newloc, var/direct)
+	. = ..(newloc, direct)
+	if(.)
+		post_move(newloc, direct)
+
+// Called when a mob successfully moves.
+// Would've been an /atom/movable proc but it caused issues.
+/mob/proc/post_move(var/newloc, var/direct)
+	for(var/obj/O in contents)
+		O.on_loc_moved(newloc, direct)
+
+// Received from post_move(), useful for items that need to know that their loc just moved.
+/obj/proc/on_loc_moved(var/newloc, var/direct)
+	return
+
+/obj/item/weapon/storage/on_loc_moved(var/newloc, var/direct)
+	for(var/obj/O in contents)
+		O.on_loc_moved(newloc, direct)