Merge branch 'master' into development

code/modules/admin/verbs/antag-ooc.dm

@@ -23,7 +23,7 @@
 
 	for(var/mob/M in mob_list)
 		if (check_rights(R_ADMIN|R_MOD, 0, M))
-			M << "<font color='#960018'><span class='ooc'>" + create_text_tag("aooc", "Antag-OOC:", M.client) + " <EM>[get_options_bar(src, 0, 1, 1)](A HREF='?_src_=holder;adminplayerobservejump=[src.mob]>JMP</A>):</EM> <span class='message'>[msg]</span></span></font>"
+			M << "<font color='#960018'><span class='ooc'>" + create_text_tag("aooc", "Antag-OOC:", M.client) + " <EM>[get_options_bar(src, 0, 1, 1)](<A HREF='?_src_=holder;adminplayerobservejump=[src.mob]'>JMP</A>):</EM> <span class='message'>[msg]</span></span></font>"
 		else if (M.mind && M.mind.special_role && M.client)
 			M << "<font color='#960018'><span class='ooc'>" + create_text_tag("aooc", "Antag-OOC:", M.client) + " <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
 

code/modules/clothing/gloves/color.dm

@@ -123,7 +123,7 @@
 /obj/item/clothing/gloves/red/tajara
 	name = "red gloves"
 	desc = "Red gloves made for Tajaran use."
-	species_restricted = list("Tajaran")
+	species_restricted = list("Tajara")
 
 /obj/item/clothing/gloves/blue/unathi
  	name = "blue gloves"

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

@@ -34,7 +34,7 @@
 	handle_hud_list()
 
 	//Handle species-specific deaths.
-	species.handle_death(src)
+	species.handle_death(src, gibbed)
 	animate_tail_stop()
 
 	//Handle brain slugs.

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

@@ -269,7 +269,7 @@
 	H.mob_swap_flags = swap_flags
 	H.mob_push_flags = push_flags
 
-/datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
+/datum/species/proc/handle_death(var/mob/living/carbon/human/H, var/gibbed = 0) //Handles any species-specific death events (such as dionaea nymph spawns).
 	return
 
 // Only used for alien plasma weeds atm, but could be used for Dionaea later.

code/modules/mob/living/carbon/human/species/station/station.dm

@@ -224,8 +224,9 @@
 	H.gender = NEUTER
 	return ..()
 
-/datum/species/diona/handle_death(var/mob/living/carbon/human/H)
-	H.diona_split_into_nymphs(0)
+/datum/species/diona/handle_death(var/mob/living/carbon/human/H, var/gibbed = 0)
+	if (!gibbed)
+		H.diona_split_into_nymphs(0)
 
 /datum/species/machine
 	name = "Machine"

code/modules/vehicles/cargo_train.dm

@@ -55,7 +55,7 @@
 
 	if(is_train_head() && !on)
 		return 0
-	
+
 	//space check ~no flying space trains sorry
 	if(on && istype(destination, /turf/space))
 		return 0
@@ -79,12 +79,13 @@
 		return
 	..()
 
-//cargo trains are open topped, so there is a chance the projectile will hit the mob ridding the train instead
+// Cargo trains are open topped, so you can shoot at the driver.
+// Or you can shoot at the tug itself, if you're good.
 /obj/vehicle/train/cargo/bullet_act(var/obj/item/projectile/Proj)
-	if(buckled_mob && prob(70))
+	if (buckled_mob && Proj.original == buckled_mob)
 		buckled_mob.bullet_act(Proj)
-		return
-	..()
+	else
+		..()
 
 /obj/vehicle/train/cargo/update_icon()
 	if(open)

code/modules/vehicles/vehicle.dm

@@ -117,6 +117,10 @@
 	if (Proj.damage_type == BRUTE || Proj.damage_type == BURN)
 		health -= Proj.damage
 	..()
+
+	if (prob(20))
+		PoolOrNew(/obj/effect/effect/sparks, loc)
+
 	healthcheck()
 
 /obj/vehicle/meteorhit()

code/modules/virus2/dishincubator.dm

@@ -133,7 +133,7 @@
 			var/food_taken = min(food_needed, beaker.reagents.get_reagent_amount("virusfood"))
 
 			beaker.reagents.remove_reagent("virusfood", food_taken)
-			foodsupply = min(100, food_taken * 2)
+			foodsupply = min(100, foodsupply + (food_taken * 2))
 
 			nanomanager.update_uis(src)
 

html/Skull132_Age_Restrictions.yml

@@ -1,13 +0,0 @@
-author: Skull132
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes:
-  - rscadd: "Age restrictions for all jobs and antags are now implemented again with config options."
-  - tweak: "You are now prompted to confirm whether or not you want to delete a character."

html/changelog.html

@@ -56,6 +56,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">20 July 2016</h2>
+			<h3 class="author">Skull132 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">You can now shoot at cargo trains, or their passangers specifically. If you click on the train, you will hit it, and thus can destroy it while the passanger is still onboard.</li>
+				<li class="tweak">Gibbing or husking a Diona will no longer have them split off into nymphs. A gibbed or husked Diona is now permadead.</li>
+			</ul>
+
 			<h2 class="date">18 July 2016</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -2311,3 +2311,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Radio jammers added (syndicate uplink for 2 TC, or improvised out of a
       signaller/signaller assembly, with a cell added to it). These will jam headsets,
       PDAs, messaging servers, and Vaurca hivenet.
+2016-07-20:
+  Skull132:
+  - tweak: You can now shoot at cargo trains, or their passangers specifically. If
+      you click on the train, you will hit it, and thus can destroy it while the passanger
+      is still onboard.
+  - tweak: Gibbing or husking a Diona will no longer have them split off into nymphs.
+      A gibbed or husked Diona is now permadead.