cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 05:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7332 from Segrain/master

Browse Source 
Bugfixes.
This commit is contained in:
PsiOmegaDelta
2014-12-09 08:51:04 +01:00
parent a817ef8953 4b7b910311
commit c88cce1209
3 changed files with 26 additions and 24 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)

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

@@ -506,14 +506,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
var/ignore_threshold
if(Proj.flag == "taser") if(Proj.damage_type == HALLOSS)
use_power(200) use_power(Proj.agony * 5)
return
if(istype(Proj, /obj/item/projectile/beam/pulse)) if(!(Proj.nodamage))
ignore_threshold = 1 var/ignore_threshold
src.take_damage(Proj.damage,Proj.flag) if(istype(Proj, /obj/item/projectile/beam/pulse))
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) ignore_threshold = 1
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)
Proj.on_hit(src) Proj.on_hit(src)
return return
@@ -1406,11 +1409,11 @@
/obj/mecha/proc/output_maintenance_dialog(obj/item/weapon/card/id/id_card,mob/user) /obj/mecha/proc/output_maintenance_dialog(obj/item/weapon/card/id/id_card,mob/user)
if(!id_card || !user) return if(!id_card || !user) return
var/maint_options = "<a href='?src=\ref[src];set_internal_tank_valve=1;user=\ref[user]'>Set Cabin Air Pressure</a>" var/maint_options = "<a href='?src=\ref[src];set_internal_tank_valve=1;user=\ref[user]'>Set Cabin Air Pressure</a>"
if (locate(/obj/item/mecha_parts/mecha_equipment/tool/passenger) in contents) if (locate(/obj/item/mecha_parts/mecha_equipment/tool/passenger) in contents)
maint_options += "<a href='?src=\ref[src];remove_passenger=1;user=\ref[user]'>Remove Passenger</a>" maint_options += "<a href='?src=\ref[src];remove_passenger=1;user=\ref[user]'>Remove Passenger</a>"
var/output = {"<html> var/output = {"<html>
<head> <head>
<style> <style>
@@ -1568,23 +1571,23 @@
for (var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P in contents) for (var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P in contents)
if (P.occupant) if (P.occupant)
passengers["[P.occupant]"] = P passengers["[P.occupant]"] = P
if (!passengers) if (!passengers)
user << "\red There are no passengers to remove." user << "\red There are no passengers to remove."
return return
var/pname = input(user, "Choose a passenger to forcibly remove.", "Forcibly Remove Passenger") as null|anything in passengers var/pname = input(user, "Choose a passenger to forcibly remove.", "Forcibly Remove Passenger") as null|anything in passengers
if (!pname) if (!pname)
return return
var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P = passengers[pname] var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P = passengers[pname]
var/mob/occupant = P.occupant var/mob/occupant = P.occupant
user.visible_message("\red [user] begins opening the hatch on \the [P]...", "\red You begin opening the hatch on \the [P]...") user.visible_message("\red [user] begins opening the hatch on \the [P]...", "\red You begin opening the hatch on \the [P]...")
if (!do_after(user, 40, needhand=0)) if (!do_after(user, 40, needhand=0))
return return
user.visible_message("\red [user] opens the hatch on \the [P] and removes [occupant]!", "\red You open the hatch on \the [P] and remove [occupant]!") user.visible_message("\red [user] opens the hatch on \the [P] and removes [occupant]!", "\red You open the hatch on \the [P] and remove [occupant]!")
P.go_out() P.go_out()
P.log_message("[occupant] was removed.") P.log_message("[occupant] was removed.")

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

@@ -8,12 +8,11 @@
/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) target.throw_at(get_edge_target_turf(target, throwdir),10,10)
T.throw_at(get_edge_target_turf(target, throwdir),10,10) return 1
return 1
/* /*
/obj/item/projectile/forcebolt/strong/on_hit(var/atom/target, var/blocked = 0) /obj/item/projectile/forcebolt/strong/on_hit(var/atom/target, var/blocked = 0)