Bugfixes:

- Laser cannons / Heavy laser cannons should now not be all mixed up.
     - Fixed a bug where the station heads and security crew could be revolutionaries and cultists on game start.
     - If you somehow drop the "Off Hand" that appears if you equip a fire axe, it will be deleted. No more silly "Off Hand" items lying around the station, yay!
     - If you threw a fire axe when it was wielded, it would would stay wieled.
     - Metroids should now, theoretically, not be able to phase through thin windows and glass doors. There's probably still going to be some Metroids phasing through thin glass doors if the right circumstances are met (BYOND pathfinding problem, will eventually migrate Metroid pathfinding to SS13's A* system.
     - Fixed up some of Firecage's half-assed sprites. The decloner projectile in specific.



Misc:
     - Portable turrets can now be equipped with EVERY (except the "plasma gun" because it's stupid anyway) energy gun possible. I want to see laser cannons turrets, emagged energy crossbow turrets, and shock revolver turrets, people!
     - The decloner is no longer called "decloner" because that term really doesn't make any sense anyway. Does it imply that everyone in existence is actually a clone? While that does sound kind of cool, it's actually pretty stupid, so I changed the name but kept the path type "/obj/item/weapon/gun/energy/decloner".

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1936 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
2011-07-26 22:59:37 +00:00
parent f62e9956aa
commit bce6042fb7
11 changed files with 178 additions and 17 deletions
+15 -1
View File
@@ -13,7 +13,21 @@
return
/obj/item/proc/dropped(mob/user as mob)
return
..()
// So you can't drop the Offhand
if(istype(src, /obj/item/weapon/offhand))
user.drop_item(src)
var/obj/item/O_r = user.r_hand
var/obj/item/O_l = user.l_hand
if(O_r.twohanded)
if(O_r.wielded)
user.drop_item(O_r)
if(O_l.twohanded)
if(O_l.wielded)
user.drop_item(O_l)
del(src)
// called just as an item is picked up (loc is not yet changed)
/obj/item/proc/pickup(mob/user)
+14 -8
View File
@@ -101,12 +101,14 @@
icon_state = "heavylaser"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
damage = 60
mobdamage = list(BRUTE = 0, BURN = 60, TOX = 0, OXY = 0, CLONE = 0)
mobdamage = list(BRUTE = 10, BURN = 60, TOX = 0, OXY = 0, CLONE = 0)
flag = "laser"
New()
..()
effects["eyeblur"] = 20
effectprob["eyeblur"] = 100
effects["weak"] = 5
effectprob["weak"] = 15
fireball
name = "shock"
@@ -127,8 +129,12 @@
icon_state = "declone"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
damage = 0
mobdamage = list(BRUTE = 0, BURN = 0, TOX = 0, OXY = 0, CLONE = 70)
mobdamage = list(BRUTE = 0, BURN = 0, TOX = 0, OXY = 0, CLONE = 40)
flag = "bio"
New()
..()
effects["radiation"] = 70
effectmod["radiation"] = ADD
dart
name = "dart"
@@ -1041,9 +1047,9 @@
return 0
switch(mode)
if(0)
in_chamber = new /obj/item/projectile/beam(src)
if(1)
in_chamber = new /obj/item/projectile/heavylaser(src)
if(1)
in_chamber = new /obj/item/projectile/beam(src)
power_supply.use(charge_cost)
return 1
@@ -1076,9 +1082,9 @@
return 0
switch(mode)
if(0)
in_chamber = new /obj/item/projectile/beam(src)
if(1)
in_chamber = new /obj/item/projectile/heavylaser(src)
if(1)
in_chamber = new /obj/item/projectile/beam(src)
power_supply.use(charge_cost)
return 1
@@ -1123,8 +1129,8 @@
power_supply.give(power_supply.maxcharge)
decloner
name = "decloner"
desc = "A high tech energy weapon that declones a target."
name = "biological demolecularisor"
desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements."
icon_state = "decloner"
fire_sound = 'pulse3.ogg'
origin_tech = "combat=5;materials=4;powerstorage=3"