cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Massive research refactor; changes research system to techwebs; Decentralized research

Browse Source
This commit is contained in:
kevinz000
2017-11-03 03:29:20 -07:00
committed by kevinz000
parent dabd669913
commit caa1e1f400
329 changed files with 5694 additions and 4220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/assembly/flash.dm
View File

@@ -8,7 +8,6 @@
throwforce = 0
w_class = WEIGHT_CLASS_TINY
materials = list(MAT_METAL = 300, MAT_GLASS = 300)
origin_tech = "magnets=2;combat=1"
crit_fail = 0 //Is the flash burnt out?
var/times_used = 0 //Number of times it's been used.
@@ -163,7 +162,6 @@
/obj/item/device/assembly/flash/cyborg
origin_tech = null
/obj/item/device/assembly/flash/cyborg/attack(mob/living/M, mob/user)
..()
@@ -229,7 +227,6 @@
throw_range = 3
w_class = WEIGHT_CLASS_BULKY
materials = list(MAT_GLASS=7500, MAT_METAL=1000)
origin_tech = "materials=3;combat=4"
attack_verb = list("shoved", "bashed")
block_chance = 50
armor = list(melee = 50, bullet = 50, laser = 50, energy = 0, bomb = 30, bio = 0, rad = 0, fire = 80, acid = 70)