cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 22:12:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Examine Crashes (#17430)

Browse Source 
* Fixes Examine Crashes

* fukken indentations
This commit is contained in:
Wowzewow (Wezzy)
2023-09-27 10:22:04 +00:00
committed by GitHub
parent 725d999680
commit fd26ff32e2
32 changed files with 147 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/implants/implants/circuit.dm
+1 -1
View File
@@ -37,7 +37,7 @@
IC.emp_act(severity)
/obj/item/implant/integrated_circuit/examine(mob/user, distance, is_adjacent)
IC.examine(user, distance, is_adjacent)
return IC.examine(user, distance, is_adjacent)
/obj/item/implant/integrated_circuit/attackby(var/obj/item/O, var/mob/user)
if(O.iscrowbar() || istype(O, /obj/item/device/integrated_electronics) || istype(O, /obj/item/integrated_circuit) || O.isscrewdriver() || istype(O, /obj/item/cell/device) )
code/game/objects/items/weapons/tanks/jetpack.dm
+1 -1
View File
@@ -189,7 +189,7 @@
/obj/item/tank/jetpack/rig/examine()
to_chat(usr, "It's a jetpack. If you can see this, report it on the bug tracker.")
return 0
return TRUE
/obj/item/tank/jetpack/rig/allow_thrust(num, mob/living/user as mob)
code/game/objects/items/weapons/tanks/tank_types.dm
+7 -4
View File
@@ -21,8 +21,9 @@
/obj/item/tank/oxygen/adjust_initial_gas()
air_contents.adjust_gas(GAS_OXYGEN, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/oxygen/examine(mob/user)
if(..(user, 0) && air_contents.gas[GAS_OXYGEN] < 10)
/obj/item/tank/oxygen/examine(mob/user, distance, is_adjacent)
. = ..()
if((is_adjacent) && air_contents.gas[GAS_OXYGEN] < 10)
to_chat(user, text("<span class='warning'>The meter on \the [src] indicates you are almost out of oxygen!</span>"))
/obj/item/tank/oxygen/yellow
@@ -76,7 +77,8 @@
air_contents.adjust_multi(GAS_OXYGEN, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD, GAS_NITROGEN, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD)
/obj/item/tank/air/examine(mob/user, distance, is_adjacent)
if((distance <= 0) && air_contents.gas[GAS_OXYGEN] < 1 && loc==user)
. = ..()
if((is_adjacent) && air_contents.gas[GAS_OXYGEN] < 1 && loc==user)
to_chat(user, "<span class='danger'>The meter on the [src.name] indicates you are almost out of air!</span>")
/*
@@ -147,7 +149,8 @@
air_contents.adjust_gas(GAS_OXYGEN, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/emergency_oxygen/examine(mob/user, distance, is_adjacent)
if((distance <= 0) && air_contents.gas[GAS_OXYGEN] < 0.2 && loc==user)
. = ..()
if((is_adjacent) && air_contents.gas[GAS_OXYGEN] < 0.2 && loc==user)
to_chat(user, text("<span class='danger'>The meter on the [src.name] indicates you are almost out of air!</span>"))
/obj/item/tank/emergency_oxygen/engi