Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spaces #279

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bot/C_maths.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ def maths(influx,prefix="!",sender="NaN",debug=True,method="n"):
return "What are you trying to make me do again?"
else:
return "Those are likely to make me hang"

2 changes: 1 addition & 1 deletion bot/D_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@
"version":"[version] Shows the current version of %s." %(Name),
"weather":"[weather <location>] Displays the current weather of the provided location.",
"life":"I cannot help you with that, sorry."}

2 changes: 1 addition & 1 deletion bot/FMLformatter.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def formatter(data):
"_qoptions={",
"};","})();","Categories","Sign up - Password? ", " Net Avenir : gestion publicitaire",
"FMyLife, the book","Available NOW on:","Barnes &amp; Noble"]

for checkable in data:
if checkable in bad:
pass
Expand Down
38 changes: 19 additions & 19 deletions bot/NanoTrasenBot.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

import socket
import irchat


################## END OF DEBUG STUFF ##############
#
# PSYCO
Expand All @@ -47,7 +47,7 @@
print "LINUX: http://psyco.sourceforge.net/download.html"
else:
psyco_exists = True

# </PSYCO>
import C_rtd # rtd
import C_srtd # srtd
Expand Down Expand Up @@ -260,7 +260,7 @@ def RegExpCheckerForWebPages(regexp,data,mode):
if CORE_DATA.DISABLE_ALL_NON_MANDATORY_SOCKET_CONNECTIONS:
pass
else:

def nudgereceiver():
import pickle
global conn,channel
Expand Down Expand Up @@ -376,7 +376,7 @@ def stop(sender,debug=1):
else:
conn.privmsg(channel,"You cannot command me")
return False

def cocheck(command):
global influx
if influx.lower()[0:len(command)] == command:
Expand Down Expand Up @@ -484,7 +484,7 @@ def autoRecv():
print "Connection failed!"
else:
print Name+" is in!"
thread.start_new_thread ( autoRecv, () )
thread.start_new_thread ( autoRecv, () )
sleep(1)
while True:
try:
Expand Down Expand Up @@ -535,7 +535,7 @@ def autoRecv():
if "[\\0x01]" in influx.lower() or "[\0x01]" in influx.lower():
influx = influx.replace("[\\0x01]","")
influx = influx.replace("[\0x01]","")

targetchannel = data[1][1]
if targetchannel == Name:
targetchannel = data[0].split("!")[0]
Expand Down Expand Up @@ -600,7 +600,7 @@ def autoRecv():
if enabled == False:
#FIRST QUIT COMMAND
if truesender in operators and targetchannel==channel:# or "skibiliano" in truesender.lower() and targetchannel==channel:

if cocheck(prefix+"enable"):
enabled = True
if debug:
Expand Down Expand Up @@ -802,7 +802,7 @@ def autoRecv():
if "||From: "+truesender in b:
count += 1
del(tell_list[i][tell_list[i].index(b)])
conn.privmsg(targetchannel, sender+" : All your "+str(count)+" messages have been purged")
conn.privmsg(targetchannel, sender+" : All your "+str(count)+" messages have been purged")
elif influx.split(" ")[0].lower().replace(",","").replace(":","") in SName+[Name.lower()] and "tell" in (influx.lower().split(" ")+[""])[1]:
arg = influx.lower().split(" ")
equalarg = influx.split(" ")
Expand Down Expand Up @@ -859,7 +859,7 @@ def autoRecv():
if "youtube.com/watch?v=" in block:
temporal_list.append(block)
for temdata in temporal_list:

if temdata[0:3] == "you":
temdata = "http://www."+temdata
elif temdata[0:3] == "www":
Expand Down Expand Up @@ -1050,7 +1050,7 @@ def autoRecv():
if highlights:
conn.privmsg(targetchannel,sender+" : "+C_sarcasticball.sarcasticball(influx.lower(),debug,truesender,users,prefix))
else:
conn.privmsg(targetchannel,sender+" : "+C_sarcasticball.sarcasticball(influx.lower(),debug,truesender,nonhighlight_names,prefix))
conn.privmsg(targetchannel,sender+" : "+C_sarcasticball.sarcasticball(influx.lower(),debug,truesender,nonhighlight_names,prefix))
elif influx.lower()[0:len(Name)] == lowname and not influx.lower()[len(Name):].isalpha() or \
influx.split(" ")[0].lower().replace(",","") in SName and not influx.lower()[len(influx.split(" ")[0].lower()):].isalpha():
conn.privmsg(targetchannel, random.choice(["Yea?","I'm here","Ya?","Yah?","Hm?","What?","Mmhm, what?","?","What now?","How may I assist?"]))
Expand All @@ -1066,7 +1066,7 @@ def autoRecv():
conn.privmsg(targetchannel,sender+" : "+C_sarcasticball.sarcasticball(influx.lower(),debug,truesender,users,prefix))
else:
conn.privmsg(targetchannel,sender+" : "+C_sarcasticball.sarcasticball(influx.lower(),debug,truesender,nonhighlight_names,prefix))

elif influx.lower() == prefix+"tm":
if truesender in operators and targetchannel==channel:
marakov = not marakov
Expand Down Expand Up @@ -1185,7 +1185,7 @@ def autoRecv():
if "watch?v=" in i:
arg2.append(i)
arg3 = random.choice(arg2)

conn.privmsg(channel,"Here's a video of '%s' which I found! %s (%s)"%(tag.replace("+"," "),"http://www.youtube.com"+arg3[arg3.find('/watch?v='):arg3.find('/watch?v=')+20],YTCV2("http://www.youtube.com"+arg3[arg3.find('/watch?v='):arg3.find('/watch?v=')+20])))
if truesender.lower() in tell_list.keys():
try:
Expand All @@ -1198,7 +1198,7 @@ def autoRecv():
if dice == 0:
conn.privmsg(targetchannel,"Greetings Master "+sender)
elif dice == 1:
conn.privmsg(targetchannel,"My deepest greetings belong to you, Master "+sender)
conn.privmsg(targetchannel,"My deepest greetings belong to you, Master "+sender)
### IMPORTANT ###
elif influx == "☺VERSION☺":
conn.notice(truesender,"\001VERSION nanotrasen:2:Python 2.6\001")
Expand Down Expand Up @@ -1226,7 +1226,7 @@ def autoRecv():
pass
else:
print "Took",time.time()-looptime,"Seconds to finish loop"

elif data [ 1 ] [ 0 ] == '353':
if connected == False:
connected = True
Expand All @@ -1238,7 +1238,7 @@ def autoRecv():
operators.append(potential_operator[1:])
elif potential_operator[0] == "%":
halfoperators.append(potential_operator[1:])

elif data[1][0] == "QUIT":
sender = data[0].split("!")[0]
print sender+" Has now left the server"
Expand Down Expand Up @@ -1312,7 +1312,7 @@ def autoRecv():
peopleheknows[1].append(data[0].split("!")[1])
with open("peopleheknows.cache","w") as peoplehecache:
pickle.dump(peopleheknows,peoplehecache)

elif data[1][0] == "MODE" and data[1][2] == "+o":
sender = data[1][3]
targetchannel = data[1][1]
Expand Down Expand Up @@ -1390,7 +1390,7 @@ def autoRecv():
pass
else:
halfoperators.append(newname)

elif data[1][0] == "001":
# Skibot is welcomed to the Network
pass
Expand Down Expand Up @@ -1466,7 +1466,7 @@ def autoRecv():
else:
print targetlist[0][0].lower(), "isn't equal to?", data[1][6].lower()
print targetlist

elif data[1][0] == "366":
# End of USERS
pass
Expand Down
2 changes: 1 addition & 1 deletion bot/YTCv3.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def YTCV2(youtube_url,cache=1,debug=0):
tiedosto.close()
tiedosto.close()
return result

if cache == 1:
epoch = time.time()
aha = ["No title for video, could be removed / does not exist at all",epoch]
Expand Down
2 changes: 1 addition & 1 deletion bot/YTCv4.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def YTCV4(youtube_url,cache=1,debug=0):
youtube_url = "http://" + youtube_url
if youtube_url.count("/") + youtube_url.count("\\") < 3:
if len(prev_dict.keys()) > 0:
if Do_not_open == True:
if Do_not_open == True:
tiedosto = open(directory+"YTCache/"+first_two+".tcc","w") #This is a Just In Case
pickle.dump(prev_dict,tiedosto)
tiedosto.close()
Expand Down
2 changes: 1 addition & 1 deletion bot/save_load.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def save(filename,data,dnrw=0):
return False
else:
tiedosto = open(filename,"w")

if "http//" in data:
data = data.replace("http//","http://")
pickle.dump(data,tiedosto)
Expand Down
2 changes: 1 addition & 1 deletion bot/xkcdparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ def xkcd(link):
return newdata
except:
return "NOTHING"

2 changes: 1 addition & 1 deletion code/___DMAPI/tgs/core/core.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/world/proc/SelectTgsApi(tgs_version)
//remove the old 3.0 header
tgs_version = replacetext(tgs_version, "/tg/station 13 Server v", "")

var/list/version_bits = splittext(tgs_version, ".")

var/super = text2num(version_bits[1])
Expand Down
6 changes: 3 additions & 3 deletions code/controllers/configuration_eclipse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/datum/configuration
var/eclipse_config_loaded = FALSE //for things that require this, such as Reginald force spawning

// Shift End Horn
var/shift_end_horn = FALSE //Master Enable
var/shift_end_horn_delay = 48 //Delay, in 1/10 sec
Expand All @@ -16,7 +16,7 @@
var/wl_security = FALSE //Whitelist Security department?
var/wl_silicons = FALSE //Whitelist silicons?
var/wl_admins_too = FALSE //Admins go through the whitelist too?

//Mice and wires
var/mice_wires = FALSE //Mice can eat wires
var/mice_wire_chance = 5 //Chance for a mouse to eat wires on the turf it's on.
Expand Down Expand Up @@ -87,6 +87,6 @@
config.mice_wire_cooldown_rs = TRUE
if("mice_require_engineers")
config.mice_wire_eng_req = TRUE

config.eclipse_config_loaded = TRUE
return 1
2 changes: 1 addition & 1 deletion code/datums/supplypacks/recreation_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
containertype = /obj/structure/largecrate
containername = "NT Humvee Crate"
cost = 500

/datum/supply_pack/recreation/restraints
name = "Recreational Restraints"
contains = list(
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/radio/radio.dm
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ var/global/list/default_medbay_channels = list(
/obj/item/device/radio/talk_into(mob/living/M as mob, message, channel, var/verb = "says", var/datum/language/speaking = null)
if(!on) return 0 // the device has to be on
// Fix for permacell radios, but kinda eh about actually fixing them.

if(no_microphone) return 0 //Eclipse edit: If you can't transmit, don't.
if(!M || !message) return 0

Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/items/weapons/material/material_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ Protectiveness | Armor %

/obj/item/clothing/suit/armor/material/makeshift
name = "sheet armor"
desc = "This appears to be two 'sheets' of a material held together by cable. If the sheets are strong, this could be rather protective."
desc = "This appears to be two 'sheets' of a material held together by cable. If the sheets are strong, this could be rather protective."
icon_state = "material_armor_makeshift"

/obj/item/clothing/suit/armor/material/makeshift/durasteel
Expand All @@ -200,7 +200,7 @@ Protectiveness | Armor %
to_chat(user, "<span class='warning'>This already has enough wires on it.</span>")
return
if(S.use(20))
to_chat(user, "<span class='notice'>You attach several wires to \the [src]. Now it needs another plate.</span>")
to_chat(user, "<span class='notice'>You attach several wires to \the [src]. Now it needs another plate.</span>")
wired = TRUE
icon_state = "[initial(icon_state)]_wired"
return
Expand Down Expand Up @@ -228,7 +228,7 @@ Protectiveness | Armor %
// Used to craft the makeshift helmet
/obj/item/clothing/head/helmet/bucket
name = "bucket"
desc = "It's a bucket with a large hole cut into it. You could wear it on your head and look really stupid."
desc = "It's a bucket with a large hole cut into it. You could wear it on your head and look really stupid."
flags_inv = HIDEEARS|HIDEEYES|BLOCKHAIR
icon_state = "bucket"
armor = list(melee = 5, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
Expand All @@ -241,7 +241,7 @@ Protectiveness | Armor %
if(istype(O, /obj/item/stack/material))
var/obj/item/stack/material/S = O
if(S.use(2))
to_chat(user, "<span class='notice'>You apply some [S.material.use_name] to \the [src]. Hopefully it'll make the makeshift helmet stronger.</span>")
to_chat(user, "<span class='notice'>You apply some [S.material.use_name] to \the [src]. Hopefully it'll make the makeshift helmet stronger.</span>")
var/obj/item/clothing/head/helmet/material/makeshift/helmet = new(null, S.material.name)
user.put_in_hands(helmet)
user.drop_from_inventory(src)
Expand All @@ -259,7 +259,7 @@ Protectiveness | Armor %

/obj/item/clothing/head/helmet/material/makeshift
name = "bucket"
desc = "A bucket with plating applied to the outside. Very crude, but could potentially be rather protective, if \
desc = "A bucket with plating applied to the outside. Very crude, but could potentially be rather protective, if \
it was plated with something strong."
icon_state = "material_armor_makeshift"

Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/weapons/policetape.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ var/list/tape_roll_applications = list()

/obj/item/tape/medical
name = "medical tape"
desc = "A length of medical tape. Do not cross."
desc = "A length of medical tape. Do not cross."
req_access = list(access_medical)
color = COLOR_WHITE

Expand All @@ -82,7 +82,7 @@ var/list/tape_roll_applications = list()

/obj/item/tape/police
name = "police tape"
desc = "A length of police tape. Do not cross."
desc = "A length of police tape. Do not cross."
req_access = list(access_security)
color = COLOR_RED_LIGHT

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/surgery_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
matter = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 5000)
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")

suicide_act(mob/user)
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
viewers(user) << pick("<span class='danger'>\The [user] is slitting [TU.his] wrists with the [src.name]! It looks like [TU.hes] trying to commit suicide.</span>", \
Expand Down
6 changes: 3 additions & 3 deletions code/modules/admin/callproc/callproc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@
if("icon")
current = input("Provide icon for [arguments.len+1]\th argument") as null|icon
if(isnull(current)) return

if("file")
current = input("Pick file:", "File") as null|file
if(isnull(current)) return

if("sound")
current = input("Pick sound:", "Sound") as null|sound
if(isnull(current)) return

if("client")
current = input("Select client for [arguments.len+1]\th argument") as null|anything in clients
if(isnull(current)) return
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/adminhelp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)

if(!msg)
return

msg = sanitize(msg)

//remove out adminhelp verb temporarily to prevent spamming of admins.
Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/verbs/adminhelp_vr.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/datum/admin_help/proc/send2adminchat()
/datum/admin_help/proc/send2adminchat()
if(!config.chat_webhook_url)
return

var/list/adm = get_admin_counts()
var/list/adm = get_admin_counts()
var/list/afkmins = adm["afk"]
var/list/allmins = adm["total"]

Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preference_setup/vore/07_traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
//Statistics for this would be nice
var/english_traits = english_list(new_CS.traits, and_text = ";", comma_text = ";")
log_game("TRAITS [pref.client_ckey]/([character]) with: [english_traits]") //Terrible 'fake' key_name()... but they aren't in the same entity yet

//Any additional non-trait settings can be applied here
new_CS.blood_color = pref.blood_color

Expand Down
2 changes: 0 additions & 2 deletions code/modules/clothing/suits/misc_taur_suits_vr.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


/obj/item/clothing/suit/taur/cloak
name = "taur specific cloak"
desc = "A breezy cloak to distinguish your tauric body from the common beast. It has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits Drakes."
Expand Down
Loading