Do not Nerf pylons, sadly, and other things (#1962)

-nerfed overall accuracy, and removed burst, of the scout rifle
-removed a fuckton of white space from nanacode
-should fix ipcs being stung by changelings at long last
This commit is contained in:
Alberyk
2017-03-22 15:14:45 -03:00
committed by skull132
parent 019aa3a406
commit 670adb46a2
8 changed files with 12 additions and 168 deletions
+2
View File
@@ -32,6 +32,8 @@ var/datum/antagonist/cultist/cult
initial_spawn_req = 4
initial_spawn_target = 6
antaghud_indicator = "hudcultist"
faction = "cult"
var/allow_narsie = 1
var/datum/mind/sacrifice_target
@@ -686,6 +686,9 @@ var/list/datum/absorbed_dna/hivemind_bank = list()
if(!(T in view(changeling.sting_range))) return
if(!sting_can_reach(T, changeling.sting_range)) return
if(!changeling_power(required_chems)) return
if(T.isSynthetic())
src << "<span class='warning'>[T] is not compatible with our biology.</span>"
return
changeling.chem_charges -= required_chems
changeling.sting_range = 1
+2 -14
View File
@@ -17,19 +17,6 @@
desc = "A forge used in crafting the unholy weapons used by the armies of Nar-Sie"
icon_state = "forge"
/*
Cult pylons can be used as arcane defensive turrets.
@@ -58,6 +45,7 @@
Explosives
Ablative armour
*/
/obj/structure/cult/pylon
name = "Pylon"
desc = "A floating crystal that hums with an unearthly energy"
@@ -693,4 +681,4 @@
/obj/effect/testtrans/New()
..()
spawn(10)
qdel(src)
qdel(src)
-149
View File
@@ -1002,55 +1002,6 @@ var/list/global/random_stock_large = list(
var/type = pick(paints)
new type(L)
//Uncommon items below here
//=============================================================
//=============================================================
@@ -1442,53 +1393,6 @@ var/list/global/random_stock_large = list(
new /obj/random/coin(L)
//Rare items below here:
//=============================================================
//=============================================================
@@ -1632,59 +1536,6 @@ var/list/global/random_stock_large = list(
new type(L)
//Large items go below here
//=============================================================
//=============================================================
+1 -1
View File
@@ -244,7 +244,7 @@
item_state = "bigsunglasses"
/obj/item/clothing/glasses/sunglasses/sechud
name = "HUDSunglasses"
name = "HUDsunglasses"
desc = "Sunglasses with a HUD."
icon_state = "sunhud"
@@ -126,7 +126,7 @@
//ghetto handgun, sprites by datberry
/obj/item/weapon/gun/projectile/improvised_handgun
name = "\improper improvised handgun"
name = "improvised handgun"
desc = "A common sight in an amateur's workshop, a simple yet effective assembly made to chamber and fire .45 Rounds."
max_shells = 7
recoil = 2
@@ -15,7 +15,7 @@
ammo_type = /obj/item/ammo_casing/a556/ap
magazine_type = /obj/item/ammo_magazine/a556/ap
allowed_magazines = list(/obj/item/ammo_magazine/a556, /obj/item/ammo_magazine/a556/ap)
accuracy = -2
accuracy = -4
scoped_accuracy = 3
recoil_wielded = 2
accuracy_wielded = 0
@@ -1170,7 +1170,7 @@
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/muffin
name = "Muffin"
name = "muffin"
desc = "A delicious and spongy little cake"
icon_state = "muffin"
filling_color = "#E0CF9B"
@@ -2328,7 +2328,7 @@
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/carrotfries
name = "Carrot Fries"
name = "carrot fries"
desc = "Tasty fries from fresh Carrots."
icon_state = "carrotfries"
trash = /obj/item/trash/plate