Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/game/jobs/job/civilian.dm

@@ -65,7 +65,7 @@
 	flag = BOTANIST
 	department_flag = CIVILIAN
 	faction = "Station"
-	total_positions = 2
+	total_positions = 3
 	spawn_positions = 2
 	supervisors = "the head of personnel"
 	selection_color = "#dddddd"

code/game/jobs/job/engineering.dm

@@ -76,7 +76,7 @@
 	flag = ATMOSTECH
 	department_flag = ENGSEC
 	faction = "Station"
-	total_positions = 2
+	total_positions = 3
 	spawn_positions = 2
 	supervisors = "the chief engineer"
 	selection_color = "#fff5cc"
@@ -106,7 +106,7 @@
 	flag = ROBOTICIST
 	department_flag = ENGSEC
 	faction = "Station"
-	total_positions = 1
+	total_positions = 2
 	spawn_positions = 1
 	supervisors = "the chief engineer and research director"
 	selection_color = "#fff5cc"

code/game/jobs/job/medical.dm

@@ -76,8 +76,8 @@
 	flag = CHEMIST
 	department_flag = MEDSCI
 	faction = "Station"
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 2
+	spawn_positions = 2
 	supervisors = "the chief medical officer"
 	selection_color = "#ffeef0"
 
@@ -101,8 +101,8 @@
 	flag = GENETICIST
 	department_flag = MEDSCI
 	faction = "Station"
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 2
+	spawn_positions = 2
 	supervisors = "the chief medical officer and research director"
 	selection_color = "#ffeef0"
 

code/game/player/admin_report.dm

@@ -96,7 +96,7 @@ client/proc/display_admin_reports()
 			output += "<b>Offense:</b>[N.body]<br>"
 			output += "<small>Occured at [time2text(N.date,"MM/DD hh:mm:ss")]</small><br>"
 			output += "<small>authored by <i>[N.author]</i></small><br>"
-			output += " <a href='?src=\ref[report_topic_handler];client=\ref[src];action=done;ID=[N.ID]'>Flag as Handled</a>"
+			output += " <a href='?src=\ref[report_topic_handler];client=\ref[src];action=remove;ID=[N.ID]'>Flag as Handled</a>"
 			if(src.key == N.author)
 				output += " <a href='?src=\ref[report_topic_handler];client=\ref[src];action=edit;ID=[N.ID]'>Edit</a>"
 			output += "<br>"

code/modules/customitems/item_defines.dm

@@ -158,6 +158,7 @@
 		new /obj/item/weapon/reagent_containers/pill/fluff/listermed( src )
 		new /obj/item/weapon/reagent_containers/pill/fluff/listermed( src )
 		new /obj/item/weapon/reagent_containers/pill/fluff/listermed( src )
+
 /obj/item/weapon/reagent_containers/pill/fluff/listermed
 	name = "anti-depressant pill"
 	desc = "Used to deal with depression."
@@ -167,6 +168,18 @@
 		reagents.add_reagent("stoxin", 5)
 		reagents.add_reagent("sugar", 10)
 		reagents.add_reagent("ethanol", 5)
+
+/obj/item/clothing/mask/fluff/electriccig //CubeJackal: Barry Sharke
+	name = "Electronic cigarette"
+	desc = "An electronic cigarette. Most of the relief of a real cigarette with none of the side effects. Often used by smokers who are trying to quit the habit."
+	icon = 'custom_items.dmi'
+	icon_state = "cigon"
+	throw_speed = 0.5
+	item_state = "ciglit"
+	w_class = 1
+	body_parts_covered = null
+	flags = FPRINT|TABLEPASS
+
 //////////////////////////////////
 //////////// Clothing ////////////
 //////////////////////////////////
@@ -261,6 +274,12 @@
 	item_state = "leatherjack"
 	color = "leatherjack"
 
+/obj/item/clothing/suit/storage/labcoat/fluff/burnt //Jamini: Edwin Atweeke
+	name = "burnt labcoat"
+	desc = "This lab coat has clearly seen better, less burnt, days."
+	icon = 'custom_items.dmi'
+	icon_state = "labcoat_burnt_open"
+
 //////////// Uniforms ////////////
 
 /obj/item/clothing/under/fluff/jumpsuitdown //searif: Yuki Matsuda

config/admins.txt

@@ -24,4 +24,4 @@ spaceman96 - Admin Observer
 strumpetplaya - Retired Admin
 tastyfish - Game Master
 uristqwerty - Game Master
-wrongnumber - Retired Admin
+wrongnumber - Game Admin

config/alienwhitelist.txt

@@ -1,4 +1,5 @@
 botanistpower - Tajaran
+bowlsoldier - Tajaran
 bluefishie - Skrell
 deciusreln - Skrell
 densane - Skrell

config/custom_items.txt

@@ -38,4 +38,6 @@ themij: Taryn Kifer: /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kif
 tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
 vinceluk: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/graycoat
 whitellama: Ethan Way: /obj/item/fluff/ethan_way_1
-whitewolf41: Jeremy Wolf: /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1
+whitewolf41: Jeremy Wolf: /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1
+jamini: Edwin Atweeke: /obj/item/clothing/suit/storage/labcoat/fluff/burnt
+cubejackal: Barry Sharke: /obj/item/clothing/mask/fluff/electriccig

config/moderators.txt

@@ -5,4 +5,7 @@ dakonic
 themij
 sparklysheep
 botanistpower
-asanadas
+asanadas
+deusdactyl
+densane
+bowlsoldier

html/changelog.html

@@ -57,6 +57,14 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<div class="commit sansserif">
+	<h2 class="date">29 June 2012</h2>
+	<h3 class="author">Erthilo updated:</h3>
+	<ul class="changes bgimages16">
+			<li class="tweak">Raises job limits for Botanists, Atmospheric Technicnians, Roboticists, Chemists, and Geneticists.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">27 June 2012</h2>
 	<h3 class="author">Erthilo updated:</h3>