"
+ var/t = "
Generated power : [round(lastgen)] W
"
+ t += "
Orientation: [rate_control(src,"cdir","[cdir]°",1,15)] ([angle2text(cdir)])
"
+ t += "
Tracking:"
switch(track)
if(0)
t += "
Off Timed Auto"
@@ -325,6 +397,13 @@ var/list/solars_list = list()
t += "
Off Timed Auto"
t += "Tracking Rate: [rate_control(src,"tdir","[trackrate] deg/h ([trackrate<0 ? "CCW" : "CW"])",1,30,180)]
"
+
+ t += "
Connected devices:"
+
+ t += "
Search for devices"
+ t += "Solar panels : [connected_panels.len] connected
"
+ t += "Solar tracker : [connected_tracker ? "
Found" : "
Not found"]
"
+
t += "
Close"
var/datum/browser/popup = new(user, "solar", name)
@@ -371,6 +450,10 @@ var/list/solars_list = list()
if(stat & (NOPOWER | BROKEN))
return
+ if(connected_tracker) //NOTE : handled here so that we don't add trackers to the processing list
+ if(connected_tracker.powernet != powernet)
+ connected_tracker.unset_control()
+
if(track==1 && trackrate) //manual tracking and set a rotation speed
if(nexttime <= world.time) //every time we need to increase/decrease the angle by 1°...
targetdir = (targetdir + trackrate/abs(trackrate) + 360) % 360 //... do it
@@ -378,20 +461,6 @@ var/list/solars_list = list()
src.updateDialog()
-
-// called by solar tracker when sun position changes
-// or called by the sun controller for manual tracking updates
-/obj/machinery/power/solar_control/proc/tracker_update(var/angle)
- if(stat & (NOPOWER | BROKEN) || track == 0)
- return
- if (track == 2) // auto-tracking (called by tracker.dm /set_angle)
- cdir = angle
- else if (trackrate) //else we're manual tracking. If we set a rotation speed...
- cdir = targetdir //...the current direction is the targetted one (and rotates panels to it)
- set_panels(cdir)
- src.updateDialog()
-
-
/obj/machinery/power/solar_control/Topic(href, href_list)
if(..())
usr << browse(null, "window=solcon")
@@ -416,30 +485,31 @@ var/list/solars_list = list()
if(href_list["track"])
track = text2num(href_list["track"])
- if(powernet && (track == 2))
- for(var/obj/machinery/power/tracker/T in powernet.nodes)
- if(powernet.nodes[T])
- T.set_angle(sun.angle)
- break
+ if(track == 2)
+ if(connected_tracker)
+ connected_tracker.set_angle(sun.angle)
+ set_panels(cdir)
else if (track == 1) //begin manual tracking
src.targetdir = src.cdir
if(src.trackrate) nexttime = world.time + 36000/abs(trackrate)
set_panels(targetdir)
+ if(href_list["search_connected"])
+ src.search_for_connected()
+ if(connected_tracker && track == 2)
+ connected_tracker.set_angle(sun.angle)
+ src.set_panels(cdir)
+
src.updateUsrDialog()
return
-
+//rotates the panel to the passed angle
/obj/machinery/power/solar_control/proc/set_panels(var/cdir)
- if(!powernet) return
- for(var/obj/machinery/power/solar/S in powernet.nodes)
- if(powernet.nodes[S])
- if(get_dist(S, src) < SOLAR_MAX_DIST)
- if(!S.control)
- S.control = src
- S.adir = cdir //instantly rotates the panel
- S.update_icon() //and
- S.update_solar_exposure() //update it
+
+ for(var/obj/machinery/power/solar/S in connected_panels)
+ S.adir = cdir //instantly rotates the panel
+ S.occlusion()//and
+ S.update_icon() //update it
update_icon()
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index c87d48e8ad3..a0d6eb1084d 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -11,7 +11,6 @@
layer = TURF_LAYER
var/obj/machinery/power/master = null
anchored = 1
- directwired = 0 // must have a cable on same turf connecting to terminal
layer = 2.6 // a bit above wires
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index af79acaa808..20e8ab528c4 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -10,26 +10,33 @@
icon_state = "tracker"
anchored = 1
density = 1
- directwired = 1
use_power = 0
var/id = 0
var/sun_angle = 0 // sun angle as set by sun datum
+ var/obj/machinery/power/solar_control/control = null
/obj/machinery/power/tracker/New(var/turf/loc, var/obj/item/solar_assembly/S)
..(loc)
Make(S)
connect_to_network()
-/obj/machinery/power/tracker/disconnect_from_network()
+/obj/machinery/power/tracker/Destroy()
+ unset_control() //remove from control computer
..()
- solars_list.Remove(src)
-/obj/machinery/power/tracker/connect_to_network()
- var/to_return = ..()
- if(powernet) //if connected and not already in solar_list...
- solars_list |= src //... add it
- return to_return
+//set the control of the tracker to a given computer if closer than SOLAR_MAX_DIST
+/obj/machinery/power/tracker/proc/set_control(var/obj/machinery/power/solar_control/SC)
+ if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST))
+ return 0
+ control = SC
+ return 1
+
+//set the control of the tracker to null and removes it from the previous control computer if needed
+/obj/machinery/power/tracker/proc/unset_control()
+ if(control)
+ control.connected_tracker = null
+ control = null
/obj/machinery/power/tracker/proc/Make(var/obj/item/solar_assembly/S)
if(!S)
@@ -40,27 +47,21 @@
S.loc = src
update_icon()
-// called by datum/sun/calc_position() as sun's angle changes
+//updates the tracker icon and the facing angle for the control computer
/obj/machinery/power/tracker/proc/set_angle(var/angle)
sun_angle = angle
//set icon dir to show sun illumination
dir = turn(NORTH, -angle - 22.5) // 22.5 deg bias ensures, e.g. 67.5-112.5 is EAST
- // find all solar controls and update them
- // currently, just update all controllers in world
- // ***TODO: better communication system using network
- if(powernet)
- for(var/obj/machinery/power/solar_control/C in powernet.nodes)
- if(powernet.nodes[C])
- if(get_dist(C, src) < SOLAR_MAX_DIST)
- C.tracker_update(angle)
+ if(powernet && (powernet == control.powernet)) //update if we're still in the same powernet
+ control.cdir = angle
/obj/machinery/power/tracker/attackby(var/obj/item/weapon/W, var/mob/user)
if(istype(W, /obj/item/weapon/crowbar))
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- user << "
You begin to take the glass off the solar tracker..."
+ user.visible_message("
[user] begins to take the glass off the solar tracker.")
if(do_after(user, 50))
var/obj/item/solar_assembly/S = locate() in src
if(S)
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 78f9dc86020..dacc6cbe8c6 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -49,7 +49,6 @@
density = 1
var/opened = 0
var/obj/machinery/power/compressor/compressor
- directwired = 1
var/turf/simulated/outturf
var/lastgen
var/productivity = 1
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 2efdbab093b..9c22baa43a1 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -167,7 +167,7 @@ proc/wabbajack(mob/living/M)
new_mob.universal_speak = 1*/
if("animal")
if(prob(50))
- var/beast = pick("carp","bear","mushroom","statue", "bat", "goat")
+ var/beast = pick("carp","bear","mushroom","statue", "bat", "goat","killertomato")
switch(beast)
if("carp") new_mob = new /mob/living/simple_animal/hostile/carp(M.loc)
if("bear") new_mob = new /mob/living/simple_animal/hostile/bear(M.loc)
@@ -175,15 +175,15 @@ proc/wabbajack(mob/living/M)
if("statue") new_mob = new /mob/living/simple_animal/hostile/statue(M.loc)
if("bat") new_mob = new /mob/living/simple_animal/hostile/retaliate/bat(M.loc)
if("goat") new_mob = new /mob/living/simple_animal/hostile/retaliate/goat(M.loc)
+ if("killertomato") new_mob = new /mob/living/simple_animal/hostile/killertomato(M.loc)
else
- var/animal = pick("parrot","corgi","crab","pug","cat","tomato","mouse","chicken","cow","lizard","chick")
+ var/animal = pick("parrot","corgi","crab","pug","cat","mouse","chicken","cow","lizard","chick")
switch(animal)
if("parrot") new_mob = new /mob/living/simple_animal/parrot(M.loc)
if("corgi") new_mob = new /mob/living/simple_animal/corgi(M.loc)
if("crab") new_mob = new /mob/living/simple_animal/crab(M.loc)
if("pug") new_mob = new /mob/living/simple_animal/pug(M.loc)
if("cat") new_mob = new /mob/living/simple_animal/cat(M.loc)
- if("tomato") new_mob = new /mob/living/simple_animal/tomato(M.loc)
if("mouse") new_mob = new /mob/living/simple_animal/mouse(M.loc)
if("chicken") new_mob = new /mob/living/simple_animal/chicken(M.loc)
if("cow") new_mob = new /mob/living/simple_animal/cow(M.loc)
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index aae4252fcf6..c0ef07309d8 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -1906,22 +1906,13 @@ datum/design/welding_mask
datum/design/mesons
name = "Optical Meson Scanners"
- desc = "Used for seeing walls, floors, and stuff through anything."
+ desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
id = "mesons"
- req_tech = list("magnets" = 2, "engineering" = 2)
+ req_tech = list("materials" = 3, "magnets" = 3, "engineering" = 3)
build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
+ materials = list("$metal" = 200, "$glass" = 300, "$plasma" = 100)
build_path = /obj/item/clothing/glasses/meson
-datum/design/advanced_mesons
- name = "Advanced Optical Meson Scanner"
- desc = "More powerful than your standard mesons, these ones make everything appear to be lit extremely brightly."
- id = "advanced_mesons"
- req_tech = list("magnets" = 4, "engineering" = 4)
- build_type = PROTOLATHE
- materials = list("$metal" = 100, "$glass" = 100)
- build_path = /obj/item/clothing/glasses/meson/advanced
-
datum/design/night_vision_goggles
name = "Night Vision Goggles"
desc = "Goggles that let you see through darkness unhindered."
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index d8db9381aaa..841e96959e7 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -50,12 +50,6 @@
origin_tech = "materials=1;biotech=1"
attack_verb = list("drilled")
-/obj/item/weapon/scalpel/suicide_act(mob/user)
- user.visible_message(pick("
[user] is pressing [src] to \his temple and activating it! It looks like \he's trying to commit suicide.", \
- "
[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide."))
- return (BRUTELOSS)
-
-
/obj/item/weapon/scalpel
name = "scalpel"
desc = "Cut, cut, and once more cut."
diff --git a/config/config.txt b/config/config.txt
index 5bfea844cab..5a516d59e5a 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -111,11 +111,14 @@ GUEST_BAN
# SERVER ss13.example.com:2506
## forum address
-# FORUMURL http://justanotherday.example.com
+# FORUMURL http://tgstation13.org/phpBB/index.php
## Wiki address
# WIKIURL http://www.tgstation13.org/wiki
+##Rules address
+# RULESURL http://www.tgstation13.org/wiki/Rules
+
## Ban appeals URL - usually for a forum or wherever people should go to contact your admins.
# BANAPPEALS http://justanotherday.example.com
diff --git a/config/game_options.txt b/config/game_options.txt
index d250d80c56d..cfcb6b24b8d 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -114,6 +114,11 @@ SHUTTLE_REFUEL_DELAY 12000
TRAITOR_SCALING_COEFF 6
CHANGELING_SCALING_COEFF 7
+## Variables calculate how number of open security officer positions will scale to population.
+## Used as (Officers = Population / Coeff)
+## Set to 0 to disable scaling and use default numbers instead.
+SECURITY_SCALING_COEFF 8
+
# The number of objectives traitors get.
# Not including escaping/hijacking.
TRAITOR_OBJECTIVES_AMOUNT 2
diff --git a/config/rules.html b/config/rules.html
deleted file mode 100644
index 4a41a7a333d..00000000000
--- a/config/rules.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
Server Rules
-There’s a lot here, but the gist of the rules is roleplay takes priority. Don’t metagame. Don’t play to win. Don’t be a jerk OOCly. If you don’t understand what those words mean or you need more detail, read on!
-
-
Primary Policies
-
-
- - 0. Admins may disregard any of these rules at their discretion when they feel its in the best interest of the current round/server/playerbase at large. They will, of course, be fully accountable for their actions should they choose to exercise this privilege.
-
- - 1.We’re all here to have a good time. If you’re intentionally trying to ruin everyone else’s good time, you won’t have a place here. Being a jerk in-character is fine to a point, but being a jerk out of character is not welcome at all.
-
- - 2. You are playing a game where you are not fully in control of everything. You will be put into situations beyond your control, which will result in some rounds being ruined for you. Man up and deal with it. However, if you are obviously griefed, be sure to report it to administrators by using the ‘adminhelp’ verb.
-
- - 3. This is a roleplaying game. The purpose of the game is to have fun roleplaying. Being an asshole, who ruins other player’s roleplay experience, just to win, is considered a ‘play-to-win’ style of playing. You can and will be banned for this playstyle. Be considerate of other players’ experience.
- - 3b. (Suggested rewording) Randomly murdering people is generally considered to be ruining someone’s fun and poor form in roleplay. If you don’t have a solid IC reason for murder, you may be removed. Trying to justify it with ‘My character is so random/insane’ is not tolerated.
-
- - 4. IC information should be kept out of OOC channels and vice-versa.
-
- - 5. Don’t metagame. Do not ever use information, acquired out of character or through patterns or events your character would not be able to know, in game.
- - 5b. (Suggested rewording) This game is developed by volunteers in their spare time. Do not expect perfection. If you find a bug or an exploit, report it via adminhelp. Abusing bugs or exploits is not allowed. This includes reacting to events or patterns, which your character would not be able to identify IC (metagaming).
-
- - 6. If you take up or are given a job, which is important for game progression (head of staff, AI, antagonist role), make sure you actually do that job. If you find yourself unable to do this due to real life circumstances, just let an admin know (adminhelp) before you leave, please.
-
- - 7. Speak like a normal person while in character. Don’t spam, either IC or OOC. Don’t use smileys, netspeak, etc. in IC speech.
-
- - 8. Erotic Roleplay is allowed, but some decency is expected. Keep it private. All involved players must consent. Unwelcome ERP will be punished harshly, usually with a permaban.
-
- - 9. Ingame administration has the final say in all ingame matters. If problems arise, you can report offending or abusive admins on the forums. If an admin says something was valid, it means it was valid. This is the admin’s way of saying it’s been investigated and found to not breaking any rules; The admin will not reveal ingame information.
-
- - 10. It should go without saying, but if you break the rules (or regularly come very close to breaking them i.e. “toeing the line”), you will be warned, muted, banned, or talked about rudely.
-
-
- Additional Policies
-Roleplay
- Murder is justifiable as long as it was properly escalated. You can’t go from a single rude punch to a knife in the neck. You can, however, go from a single punch to a counter punch to a brawl to using weapons, and so on. Other IC justifications may exist for murder, but these are on a case by case basis. Minor aggravations like demotions, pranks, insults, or thefts are not adequate justification.
- IC in OOC can be a no warning ban of 15 minutes, it can be longer if the IC in OOC is severe. To clarify, this is revealing anything about the current round that others can use in the OOC channel. If you are unsure do not say it.
- Avoid using non character names. If you have a very offensive name or an obviously immersion breaking moniker like 'xenohunter360' you will be asked to change it.
- As long as there is adequate IC backing and it doesn’t happen too often, assisting a traitor is within the rules.
- Admins are not only allowed to run events or otherwise influence the course of rounds, they are encouraged to. They are as much GMs as they are enforcers of the rules, perhaps even moreso.
- Persistent character relationships are acceptable, so long as they’re roleplayed out every round. Wordlessly assisting your OOC friends (or harming your OOC foes) ICly is NOT cool and will be addressed harshly. Roleplaying out your interactions will help you stay on the right side of the rules. How much or how little of previous “shifts” your character recalls is up to their discretion, with the caveat that being a known traitor doesn’t persist past the round it occurred in.
- Griefing on the shuttle can also be a no warning ban scaling up from 15 minutes. Shuttle griefing is attacking people or preventing people boarding before the shuttle has launched for no IC reason.
-
-
-Silicons
- All Silicons are expected to follow their laws to the best of their ability. Failure to do so will likely result in a job ban from all silicon positions.
- Law order determines law priority. In the case of two laws contradicting, the one with the smaller law number wins.
- Asimov silicons are not required to do what players who threaten self-harm demand, unless they choose to interpret law 1 to include that.
-
-
-Command/Security
- Security are expected to use non-lethal force when defending against non-lethal attacks. This of course also means that security are allowed the option to use lethal force when defending against lethal attacks. Getting stunned in a dark maintenance hallway by an assistant is potentially lethal - a clown slipping you outside Medbay, probably not.
- Permabrigging is functionally the same as murder. Anyone who is valid for execution is valid for permabrigging. Anyone who is not justifiably executable is, likewise, not justifiably a candidate for permabrigging. Makeshift permabrigs are treated the same as the official permabrig in terms of rules-enforcement.
- A Captain or acting Captain may execute criminals, traitors, and other known threats to the station should alternatives not prove sufficient. Abuse or misuse of this privilege can lead to job banning or worse.
- Theft, assault, annoyance, false arrest, sentence times etc. are in character matters. Unless it is extremely excessive or griefy, it is not an admin matter.
-
-
-Admin-help
- When you adminhelp do not say things like 'is it valid?' or 'being griefed', give details of what is happening and ideally who is doing it, job and character name.
- If you see someone doing something that seems out of line adminhelp right then, do not wait until round end to see if they are a traitor then adminhelp next round. It makes it a lot harder to deal with.
- Do not lie in PM's and avoid being aggressive, unhelpful or insulting to admins, lying while being questioned over an incident will cause you to receive a longer ban and being consistently insulting or aggressive will get you muted.
-
-
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index c8ae3a5a66a..ad8b1e345b8 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -54,6 +54,30 @@ should be listed in the changelog upon commit tho. Thanks. -->
+
+
7 July 2014
+
Firecage updated:
+
+ - We, of the NanoTrasen Botany Research and Developent(NTBiRD), has some important announcements for the Botany staff aboard our stations.
+ - We have recently released a new strain of Tower Cap. It is now ensured that more planks can be gotten from a single log.
+ - Head Scientist [REDACTED] is thanked for his new strain of Blood Tomatoes. It now not only contains human blood, but also chunks of human flesh!
+ - We have also discovered a way to replant the infamous Cash Trees and 'Eggy' plants. We can now harvest their seeds, and the rare products are inside the fruit shells.
+ - Similar to the new variety of Tower Caps, it is now possible to get various grass flooring depending on the plants potency!
+ - Our sponsors at Knitters United has released a new variation of the botany Aprons and Coveralls which can hold a larger variety of items!
+ - A new version of Plant-B-Gone was produced which are much more lethal to plants, yet at the same time has no extra effect on humans besides the norm.
+
+
+
5 July 2014
+
Firecage updated:
+
+ - Recently the Space Wizard Federation, with some assistance from the Cult of Nar-Sie, recently created a new strain of Killer Tomato. A sad side effect is this effected all current and future Killer Tomato strains in our galaxy. They are now reported to be extremely violent and deadly, use extreme caution when growing them.
+
+
1 July 2014
Rolan7 updated:
diff --git a/icons/mob/screen_ai.dmi b/icons/mob/screen_ai.dmi
new file mode 100644
index 00000000000..d0c18c20e53
Binary files /dev/null and b/icons/mob/screen_ai.dmi differ
diff --git a/icons/obj/harvest.dmi b/icons/obj/harvest.dmi
index 719a588495d..090fa968324 100644
Binary files a/icons/obj/harvest.dmi and b/icons/obj/harvest.dmi differ
diff --git a/interface/interface.dm b/interface/interface.dm
index 4e4aa598e2f..979c4abae41 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -3,33 +3,37 @@
set name = "wiki"
set desc = "Visit the wiki."
set hidden = 1
- if( config.wikiurl )
+ if(config.wikiurl)
if(alert("This will open the wiki in your browser. Are you sure?",,"Yes","No")=="No")
return
src << link(config.wikiurl)
else
- src << "\red The wiki URL is not set in the server configuration."
+ src << "The wiki URL is not set in the server configuration."
return
/client/verb/forum()
set name = "forum"
set desc = "Visit the forum."
set hidden = 1
- if( config.forumurl )
+ if(config.forumurl)
if(alert("This will open the forum in your browser. Are you sure?",,"Yes","No")=="No")
return
src << link(config.forumurl)
else
- src << "\red The forum URL is not set in the server configuration."
+ src << "The forum URL is not set in the server configuration."
return
-#define RULES_FILE "config/rules.html"
/client/verb/rules()
set name = "Rules"
set desc = "Show Server Rules."
set hidden = 1
- src << browse(file(RULES_FILE), "window=rules;size=480x320")
-#undef RULES_FILE
+ if(config.rulesurl)
+ if(alert("This will open the rules in your browser. Are you sure?",,"Yes","No")=="No")
+ return
+ src << link(config.rulesurl)
+ else
+ src << "The rules URL is not set in the server configuration."
+ return
/client/verb/hotkeys_help()
set name = "hotkeys-help"
diff --git a/tgstation.dme b/tgstation.dme
index 2fcb47404d3..25c84926cba 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -68,6 +68,7 @@
#include "code\_onclick\overmind.dm"
#include "code\_onclick\telekinesis.dm"
#include "code\_onclick\hud\_defines.dm"
+#include "code\_onclick\hud\ai.dm"
#include "code\_onclick\hud\alien.dm"
#include "code\_onclick\hud\alien_larva.dm"
#include "code\_onclick\hud\hud.dm"
@@ -1043,7 +1044,6 @@
#include "code\modules\mob\living\simple_animal\friendly\mouse.dm"
#include "code\modules\mob\living\simple_animal\friendly\pug.dm"
#include "code\modules\mob\living\simple_animal\friendly\slime.dm"
-#include "code\modules\mob\living\simple_animal\friendly\tomato.dm"
#include "code\modules\mob\living\simple_animal\hostile\alien.dm"
#include "code\modules\mob\living\simple_animal\hostile\bear.dm"
#include "code\modules\mob\living\simple_animal\hostile\carp.dm"
@@ -1052,6 +1052,7 @@
#include "code\modules\mob\living\simple_animal\hostile\giant_spider.dm"
#include "code\modules\mob\living\simple_animal\hostile\hivebot.dm"
#include "code\modules\mob\living\simple_animal\hostile\hostile.dm"
+#include "code\modules\mob\living\simple_animal\hostile\killertomato.dm"
#include "code\modules\mob\living\simple_animal\hostile\mimic.dm"
#include "code\modules\mob\living\simple_animal\hostile\mining_mobs.dm"
#include "code\modules\mob\living\simple_animal\hostile\mushroom.dm"