some final touch ups

This commit is contained in:
zerothebigboy
2021-02-10 14:22:04 -05:00
parent e530e8d103
commit 87eb447c10
9 changed files with 6 additions and 4 deletions
+1
View File
@@ -8,6 +8,7 @@
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
ambientsounds = RUINS
sound_environment = SOUND_ENVIRONMENT_STONEROOM
valid_territory = FALSE // hey so what if we did not allow things like cult summons to appear on ruins
/area/ruin/unpowered
+1 -1
View File
@@ -612,7 +612,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
name = "shock throwing star"
desc = "An aerodynamic disc designed to cause excruciating pain when stuck inside fleeing targets, hopefully without causing fatal harm."
throwforce = 5
embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 0, "jostle_chance" = 10, "pain_stam_pct" = 5, "jostle_pain_mult" = 3)
embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 0, "jostle_chance" = 10, "pain_stam_pct" = 0.8, "jostle_pain_mult" = 3)
/obj/item/throwing_star/toy
name = "toy throwing star"
+1 -1
View File
@@ -23,9 +23,9 @@
w_class = WEIGHT_CLASS_NORMAL
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 50
slot_flags = ITEM_SLOT_BELT
sharpness = SHARP_EDGED
obj_flags = UNIQUE_RENAME // here is a shitpost and i cannot wait for ninjas naming their sword very rude things
max_integrity = 200
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
var/datum/effect_system/spark_spread/spark_system
@@ -18,4 +18,4 @@
var/mob/living/carbon/human/H = affecting
playsound(H.loc, 'sound/effects/empulse.ogg', 60, 2)
empulse(H, 4, 6) //Procs sure are nice. Slightly weaker than wizard's disable tch.
s_coold = 4
//s_coold = 4 commented out until someone figures out why the fuck cooldowns don't work after porting from tg
@@ -41,3 +41,4 @@
/obj/item/throwing_star/stamina/ninja
name = "ninja throwing star"
throwforce = 10
embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 10, "jostle_chance" = 10, "pain_stam_pct" = 2.5, "jostle_pain_mult" = 3)
+1 -1
View File
@@ -118,7 +118,7 @@
. = ..()
if(stealth)
cancel_stealth()
s_coold = 5
//s_coold = 5 commented out until someone figures out why the fuck cooldowns don't work after porting from tg
/**
* Proc called to lock the important gear pieces onto space ninja's body.