Merge branch 'master' of https://github.com/Markolie/Paradise

code/modules/library/lib_machines.dm

@@ -355,10 +355,10 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 		establish_old_db_connection()
 		if(!dbcon_old.IsConnected())
 			alert("Connection to Archive has been severed. Aborting.")
-		if(bibledelay)
-			for (var/mob/V in hearers(src))
-				V.show_message("<b>[src]</b>'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
-		else
+		
+// reused working printing call from bible code.. needs testing ((Lazureus))
+		
+		if(!bibledelay)
 			bibledelay = 1
 			spawn(60)
 				bibledelay = 0
@@ -377,6 +377,10 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 				B.icon_state = "book[rand(1,7)]"
 				src.visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?")
 				break
+		else
+			for (var/mob/V in hearers(src))
+				V.show_message("<b>[src]</b>'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
+
 	if(href_list["orderbyid"])
 		var/orderid = input("Enter your order:") as num|null
 		if(orderid)
@@ -485,4 +489,4 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			if(!query.Execute())
 				usr << query.ErrorMsg()
 			dbcon.Disconnect()
-	log_admin("[usr.key] has deleted the book [isbn]")
+	log_admin("[usr.key] has deleted the book [isbn]")

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

@@ -378,11 +378,11 @@
 			i++
 			newname += pick(vox_name_syllables)
 		return capitalize(newname)
-
+/*
 /datum/species/vox/handle_post_spawn(var/mob/living/carbon/human/H)
 
 	H.verbs += /mob/living/carbon/human/proc/leap
-	..()
+	..() */
 
 /datum/species/vox/armalis/handle_post_spawn(var/mob/living/carbon/human/H)
 
@@ -473,8 +473,6 @@
 
 	flags = IS_WHITELISTED | NO_BREATHE | HAS_LIPS | NO_INTORGANS | NO_SCAN
 	bloodflags = BLOOD_SLIME
-	bodyflags = FEET_NOSLIP
-	abilities = list(/mob/living/carbon/human/slime/proc/slimepeople_ventcrawl)
 
 /datum/species/slime/handle_post_spawn(var/mob/living/carbon/human/H)
 	H.dna = new /datum/dna(null)

code/modules/projectiles/ammunition/bullets.dm

@@ -29,7 +29,7 @@
 /obj/item/ammo_casing/c38
 	desc = "A .38 bullet casing."
 	caliber = "38"
-	projectile_type = "/obj/item/projectile/bullet/rubberbullet"
+	projectile_type = "/obj/item/projectile/bullet/c38"
 
 
 /obj/item/ammo_casing/c9mm
@@ -60,7 +60,7 @@
 	icon_state = "slshell"
 	caliber = "shotgun"
 	projectile_type = "/obj/item/projectile/bullet/slug"
-	m_amt = 12500
+	m_amt = 4000
 
 /obj/item/ammo_casing/shotgun/buck
 	name = "buckshot shell"
@@ -85,28 +85,26 @@
 	desc = "A weak beanbag shell."
 	icon_state = "bshell"
 	projectile_type = "/obj/item/projectile/bullet/rubberbullet"
-	m_amt = 500
+	m_amt = 250
 
 /obj/item/ammo_casing/shotgun/fakebeanbag
 	name = "beanbag shell"
 	desc = "A weak beanbag shell."
 	icon_state = "bshell"
-	projectile_type = "/obj/item/projectile/bullet/rubberbullet/booze"
-	m_amt = 12500
+	projectile_type = "/obj/item/projectile/bullet/weakbullet/booze"
 
 /obj/item/ammo_casing/shotgun/stunshell
 	name = "stun shell"
 	desc = "A stunning shell."
 	icon_state = "stunshell"
 	projectile_type = "/obj/item/projectile/bullet/stunslug"
-	m_amt = 2500
+	m_amt = 250
 
 /obj/item/ammo_casing/shotgun/incendiary
 	name = "incendiary shell"
 	desc = "An incendiary shell"
 	icon_state = "ishell"
 	projectile_type = "/obj/item/projectile/bullet/incendiary/shell"
-	m_amt = 12500
 
 /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
 	name = "dragonsbreath shell"

code/modules/projectiles/projectile/beams.dm

@@ -60,6 +60,7 @@
 	name = "emitter beam"
 	icon_state = "emitter"
 	damage = 30
+
 /obj/item/projectile/lasertag
 	name = "laser tag beam"
 	icon_state = "omnilaser"

code/modules/projectiles/projectile/bullets.dm

@@ -24,11 +24,17 @@
 	name = "slug"
 
 
-/obj/item/projectile/bullet/rubberbullet  //  Bone White - Rubber bullets cause agony (halloss) instead of stun = 5, weakened = 5
-	damage = 10
-	stun = 0
-	weaken = 0
-	agony = 60
+/obj/item/projectile/bullet/rubberbullet  //  Back to insta-stun bullets.
+	damage = 5
+	stun = 5
+	weaken = 5
+	embed = 0
+	sharp = 0
+
+/obj/item/projectile/bullet/c38 //replacement for detective's ammo
+	damage = 15
+	stun = 5
+	weaken = 5
 	embed = 0
 	sharp = 0
 

code/modules/projectiles/projectile/energy.dm

@@ -25,7 +25,7 @@
 			var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread
 			sparks.set_up(1, 1, src)
 			sparks.start()
-
+		..()
 
 /obj/item/projectile/energy/electrode/revolver
 	name = "electrode"
@@ -61,20 +61,13 @@
 	damage = 10
 	damage_type = TOX
 	nodamage = 0
-	weaken = 10
-	stutter = 10
-
+	weaken = 5
+	stutter = 5
 
 /obj/item/projectile/energy/bolt/large
 	name = "largebolt"
 	damage = 20
 
-
-
-
-
-
-
 /obj/item/projectile/energy/plasma
 	name = "plasma bolt"
 	icon_state = "energy"

code/modules/virus2/disease2.dm

@@ -145,7 +145,6 @@
 	disease.antigen   = antigen
 	disease.uniqueID = uniqueID
 	disease.speed = speed
-	disease.stage = stage
 	disease.clicks = clicks
 	disease.affected_species = affected_species.Copy()
 	for(var/datum/disease2/effectholder/holder in effects)