Merge pull request #1 from Baystation12/dev

Dev

code/_helpers/time.dm

@@ -36,9 +36,12 @@ proc/round_duration()
 
 	var/mills = world.time // 1/10 of a second, not real milliseconds but whatever
 	//var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something
-	var/mins = (mills % 36000) / 600
-	var/hours = mills / 36000
+	var/mins = round((mills % 36000) / 600)
+	var/hours = round(mills / 36000)
 
-	last_round_duration = "[round(hours)]h [round(mins)]m"
+	mins = mins < 10 ? add_zero(mins, 1) : mins
+	hours = hours < 10 ? add_zero(hours, 1) : hours
+
+	last_round_duration = "[hours]:[mins]"
 	next_duration_update = world.time + 1 MINUTES
 	return last_round_duration

code/game/jobs/job/security.dm

@@ -96,7 +96,6 @@
 	economic_modifier = 5
 	access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels)
 	minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels)
-	alt_titles = list("Forensic Technician")
 	minimal_player_age = 3
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -135,6 +134,7 @@
 	spawn_positions = 4
 	supervisors = "the head of security"
 	selection_color = "#ffeeee"
+	alt_titles = list("Junior Officer")
 	economic_modifier = 4
 	access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_morgue, access_external_airlocks)
 	minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_external_airlocks)

code/game/objects/items/weapons/material/shards.dm

@@ -62,8 +62,7 @@
 
 /obj/item/weapon/material/shard/Crossed(AM as mob|obj)
 	..()
-	
-	if(ismob(AM))
+	if(isliving(AM))
 		var/mob/M = AM
 		
 		if(M.buckled) //wheelchairs, office chairs, rollerbeds

code/modules/events/event_container.dm

@@ -160,7 +160,7 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Rogue Drones",				/datum/event/rogue_drone, 				20,		list(ASSIGNMENT_SECURITY = 20)),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust",				/datum/event/dust,	 					30, 	list(ASSIGNMENT_ENGINEER = 5)),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Spider Infestation",		/datum/event/spider_infestation, 		100,	list(ASSIGNMENT_SECURITY = 30), 1),
-		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Viral Infection",			/datum/event/viral_infection, 			0,		list(ASSIGNMENT_MEDICAL = 150)),
+		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Viral Infection",			/datum/event/viral_infection, 			0,		list(ASSIGNMENT_MEDICAL = 150), 1),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Virology Breach",			/datum/event/prison_break/virology,		0,		list(ASSIGNMENT_MEDICAL = 100)),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Xenobiology Breach",		/datum/event/prison_break/xenobiology,	0,		list(ASSIGNMENT_SCIENCE = 100)),
 	)

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

@@ -1371,7 +1371,7 @@
 		handle_regular_hud_updates()
 
 /mob/living/carbon/human/Check_Shoegrip()
-	if((shoes.item_flags & NOSLIP) && istype(shoes, /obj/item/clothing/shoes/magboots))  //magboots + dense_object = no floating
+	if(shoes && (shoes.item_flags & NOSLIP) && istype(shoes, /obj/item/clothing/shoes/magboots))  //magboots + dense_object = no floating
 		return 1
 	return 0
 

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

@@ -162,10 +162,11 @@
 /mob/living/carbon/human/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
 	switch(message_mode)
 		if("intercom")
-			for(var/obj/item/device/radio/intercom/I in view(1))
-				I.talk_into(src, message, verb, speaking)
-				I.add_fingerprint(src)
-				used_radios += I
+			if(!src.restrained())
+				for(var/obj/item/device/radio/intercom/I in view(1))
+					I.talk_into(src, message, null, verb, speaking)
+					I.add_fingerprint(src)
+					used_radios += I
 		if("headset")
 			if(l_ear && istype(l_ear,/obj/item/device/radio))
 				var/obj/item/device/radio/R = l_ear

code/modules/mob/mob.dm

@@ -649,7 +649,7 @@
 
 /mob/Stat()
 	..()
-	. = (client && client.inactivity < 1200)
+	. = (is_client_active(10 MINUTES))
 
 	if(.)
 		if(statpanel("Status") && ticker && ticker.current_state != GAME_STATE_PREGAME)

code/modules/mob/new_player/sprite_accessories.dm

@@ -398,6 +398,10 @@
 		icon_state = "hair_joestar"
 		gender = MALE
 
+	volaju
+		name = "Volaju"
+		icon_state = "hair_volaju"
+
 	bald
 		name = "Bald"
 		icon_state = "bald"
@@ -557,6 +561,10 @@
 		name = "Adam Jensen Beard"
 		icon_state = "facial_jensen"
 
+	volaju
+		name = "Volaju"
+		icon_state = "facial_volaju"
+
 	dwarf
 		name = "Dwarf Beard"
 		icon_state = "facial_dwarf"

code/modules/virus2/dishincubator.dm

@@ -128,14 +128,21 @@
 		nanomanager.update_uis(src)
 
 	if(beaker)
-		if(!beaker.reagents.remove_reagent("virusfood",5))
-			foodsupply += 10
+		if(foodsupply < 100 && beaker.reagents.remove_reagent("virusfood",5))
+			if(foodsupply + 10 <= 100)
+				foodsupply += 10
+			else
+				beaker.reagents.add_reagent("virusfood",(100 - foodsupply)/2)
+				foodsupply = 100
 			nanomanager.update_uis(src)
 
-		if (locate(/datum/reagent/toxin) in beaker.reagents.reagent_list)
+		if (locate(/datum/reagent/toxin) in beaker.reagents.reagent_list && toxins < 100)
 			for(var/datum/reagent/toxin/T in beaker.reagents.reagent_list)
 				toxins += max(T.strength,1)
 				beaker.reagents.remove_reagent(T.id,1)
+				if(toxins > 100)
+					toxins = 100
+					break
 			nanomanager.update_uis(src)
 
 /obj/machinery/disease2/incubator/Topic(href, href_list)
@@ -170,7 +177,7 @@
 		return 1
 
 	if (href_list["rad"])
-		radiation += 10
+		radiation = min(100, radiation + 10)
 		return 1
 
 	if (href_list["flush"])

config/example/motd.txt

@@ -2,4 +2,4 @@
 
 -<i>This server is running <a href="http://baystation12.net/">Baystation 12's</a> modification of the <a href="http://ss13.eu/">/tg/station13</a> SS13 code.</i>
 <br><br>
-<strong>Bugtracker:</strong> <a href="http://baystation12.net/forums/viewtopic.php?f=18&t=8185">http://baystation12.net/forums/viewtopic.php?f=18&t=8185</a>
+<strong>Bugtracker:</strong> <a href="http://baystation12.net/forums/threads/issue-tracker-report-template.110/">for posting of bugs and issues.</a>

html/changelogs/Matthew951-Volaju-hair.yml

@@ -0,0 +1,5 @@
+author: Matthew951
+delete-after: True
+changes:
+  - rscadd: "Added Vincent Volaju's hair."
+  - rscadd: "Added Vincent Volaju's beard."

nano/templates/pathogenic_isolator.tmpl

@@ -81,7 +81,7 @@
       {{if data.database}}
         {{for data.database}}
           <div class='itemContent'>
-            <div class='highlight fixedLeft'>{{:data.name}}</div>
+            <div class='highlight fixedLeft'>{{:value.name}}</div>
             {{:helper.link('Details', 'circle-arrow-s', { 'entry' : 1, 'view' : value.record }, null, 'fixedLeft')}}
           </div>
         {{/for}}