diff --git a/code/defines/area/Space Station 13 areas.dm b/code/defines/area/Space Station 13 areas.dm index 0ec4671e922..8b234b5fdcd 100644 --- a/code/defines/area/Space Station 13 areas.dm +++ b/code/defines/area/Space Station 13 areas.dm @@ -55,6 +55,17 @@ proc/process_teleport_locs() if (picked.z == 1) teleportlocs += AR.name teleportlocs[AR.name] = AR + +var/list/ghostteleportlocs = list() + +proc/process_ghost_teleport_locs() + for(var/area/AR in world) + if(ghostteleportlocs.Find(AR.name)) continue + var/turf/picked = pick(get_area_turfs(AR.type)) + if (picked.z == 1 || picked.z == 8) + ghostteleportlocs += AR.name + ghostteleportlocs[AR.name] = AR + /*-----------------------------------------------------------------------------*/ /area/engine/ diff --git a/code/game/algorithm.dm b/code/game/algorithm.dm index 53d5186a3f5..b10d723e6da 100644 --- a/code/game/algorithm.dm +++ b/code/game/algorithm.dm @@ -14,6 +14,7 @@ beta_tester_loadfile() LoadBans() process_teleport_locs() //Sets up the wizard teleport locations + process_ghost_teleport_locs() //Sets up ghost teleport locations. spawn(30) //EXPERIMENTAL diff --git a/code/game/machinery/circuitprinter.dm b/code/game/machinery/circuitprinter.dm index 4681fa31352..9c8dbadfab4 100644 --- a/code/game/machinery/circuitprinter.dm +++ b/code/game/machinery/circuitprinter.dm @@ -196,7 +196,7 @@ Operations Highlights: reagents.remove_reagent("acid", 20) if("pacid") reagents.remove_reagent("pacid", 20) - if("plasma") + if("plasma") //Plasma = Bad. Causes damage and possibly explosion. for(var/mob/V in viewers(src, null)) V.show_message(text("\red The plasma in the Circuit Printer reacts violently!")) sleep(20) @@ -220,7 +220,7 @@ Operations Highlights: for(var/mob/V in viewers(src, null)) V.show_message(text("\red The contaminants ruined the circuit board!")) - if(prob(imprint_chance < 100)) + if(prob(imprint_chance < 100)) //Contaminants damage machine. health -= ((100 - imprint_chance) / 5) for(var/mob/V in viewers(src, null)) V.show_message(text("\red The contaminents damaged the Circuit Printer!")) @@ -233,9 +233,9 @@ Operations Highlights: screen = 2 else if(href_list["access"]) //Set Menu "Access Log screen = 3 - else if(href_list["dispose"]) + else if(href_list["dispose"]) //Purges the specific reagent from the holder. reagents.del_reagent(href_list["dispose"]) - else if(href_list["disposeall"]) + else if(href_list["disposeall"]) //Purges all the reagents from the holder. reagents.clear_reagents() @@ -254,10 +254,10 @@ Operations Highlights: item_state = "card-id" w_class = 1.0 var - blueprint = "" - department = "" - security = "" - circuit = "" + blueprint = "" //File path of circuit board it creates. + department = "" //Department board belongs to. + security = "" //Danger/Value of board. + circuit = "" //The name of the circuit it creates (for display elsewhere). New() src.pixel_x = rand(-5.0, 5) src.pixel_y = rand(-5.0, 5) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index dd5da48e399..9fc71b08047 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -151,10 +151,10 @@ return /obj/item/weapon/pen/sleepypen/New() - var/datum/reagents/R = new/datum/reagents(50) //Used to be 300 + var/datum/reagents/R = new/datum/reagents(30) //Used to be 300 reagents = R R.my_atom = src - R.add_reagent("chloralhydrate", 50) //Used to be 100 sleep toxin + R.add_reagent("chloralhydrate", 30) //Used to be 100 sleep toxin // R.add_reagent("impedrezene", 100) // R.add_reagent("cryptobiolin", 100) ..() diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index d55ff89ec05..c2025d14aca 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -90,80 +90,17 @@ if((usr.stat != 2) || !istype(usr, /mob/dead/observer)) usr << "Not when you're not dead!" return - var/A - var/list/L = list() usr.verbs -= /mob/dead/observer/proc/dead_tele spawn(30) usr.verbs += /mob/dead/observer/proc/dead_tele - A = input("Area to jump to", "BOOYEA", A) in list("Engine","Hallways","Toxins","Storage","Maintenance","Crew Quarters","Medical","Security","Chapel","Bridge","AI Satellite","Thunderdome","Derelict","Mining") + var/A + A = input("Area to jump to", "BOOYEA", A) in ghostteleportlocs + var/area/thearea = ghostteleportlocs[A] - switch (A) - if ("Engine") - for(var/area/B in world) - if(istype(B, /area/engine) && !istype(B, /area/engine/combustion) && !istype(B, /area/engine/engine_walls)) - L += B - A = pick(L) - if ("Hallways") - for(var/area/hallway/B in world) - L += B - A = pick(L) - if ("Toxins") - for(var/area/B in world) - if(istype(B, /area/toxins) && !istype(B, /area/toxins/test_area)) - L += B - A = pick(L) - if ("Storage") - for(var/area/storage/B in world) - L += B - A = pick(L) - if ("Maintenance") - for(var/area/maintenance/B in world) - L += B - A = pick(L) - if ("Crew Quarters") - for(var/area/crew_quarters/B in world) - L += B - A = pick(L) - if ("Medical") - for(var/area/medical/B in world) - L += B - A = pick(L) - if ("Security") - for(var/area/security/B in world) - L += B - A = pick(L) - if ("Chapel") - for(var/area/chapel/B in world) - L += B - A = pick(L) - if ("Bridge") - for(var/area/bridge/B in world) - L += B - A = pick(L) - if ("AI Satellite") - for(var/area/turret_protected/aisat/B in world) - L += B - A = pick(L) - if ("Thunderdome") - for(var/area/tdome/B in world) - L += B - A = pick(L) - if ("Derelict") - for(var/area/derelict/B in world) - L += B - A = pick(L) - if ("Mining") - for(var/area/mine/B in world) - L += B - A = pick(L) - - var/list/Q = list() - for(var/turf/T in A) - Q+=T - if (Q.len) - usr.loc = pick(Q) - else - usr << "Teleporting to that area doesn't seem to be working currently. But at least now it tells you that." + var/list/L = list() + for(var/turf/T in get_area_turfs(thearea.type)) + L+=T + usr.loc = pick(L) var/list/karma_spenders = list() diff --git a/icons/changelog.html b/icons/changelog.html index 704f0554e94..ed1a50831a7 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -45,6 +45,40 @@

Changelog

+
08.01.2011,8:00PST, r820
+ +
17.12.2010,11:00GMT