Merge pull request #407 from skull132/master

Skull's Things, 25FEB2015
This commit is contained in:
skull132
2015-02-25 21:13:15 +02:00
6 changed files with 60 additions and 3 deletions
+4
View File
@@ -86,6 +86,7 @@
var/wikiurl
var/forumurl
var/aurorawikiurl
var/githuburl
//Alert level description
var/alert_desc_green = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced."
@@ -339,6 +340,9 @@
if ("aurorawikiurl")
config.aurorawikiurl = value
if ("githuburl")
config.githuburl = value
if ("guest_jobban")
config.guest_jobban = 1
+2
View File
@@ -36,6 +36,8 @@
..()
/obj/machinery/door/window/Bumped(atom/movable/AM as mob|obj)
if(ispAI(AM)) //So that pAIs can't open all of the windoors forever.
return
if (!( ismob(AM) ))
var/obj/machinery/bot/bot = AM
if(istype(bot))
@@ -337,6 +337,10 @@
card.forceMove(src)
card.screen_loc = null
//Controlling the visibility of sign language.
if(translator_on)
add_language("Sign language", 0)
var/turf/T = get_turf(src)
if(istype(T)) T.visible_message("<b>[src]</b> folds outwards, expanding into a mobile form.")
@@ -439,6 +443,9 @@
card.forceMove(card.loc)
canmove = 0
if(translator_on)
remove_language("Sign language")
/mob/living/silicon/pai/start_pulling(var/atom/movable/AM)
if(istype(AM,/obj/item))
@@ -693,7 +693,6 @@
if(translator_on)
translator_on = 0
remove_language("Sign language")
remove_language("Sinta'unathi")
remove_language("Siik'Maas")
remove_language("Skrellian")
@@ -704,6 +703,9 @@
remove_language("Tradeband")
remove_language("Gutter")
if(canmove) //Easiest way to check whether or not the thing is actually deployed or not, for managing Sign Language.
remove_language("Sign language")
src << "\blue Translator Module toggled OFF."
else
@@ -718,6 +720,8 @@
add_language("Sol Common")
add_language("Tradeband")
add_language("Gutter")
add_language("Sign language", 0)
if(canmove)
add_language("Sign language", 0)
src << "\blue Translator Module toggled ON."
+12
View File
@@ -35,6 +35,18 @@
src << "\red The URL for the Aurorastation wiki is not set in the server configuration."
return
/client/verb/github()
set name = "github"
set desc = "Visit the Aurorastation Github page, where bugs and issues can be reported!"
set hidden = 1
if ( config.githuburl )
if(alert("This will open the Github Issues page in your browser. Are you sure?",,"Yes","No")=="No")
return
src << link(config.githuburl)
else
src << "\red The URL for the server's Github (issues) page is not set in the server configuration."
return
#define RULES_FILE "config/rules.html"
/client/verb/rules()
set name = "Rules"
+29 -1
View File
@@ -1577,6 +1577,34 @@ window "rpane"
is-checked = false
group = "rpanemode"
button-type = pushbutton
elem "githubb"
type = BUTTON
pos = 461,0
size = 67x16
anchor1 = none
anchor2 = none
font-family = ""
font-size = 0
font-style = ""
text-color = #000000
background-color = none
is-visible = true
is-disabled = false
is-transparent = false
is-default = false
border = none
drop-zone = false
right-click = false
saved-params = "is-checked"
on-size = ""
text = "Bug Report"
image = ""
command = "github"
is-flat = false
stretch = false
is-checked = false
group = "rpanemode"
button-type = pushbutton
elem "aurorawikib"
type = BUTTON
pos = 202,0
@@ -1663,7 +1691,7 @@ window "rpane"
button-type = pushbox
elem "browseb"
type = BUTTON
pos = 464,0
pos = 564,0
size = 60x16
anchor1 = none
anchor2 = none