Merge pull request #9168 from PsiOmegaDelta/dev

Dev

code/game/machinery/cloning.dm

@@ -174,17 +174,9 @@
 			//So clones don't die of oxyloss in a running pod.
 			if(occupant.reagents.get_reagent_amount("inaprovaline") < 30)
 				occupant.reagents.add_reagent("inaprovaline", 60)
-
-			//So clones will remain asleep for long enough to get them into cryo (Bay RP edit)
-			if(occupant.reagents.get_reagent_amount("stoxin") < 10)
-				occupant.reagents.add_reagent("stoxin", 5)
-			if(occupant.reagents.get_reagent_amount("chloralhydrate") < 1)
-				occupant.reagents.add_reagent("chloralhydrate", 1)
-
+			occupant.Sleeping(30)
 			//Also heal some oxyloss ourselves because inaprovaline is so bad at preventing it!!
 			occupant.adjustOxyLoss(-4)
-			if(notoxin)
-				occupant.adjustToxLoss(-2) // If sufficiently upgraded - remove toxin damage from chloral
 
 			use_power(7500) //This might need tweaking.
 			return

code/modules/clothing/gloves/miscellaneous.dm

@@ -43,7 +43,7 @@
 	item_state = "lgloves"
 	siemens_coefficient = 1.0 //thin latex gloves, much more conductive than fabric gloves (basically a capacitor for AC)
 	permeability_coefficient = 0.01
-
+	germ_level = 0
 /obj/item/clothing/gloves/botanic_leather
 	desc = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
 	name = "botanist's leather gloves"

html/changelog.html

@@ -56,6 +56,16 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">10 May 2015</h2>
+			<h3 class="author">GinjaNinja32 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Acting jobs on the manifest will now sort with their non-acting counterparts. All assignments beginning with the word 'acting', 'temporary', or 'interim' will do this.</li>
+			</ul>
+			<h3 class="author">Yoshax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Removes sleepy chems from being cloned, adds a consistent period of 30 tick sleep.</li>
+			</ul>
+
 			<h2 class="date">09 May 2015</h2>
 			<h3 class="author">Yoshax updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -1731,3 +1731,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Yoshax:
   - rscadd: Maps in the top mounted 9mm practice rounds, .45 practice rounds, and
       practice shotgun shells into the armory.
+2015-05-10:
+  GinjaNinja32:
+  - rscadd: Acting jobs on the manifest will now sort with their non-acting counterparts.
+      All assignments beginning with the word 'acting', 'temporary', or 'interim'
+      will do this.
+  Yoshax:
+  - tweak: Removes sleepy chems from being cloned, adds a consistent period of 30
+      tick sleep.

html/changelogs/GinjaNinja32_acting_manifest.yml

@@ -1,5 +0,0 @@
-author: GinjaNinja32
-delete-after: True
-
-changes: 
-  - rscadd: "Acting jobs on the manifest will now sort with their non-acting counterparts. All assignments beginning with the word 'acting', 'temporary', or 'interim' will do this."