Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	html/changelogs/.all_changelog.yml

.travis.yml

@@ -8,6 +8,10 @@ env:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install libc6:i386 libgcc1:i386 libstdc++6:i386 -qq
+  - sudo apt-get install python -qq
+  - sudo apt-get install python-pip -qq
+  - sudo pip install PyYaml -q
+  - sudo pip install beautifulsoup4 -q
 
 install:
   - curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip
@@ -22,3 +26,4 @@ script:
   - (! find nano/templates/ -type f -exec md5sum {} + | sort | uniq -D -w 32 | grep nano)
   - (  md5sum -c - <<< "0af969f671fba6cf9696c78cd175a14a *baystation12.int")
   - DreamMaker baystation12.dme
+  - python tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs

baystation12.dme

@@ -1497,6 +1497,7 @@
 #include "code\modules\reagents\dispenser\_defines.dm"
 #include "code\modules\reagents\dispenser\cartridge.dm"
 #include "code\modules\reagents\dispenser\cartridge_presets.dm"
+#include "code\modules\reagents\dispenser\cartridge_spawn.dm"
 #include "code\modules\reagents\dispenser\dispenser2.dm"
 #include "code\modules\reagents\dispenser\dispenser_presets.dm"
 #include "code\modules\reagents\dispenser\supply.dm"

code/modules/admin/admin.dm

@@ -997,18 +997,18 @@ var/global/floorIsLava = 0
 
 	return 0
 
-/datum/admins/proc/spawn_fruit()
+/datum/admins/proc/spawn_fruit(seedtype in plant_controller.seeds)
 	set category = "Debug"
 	set desc = "Spawn the product of a seed."
 	set name = "Spawn Fruit"
 
 	if(!check_rights(R_SPAWN))	return
 
-	var/seedtype = input("Select a seed type", "Spawn Fruit") as null|anything in plant_controller.seeds
 	if(!seedtype || !plant_controller.seeds[seedtype])
 		return
 	var/datum/seed/S = plant_controller.seeds[seedtype]
 	S.harvest(usr,0,0,1)
+	log_admin("[key_name(usr)] spawned [seedtype] fruit at ([usr.x],[usr.y],[usr.z])")
 
 /datum/admins/proc/spawn_custom_item()
 	set category = "Debug"
@@ -1050,17 +1050,17 @@ var/global/floorIsLava = 0
 		for(var/datum/custom_item/item in current_items)
 			usr << "- name: [item.name] icon: [item.item_icon] path: [item.item_path] desc: [item.item_desc]"
 
-/datum/admins/proc/spawn_plant()
+/datum/admins/proc/spawn_plant(seedtype in plant_controller.seeds)
 	set category = "Debug"
 	set desc = "Spawn a spreading plant effect."
 	set name = "Spawn Plant"
 
 	if(!check_rights(R_SPAWN))	return
 
-	var/seedtype = input("Select a seed type", "Spawn Plant") as null|anything in plant_controller.seeds
 	if(!seedtype || !plant_controller.seeds[seedtype])
 		return
 	new /obj/effect/plant(get_turf(usr), plant_controller.seeds[seedtype])
+	log_admin("[key_name(usr)] spawned [seedtype] vines at ([usr.x],[usr.y],[usr.z])")
 
 /datum/admins/proc/spawn_atom(var/object as text)
 	set category = "Debug"

code/modules/admin/admin_verbs.dm

@@ -123,7 +123,8 @@ var/list/admin_verbs_spawn = list(
 	/client/proc/FireLaser,
 	/client/proc/FireCannons,
 	/client/proc/ChangeIcarusPosition,
-	/client/proc/virus2_editor
+	/client/proc/virus2_editor,
+	/client/proc/spawn_chemdisp_cartridge
 	)
 var/list/admin_verbs_server = list(
 	/client/proc/Set_Holiday,

code/modules/admin/verbs/adminpm.dm

@@ -108,6 +108,7 @@
 		C << 'sound/effects/adminhelp.ogg'
 
 	log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
+	send2adminirc("Reply: [key_name(src)]->[key_name(C)]: [html_decode(msg)]")
 
 	//we don't use message_admins here because the sender/receiver might get it too
 	for(var/client/X in admins)

code/modules/reagents/dispenser/cartridge.dm

@@ -30,19 +30,23 @@
 	if(!is_open_container())
 		user << "The cap is sealed."
 
-/obj/item/weapon/reagent_containers/chem_disp_cartridge/verb/setLabel(L as text)
+/obj/item/weapon/reagent_containers/chem_disp_cartridge/verb/verb_set_label(L as text)
 	set name = "Set Cartridge Label"
 	set category = "Object"
 	set src in view(usr, 1)
+
+	setLabel(L, usr)
+
+/obj/item/weapon/reagent_containers/chem_disp_cartridge/proc/setLabel(L, mob/user = null)
 	if(L)
-		if(usr)
-			usr << "<span class='notice'>You set the label on \the [src] to '[L]'.</span>"
+		if(user)
+			user << "<span class='notice'>You set the label on \the [src] to '[L]'.</span>"
 
 		label = L
 		name = "[initial(name)] - '[L]'"
 	else
-		if(usr)
-			usr << "<span class='notice'>You clear the label on \the [src].</span>"
+		if(user)
+			user << "<span class='notice'>You clear the label on \the [src].</span>"
 		label = ""
 		name = initial(name)
 
@@ -87,4 +91,4 @@
 		user << "<span class='notice'>You transfer [trans] units of the solution to \the [target].</span>"
 
 	else
-		return ..()
+		return ..()

code/modules/reagents/dispenser/cartridge_spawn.dm

@@ -0,0 +1,13 @@
+/client/proc/spawn_chemdisp_cartridge(size in list("small", "medium", "large"), reagent in chemical_reagents_list)
+	set name = "Spawn Chemical Dispenser Cartridge"
+	set category = "Admin"
+
+	var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C
+	switch(size)
+		if("small") C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge/small(usr.loc)
+		if("medium") C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge/medium(usr.loc)
+		if("large") C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge(usr.loc)
+	C.reagents.add_reagent(reagent, C.volume)
+	var/datum/reagent/R = chemical_reagents_list[reagent]
+	C.setLabel(R.name)
+	log_admin("[key_name(usr)] spawned a [size] reagent container containing [reagent] at ([usr.x],[usr.y],[usr.z])")

code/modules/reagents/reagent_containers/hypospray.dm

@@ -14,10 +14,10 @@
 	flags = OPENCONTAINER
 	slot_flags = SLOT_BELT
 
-/obj/item/weapon/reagent_containers/hypospray/New() //comment this to make hypos start off empty
-	..()
-	reagents.add_reagent("tricordrazine", 30)
-	return
+///obj/item/weapon/reagent_containers/hypospray/New() //comment this to make hypos start off empty
+//	..()
+//	reagents.add_reagent("tricordrazine", 30)
+//	return
 
 /obj/item/weapon/reagent_containers/hypospray/attack(mob/living/M as mob, mob/user as mob)
 	if(!reagents.total_volume)
@@ -57,7 +57,6 @@
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/New()
 	..()
-	reagents.remove_reagent("tricordrazine", 30)
 	reagents.add_reagent("inaprovaline", 5)
 	update_icon()
 	return

html/changelog.html

@@ -57,6 +57,7 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">01 June 2015</h2>
+			<h2 class="date">02 June 2015</h2>
 			<h3 class="author">Techhead updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Re-adds extended capacity emergency oxygen tanks to relevant jobs.</li>

html/changelogs/.all_changelog.yml

@@ -1933,3 +1933,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2015-06-01:
   Techhead:
   - rscadd: Re-adds extended capacity emergency oxygen tanks to relevant jobs.
+2015-06-02:
+  Techhead:
+  - rscadd: Re-adds extended capacity emergency oxygen tanks to relevant jobs.

html/changelogs/Yoshax-emptypls.xml

@@ -0,0 +1,5 @@
+author: Yoshax
+delete-after: True
+
+changes: 
+  - tweak: "Makes hyposprays start empty instead of filled with Tricord."

tools/GenerateChangelog/ss13_genchangelog.py

@@ -53,9 +53,9 @@ validPrefixes = [
     'rscadd',
     'imageadd',
     'imagedel',
+    'maptweak',
     'spellcheck',
-    'experiment',
-    'tgs'
+    'experiment'
 ]
 
 def dictToTuples(inp):