Nuke Ops and Traitor Update+Balance

This commit is contained in:
Fox-McCloud
2015-09-08 19:38:30 -04:00
parent 8ced3a447f
commit 1c6c733a52
12 changed files with 172 additions and 131 deletions
+2 -2
View File
@@ -353,7 +353,7 @@
user << "<span class='notice'>You switch your helmet to combat mode. You will take damage in zero pressure environments, but you are more suited for a fight.</span>"
name = "blood-red hardsuit helmet (combat)"
desc = "A dual-mode advanced helmet designed for work in special operations. It is in combat mode. Property of Gorlex Marauders."
flags = BLOCKHAIR
flags = BLOCKHAIR | THICKMATERIAL
flags_inv = HIDEEARS
cold_protection = null
set_light(0)
@@ -393,7 +393,7 @@
name = "blood-red hardsuit helmet (combat)"
desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in combat mode. Property of Gorlex Marauders."
slowdown = 0
flags = BLOCKHAIR
flags = THICKMATERIAL
flags_inv = null
cold_protection = null
@@ -188,9 +188,9 @@
icon_state = "[initial(icon_state)]-[round(ammo_count(),10)]"
/obj/item/ammo_box/magazine/m12g
name = "shotgun magazine (12g buckshot)"
name = "shotgun magazine (12g slugs)"
icon_state = "m12gb"
ammo_type = "/obj/item/ammo_casing/shotgun/buckshot"
ammo_type = "/obj/item/ammo_casing/shotgun"
origin_tech = "combat=3;syndicate=1"
caliber = "shotgun"
max_ammo = 8
@@ -199,6 +199,10 @@
..()
icon_state = "[initial(icon_state)]-[Ceiling(ammo_count(0)/8)*8]"
/obj/item/ammo_box/magazine/m12g/buckshot
name = "shotgun magazine (12g buckshot slugs)"
icon_state = "m12gb"
ammo_type = "/obj/item/ammo_casing/shotgun/buckshot"
/obj/item/ammo_box/magazine/m12g/stun
name = "shotgun magazine (12g taser slugs)"
@@ -168,7 +168,7 @@
if(target.reagents.total_volume >= target.reagents.maximum_volume)
user << "\red [target] is full."
return
var/mob/living/carbon/human/H = target
if(istype(H))
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
@@ -528,3 +528,14 @@
reagents.add_reagent("insulin", 15)
mode = SYRINGE_INJECT
update_icon()
/obj/item/weapon/reagent_containers/syringe/bioterror
name = "bioterror syringe"
desc = "Contains several paralyzing reagents."
New()
..()
reagents.add_reagent("neurotoxin", 5)
reagents.add_reagent("capulettium_plus", 5)
reagents.add_reagent("sodium_thiopental", 5)
mode = SYRINGE_INJECT
update_icon()