cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source
This commit is contained in:
PsiOmega
2014-12-09 09:07:38 +01:00
parent 6a8aa48cac c88cce1209
commit 924955a4c8
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/computer3/computers/camera.dm
View File

@@ -147,7 +147,7 @@
if(temp.len) if(temp.len)
L.Add(C) L.Add(C)
//camera_sort(L) camera_sort(L)
return L return L
verify_machine(var/obj/machinery/camera/C,var/datum/file/camnet_key/key = null) verify_machine(var/obj/machinery/camera/C,var/datum/file/camnet_key/key = null)

9
code/game/mecha/mecha.dm
View File

@@ -492,14 +492,17 @@
src.visible_message("The [src.name] armor deflects the projectile") src.visible_message("The [src.name] armor deflects the projectile")
src.log_append_to_last("Armor saved.") src.log_append_to_last("Armor saved.")
return return
if(Proj.damage_type == HALLOSS)
use_power(Proj.agony * 5)
if(!(Proj.nodamage))
var/ignore_threshold var/ignore_threshold
if(Proj.flag == "taser")
use_power(200)
return
if(istype(Proj, /obj/item/projectile/beam/pulse)) if(istype(Proj, /obj/item/projectile/beam/pulse))
ignore_threshold = 1 ignore_threshold = 1
src.take_damage(Proj.damage,Proj.flag) src.take_damage(Proj.damage,Proj.flag)
src.check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),ignore_threshold) src.check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),ignore_threshold)
Proj.on_hit(src) Proj.on_hit(src)
return return

7
code/modules/projectiles/projectile/force.dm
View File

@@ -8,11 +8,10 @@
/obj/item/projectile/forcebolt/strong /obj/item/projectile/forcebolt/strong
name = "force bolt" name = "force bolt"
/obj/item/projectile/forcebolt/on_hit(var/atom/target, var/blocked = 0) /obj/item/projectile/forcebolt/on_hit(var/atom/movable/target, var/blocked = 0)
if(istype(target))
var/obj/T = target
var/throwdir = get_dir(firer,target) var/throwdir = get_dir(firer,target)
T.throw_at(get_edge_target_turf(target, throwdir),10,10) target.throw_at(get_edge_target_turf(target, throwdir),10,10)
return 1 return 1
/* /*