cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 23:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implements github suggestions

Browse Source 
Among others:
- TXT helpfile is now HTML helpfile
- Lots of gremmer changes
- Some adjustments
This commit is contained in:
Atlantis
2015-05-23 22:22:38 +02:00
parent 97f0470504
commit ef040583c8
10 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/silicon/ai/examine.dm
View File

@@ -19,9 +19,9 @@
msg += "<B>Its casing is melted and heat-warped!</B>\n"
if (src.getOxyLoss())
if (src.getOxyLoss() > 175)
msg += "<B>It seems to be running on backup power. It's display is blinking \"BACKUP POWER CRITICAL\" warning.</B>\n"
msg += "<B>It seems to be running on backup power. Its display is blinking a \"BACKUP POWER CRITICAL\" warning.</B>\n"
else if(src.getOxyLoss() > 100)
msg += "<B>It seems to be running on backup power. It's display is blinking \"BACKUP POWER LOW\" warning.</B>\n"
msg += "<B>It seems to be running on backup power. Its display is blinking a \"BACKUP POWER LOW\" warning.</B>\n"
else
msg += "It seems to be running on backup power.\n"

16
code/modules/mob/living/silicon/ai/life.dm
View File

@@ -57,26 +57,26 @@
src.see_in_dark = 8
src.see_invisible = SEE_INVISIBLE_LIVING
if (src:aiRestorePowerRoutine==2)
if (aiRestorePowerRoutine==2)
src << "Alert cancelled. Power has been restored without our assistance."
src:aiRestorePowerRoutine = 0
aiRestorePowerRoutine = 0
src.blind.layer = 0
return
else if (src:aiRestorePowerRoutine==3)
else if (aiRestorePowerRoutine==3)
src << "Alert cancelled. Power has been restored."
src:aiRestorePowerRoutine = 0
aiRestorePowerRoutine = 0
src.blind.layer = 0
return
else if (APU_power)
src:aiRestorePowerRoutine = 0
aiRestorePowerRoutine = 0
src.blind.layer = 0
return
else
var/area/current_area = get_area(src)
if (lacks_power())
if (src:aiRestorePowerRoutine==0)
src:aiRestorePowerRoutine = 1
if (aiRestorePowerRoutine==0)
aiRestorePowerRoutine = 1
//Blind the AI
@@ -144,7 +144,7 @@
theAPC.operating = 1
theAPC.equipment = 3
theAPC.update()
src:aiRestorePowerRoutine = 3
aiRestorePowerRoutine = 3
src << "Here are your current laws:"
src.show_laws()
sleep(50)

2
code/modules/power/apc.dm
View File

@@ -575,7 +575,7 @@
if(has_electronics==0)
has_electronics = 1
user << "<span class='notice'>You place the power control board inside the frame.</span>"
qdel(W) // qdel
qdel(W)
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && ((stat & BROKEN)))
user << "<span class='warning'>You cannot put the board inside, the frame is damaged.</span>"
return

8
code/modules/shieldgen/emergency_shield.dm
View File

@@ -13,8 +13,8 @@
var/shield_idle_power = 1500 //how much power we use when just being sustained.
/obj/machinery/shield/malfai
name = "Emergency Forcefield"
desc = "Weak forcefield which seems to be projected by station's emergency atmosphere containment field"
name = "emergency forcefield"
desc = "A weak forcefield which seems to be projected by the station's emergency atmosphere containment field"
health = max_health/2 // Half health, it's not suposed to resist much.
/obj/machinery/shield/malfai/process()
@@ -23,7 +23,7 @@
/obj/machinery/shield/proc/check_failure()
if (src.health <= 0)
visible_message("<span class='notice'>The [src] dissipates!</span>")
visible_message("<span class='notice'>\The [src] dissipates!</span>")
qdel(src)
return
@@ -100,7 +100,7 @@
/obj/machinery/shield/hitby(AM as mob|obj)
//Let everyone know we've been hit!
visible_message("<span class='notice'><B>[src] was hit by [AM].</B></span>")
visible_message("<span class='notice'><B>\[src] was hit by [AM].</B></span>")
//Super realistic, resource-intensive, real-time damage calculations.
var/tforce = 0