cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nullchecks. And one zero division.

Browse Source
This commit is contained in:
Chinsky
2012-11-21 20:55:53 +04:00
parent c686245263
commit 15abc757d3
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/devices/taperecorder.dm
View File

@@ -124,8 +124,8 @@
usr << "<span class='notice'>You can't clear the memory while playing or recording!</span>" usr << "<span class='notice'>You can't clear the memory while playing or recording!</span>"
return return
else else
storedinfo -= storedinfo if(storedinfo) storedinfo.Cut()
timestamp -= timestamp if(timestamp) timestamp.Cut()
timerecorded = 0 timerecorded = 0
usr << "<span class='notice'>Memory cleared.</span>" usr << "<span class='notice'>Memory cleared.</span>"
return return

2
code/modules/admin/verbs/adminsay.dm
View File

@@ -25,7 +25,7 @@
for (var/client/C in admin_list) for (var/client/C in admin_list)
if (src.holder.rank == "Admin Observer") if (src.holder.rank == "Admin Observer")
C << "<span class='adminobserver'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, C)]:</EM> <span class='message'>[msg]</span></span>" C << "<span class='adminobserver'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, C)]:</EM> <span class='message'>[msg]</span></span>"
else if(C.holder.level != 0) else if(C.holder && C.holder.level != 0)
C << "<span class='admin'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, C)]</EM> (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>" C << "<span class='admin'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, C)]</EM> (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"
/client/proc/cmd_mod_say(msg as text) /client/proc/cmd_mod_say(msg as text)

2
code/modules/paperwork/paper.dm
View File

@@ -226,7 +226,7 @@
/obj/item/weapon/paper/Topic(href, href_list) /obj/item/weapon/paper/Topic(href, href_list)
..() ..()
if((usr.stat || usr.restrained())) if(!usr || (usr.stat || usr.restrained()))
return return
if(href_list["write"]) if(href_list["write"])

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

@@ -61,7 +61,7 @@
/obj/machinery/power/smes/proc/chargedisplay() /obj/machinery/power/smes/proc/chargedisplay()
return round(5.5*charge/capacity) return round(5.5*charge/(capacity ? capacity : 5e6))
#define SMESRATE 0.05 // rate of internal charge to external power #define SMESRATE 0.05 // rate of internal charge to external power

2
code/modules/research/xenoarchaeology/artifact_analysis.dm
View File

@@ -221,7 +221,7 @@
findarti++ findarti++
cur_artifact = A cur_artifact = A
if (findarti == 1) if (findarti == 1)
if(cur_artifact.being_used) if(cur_artifact && cur_artifact.being_used)
var/message = "<b>[src]</b> states, \"Cannot analyse. Excess energy drain is disrupting signal.\"" var/message = "<b>[src]</b> states, \"Cannot analyse. Excess energy drain is disrupting signal.\""
src.visible_message(message, message) src.visible_message(message, message)
else else