Skip to content

Commit

Permalink
fix issue.
Browse files Browse the repository at this point in the history
  • Loading branch information
Rockdtben committed Jul 5, 2019
1 parent 14a70f1 commit 9a6f5c7
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 14 deletions.
9 changes: 6 additions & 3 deletions code/client/client.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ client
world << "<B>[src] has logged in!</B>"
src << "<font color=blue>Version: [n_version][n_sub]</font>"
src << "<font color=red>Welcome to console [n_version][n_sub] -- Click <a href=?changes>here</a> for a list of changes."
if (!fexists("saves/players/[src.ckey].sav"))
var/old_mob = src.mob
if ((!( fexists("saves/players/[src.ckey].sav") ) || alert(src, "Would you like to load your old character? Warning a No will delete your current one!", "Console Saving", "Yes", "No", null) == "No"))
..()
new /obj/items/wirecutters( src.mob )
new /obj/signal/computer/laptop( src.mob )
Expand All @@ -15,15 +16,17 @@ client
new /obj/items/pen( src.mob )
new /obj/items/GPS( src.mob )
src.mob.save_version = "[n_version][n_sub]"
src.mob.saving = "yes"
//src.mob.saving = "yes"
else
var/savefile/F = new("saves/players/[src.ckey].sav")
F >> src.mob
if (old_mob)
del(old_mob)
if (!( locate(/obj/items/wirecutters, src.mob) ))
new /obj/items/wirecutters( src.mob )
if (!( locate(/obj/items/GPS, src.mob) ))
new /obj/items/GPS( src.mob )
src.mob.saving = "yes"
//src.mob.saving = "yes"
if((ckey in admins))
for(var/V in typesof(/mob/admin/verb))
mob.verbs += V
Expand Down
4 changes: 2 additions & 2 deletions code/signal/signal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ obj/signal
process_signal(obj/signal/structure/S,atom/source)
if(signal_hit>=max_signal)
if(istype(source,/obj/signal/wire))
var /area/boom_loc = source.loc
//var /area/boom_loc = source.loc
spawn(0)
del(source)
new /image/boom(loc=boom_loc)
//new /image/boom(loc=boom_loc)
del(S)
signal_hit++
spawn(20)
Expand Down
2 changes: 0 additions & 2 deletions code/software/programs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ datum/task/proc/get_data(string in view(usr.client))
var/thing = src.var_list["[string]"]
if (thing)
return thing
else
return "[string]"
else
if (istype(src.var_list["[copytext(string, 1, temp)]"], /list))
var/L = src.var_list["[copytext(string, 1, temp)]"]
Expand Down
4 changes: 3 additions & 1 deletion config/motd.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<hr>
Rockdtben Fork of Console: https://github.com/Rockdtben/console
Discord: https://discord.gg/fSzdEc
Discord: https://discord.gg/ns2Aeu4
Issue Tracker: https://github.com/Rockdtben/console/issues

<b>Getting Started</b>
Expand All @@ -9,4 +9,6 @@ Check the Library (South West) for the Basic Computing Book for a tutorial on wr
Check Help -> <b>ExCode Reference</b> for a list of commands.

Check Help -> <b>RouterHelp</b> for a demo of wiring routers.

Note: Player inventory saving is disabled for now.
<hr>
1 change: 1 addition & 0 deletions console.dme
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "code\changelog\changes.dm"
#include "code\client\client.dm"
#include "code\client\zooming.dm"
#include "code\effect\boom.dm"
#include "code\hardware\antenna.dm"
#include "code\hardware\bounce.dm"
#include "code\hardware\computer.dm"
Expand Down
15 changes: 9 additions & 6 deletions maps/new_map.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,9 @@
"hA" = (/obj/table,/turf/floor,/area)
"hB" = (/obj/conveyor,/turf/wall,/area)
"hC" = (/obj/electronic,/turf/wall,/area)
"hD" = (/obj/table,/obj/shutter,/turf/floor,/area/save_location{auto_save = 1; name = "Rockdtben's Lab"; owner = "rockdtben"})
"hE" = (/obj/signal/shutter_box{dir = 4},/turf/floor,/area/save_location{auto_save = 1; name = "Rockdtben's Lab"; owner = "rockdtben"})
"hF" = (/obj/table{dir = 4; icon_state = "sides"},/obj/shutter,/turf/floor,/area/save_location{auto_save = 1; name = "Rockdtben's Lab"; owner = "rockdtben"})

(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
Expand Down Expand Up @@ -447,12 +450,12 @@ aaaaacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacac
aaaaacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacaceEeEeEeEeEeEeEacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacaaaa
aaaaaaaaacacacaaaaaaaaaaaaaaeZfaaaaaaaaaaaaaaaaafbfcaaaaaaaaaaaaaaaafdfeaaaaaaaaacacacacacaceEeEeEeEeEeEeEacacacacacacaaaaaaaaaaaccqaaaaaaaaaaaaaaaaaccqaaaaaaaaaaaaaaaaaccqaaaaaaaaaaaaaaacacacaaaaaaaa
aaaaadacacacacacacaaffeZfgfheZeZeZfifjaafkfbflfmfbfbfbfnfoaafpfdfqfrfdfdfdfsftaaacadacacacadeEeEeEeEeEeEeEadacacacadacaacGaccHcIacacaccJaeaacGaccHcIacacaccJaeaacGaccHcIacacaccJaeaaacacacacacacacadaaaa
aaaaacacacacacacacaaeZeZeZeZeZeZeZeZeZaafbfbfbfbfbfbfbfbfbaafdfdfdfdfdfdfdfdfdaaacacacacacaceEeEeEeEeEeEeEacacacacacacaaacacacacacacacacacaaacacacacacacacacacaaacacacacacacacacacaaacacacacacacacacaaaa
aaaaacacacacacacadaaeZeZeZeZeZeZeZeZeZaafbfbfbfbfbfbfbfbfbaafdfdfdfdfdfdfdfdfdaaacacacacacacacacacacacacacacacacacacacaaacacacacacacacacacaaacacacacacacacacacaaacacacacacacacacacaaadacacacacacacacaaaa
aaaaacacacacacacacaafueZeZfveZfveZeZfwaafxfbfbfyfbfyfbfbfzaafAfdfdfBfdfBfdfdfCaaacacacacacacacacacacacacacacacacacacacaaazacacadacadacacabaaazacacadacadacacabaaazacacadacadacacabaaacacacacacacacacaaaa
aaaaadacacacacacacaafueZeZfveZfveZeZfwaafxfbfbfyfbfyfbfbfzaafAfdfdfBfdfBfdfdfCaaacacacacacacacacacacacacacacacacacacacaaazacacadacadacacabaaazacacadacadacacabaaazacacadacadacacabaaacacacacacacacadaaaa
aaaaacacacacacacacaafueZeZfvfDfveZeZfwaafxfbfbfyfEfyfbfbfzaafAfdfdfBfFfBfdfdfCaaacacacacacacacacacacacacacacacacacacacaaazacacadcWadacacabaaazacacadcWadacacabaaazacacadcWadacacabaaacacacacacacacacaaaa
aaaaacacacacacacadaafueZeZfveZfveZeZfwaafxfbfbfyfbfyfbfbfzaafAfdfdfBfdfBfdfdfCaaaeadacacacadacacacacacacacadacacacadacaaazacacadacadacacabaaazacacadacadacacabaaazacacadacadacacabaaadacacacacacacacaaaa
aaaaacacacacacacacaaeZeZeZeZeZeZeZeZeZaafbfbfbfbfbfbfbfbfbaafdfdfdfdfdfdfdfdfdhDacacacacacaceEeEeEeEeEeEeEacacacacacacaaacacacacacacacacacaaacacacacacacacacacaaacacacacacacacacacaaacacacacacacacacaaaa
aaaaacacacacacacadaaeZeZeZeZeZeZeZeZeZaafbfbfbfbfbfbfbfbfbaafdfdfdfdfdfdfdfdfdhFacacacacacacacacacacacacacacacacacacacaaacacacacacacacacacaaacacacacacacacacacaaacacacacacacacacacaaadacacacacacacacaaaa
aaaaacacacacacacacaafueZeZfveZfveZeZfwaafxfbfbfyfbfyfbfbfzaafAfdfdfBfdfBfdfdfChDacacacacacacacacacacacacacacacacacacacaaazacacadacadacacabaaazacacadacadacacabaaazacacadacadacacabaaacacacacacacacacaaaa
aaaaadacacacacacacaafueZeZfveZfveZeZfwaafxfbfbfyfbfyfbfbfzaafAfdfdfBfdfBfdfdfChDacacacacacacacacacacacacacacacacacacacaaazacacadacadacacabaaazacacadacadacacabaaazacacadacadacacabaaacacacacacacacadaaaa
aaaaacacacacacacacaafueZeZfvfDfveZeZfwaafxfbfbfyfEfyfbfbfzaafAfdfdfBfFfBfdfdhEhDacacacacacacacacacacacacacacacacacacacaaazacacadcWadacacabaaazacacadcWadacacabaaazacacadcWadacacabaaacacacacacacacacaaaa
aaaaacacacacacacadaafueZeZfveZfveZeZfwaafxfbfbfyfbfyfbfbfzaafAfdfdfBfdfBfdfdfdaaaeadacacacadacacacacacacacadacacacadacaaazacacadacadacacabaaazacacadacadacacabaaazacacadacadacacabaaadacacacacacacacaaaa
aaaaacacacacacacacaafueZeZfveZfveZeZfwaafxfbfbfyfbfyfbfbfzaafAfdfdfBfdfBfdfdfCaaaaaaacacacaaaaaaacacacaaaaaaacacacaaaaaaazacacadacadacacabaaazacacadacadacacabaaazacacadacadacacabaaacacacacacacacacaaaa
aaaaadacacacacacacaaeZeZeZeZeZeZeZeZeZaafbfbfbfbfbfbfbfbfbaafdfdfdfdfdfdfdfdfdaaadacacacacacacaaacacacaaacacacacacacadaaacacacacacacacacacaaacacacacacacacacacaaacacacacacacacacacaaacacacacacacacadaaaa
aaaaacacacacacacacaaeZeZeZeZeZeZeZeZeZaafbfbfbfbfbfbfbfbfbaafdfdfdfdfdfdfdfdfdaaacacacacacacadaaacacacaaadacacacacacacaaacacacacacacacacacaaacacacacacacacacacaaacacacacacacacacacaaacacacacacacacacaaaa
Expand Down

0 comments on commit 9a6f5c7

Please sign in to comment.