From a4c72d4603b3df106bc3ebb3dd4d08c50ccdd128 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 28 Nov 2014 19:13:41 -0500 Subject: [PATCH] Species and Guns --- code/game/machinery/autolathe.dm | 1 - code/game/objects/items/weapons/RCD.dm | 6 +++--- code/modules/mob/living/carbon/species.dm | 6 ++---- code/modules/projectiles/ammunition/bullets.dm | 12 +++++------- code/modules/projectiles/projectile/beams.dm | 1 + code/modules/projectiles/projectile/bullets.dm | 16 +++++++++++----- code/modules/projectiles/projectile/energy.dm | 13 +++---------- code/modules/virus2/disease2.dm | 1 - 8 files changed, 25 insertions(+), 31 deletions(-) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 103ec0d7d0d..cb9e2d89985 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -45,7 +45,6 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/camera_assembly(), \ new /obj/item/weapon/rcd_ammo(), \ new /obj/item/ammo_casing/shotgun/beanbag(), \ - new /obj/item/weapon/storage/box/blanks(), \ new /obj/item/ammo_box/c38(), \ new /obj/item/clothing/ears/earmuffs/tribblemuffs(), \ new /obj/item/clothing/gloves/furgloves(), \ diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 738a88baed1..82ee98f5f51 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -18,7 +18,7 @@ RCD throw_speed = 1 throw_range = 5 w_class = 3.0 - m_amt = 50000 + m_amt = 30000 origin_tech = "engineering=4;materials=2" var/datum/effect/effect/system/spark_spread/spark_system var/matter = 0 @@ -196,5 +196,5 @@ RCD density = 0 anchored = 0.0 origin_tech = "materials=2" - m_amt = 30000 - g_amt = 15000 \ No newline at end of file + m_amt = 16000 + g_amt = 8000 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index f8a7442b7f9..a2a40b65997 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/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) diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 5a2c8217cbf..9e17b9639d2 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/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" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 289d35fcdd1..327671a928b 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -52,6 +52,7 @@ name = "emitter beam" icon_state = "emitter" damage = 30 + /obj/item/projectile/lasertag name = "laser tag beam" icon_state = "omnilaser" diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 275fa04646d..8d494e15010 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/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 diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index a50f6b4ccdf..15e8b3af1fa 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/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" diff --git a/code/modules/virus2/disease2.dm b/code/modules/virus2/disease2.dm index 7281163dc5b..904b9a4227f 100644 --- a/code/modules/virus2/disease2.dm +++ b/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)