diff --git a/DLLSocket/DLLSocket.cbp b/DLLSocket/DLLSocket.cbp deleted file mode 100644 index 6415a5ebd67..00000000000 --- a/DLLSocket/DLLSocket.cbp +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - diff --git a/DLLSocket/compile.sh b/DLLSocket/compile.sh deleted file mode 100755 index 0ff309bdb9f..00000000000 --- a/DLLSocket/compile.sh +++ /dev/null @@ -1 +0,0 @@ -g++ -static -shared -O3 -fPIC main.cpp -o DLLSocket.so diff --git a/DLLSocket/main.cpp b/DLLSocket/main.cpp deleted file mode 100644 index e3aafb8791a..00000000000 --- a/DLLSocket/main.cpp +++ /dev/null @@ -1,133 +0,0 @@ -// OS-specific networking includes -// ------------------------------- -#ifdef __WIN32 - #include - typedef int socklen_t; -#else - extern "C" { - #include - #include - #include - #include - #include - #include - #include - #include - } - - typedef int SOCKET; - typedef sockaddr_in SOCKADDR_IN; - typedef sockaddr SOCKADDR; - #define SOCKET_ERROR -1 -#endif - -// Socket used for all communications -SOCKET sock; - -// Address of the remote server -SOCKADDR_IN addr; - -// Buffer used to return dynamic strings to the caller -#define BUFFER_SIZE 1024 -char return_buffer[BUFFER_SIZE]; - -// exposed functions -// ------------------------------ - -const char* SUCCESS = "1\0"; // string representing success - -#ifdef __WIN32 - #define DLL_EXPORT __declspec(dllexport) -#else - #define DLL_EXPORT __attribute__ ((visibility ("default"))) -#endif - -// arg1: ip(in the xx.xx.xx.xx format) -// arg2: port(a short) -// return: NULL on failure, SUCCESS otherwise -extern "C" DLL_EXPORT const char* establish_connection(int n, char *v[]) -{ - // extract args - // ------------ - if(n < 2) return 0; - const char* ip = v[0]; - const char* port_s = v[1]; - unsigned short port = atoi(port_s); - - // set up network stuff - // -------------------- - #ifdef __WIN32 - WSADATA wsa; - WSAStartup(MAKEWORD(2,0),&wsa); - #endif - sock = socket(AF_INET,SOCK_DGRAM,0); - - // make the socket non-blocking - // ---------------------------- - #ifdef __WIN32 - unsigned long iMode=1; - ioctlsocket(sock,FIONBIO,&iMode); - #else - fcntl(sock, F_SETFL, O_NONBLOCK); - #endif - - // establish a connection to the server - // ------------------------------------ - memset(&addr,0,sizeof(SOCKADDR_IN)); - addr.sin_family=AF_INET; - addr.sin_port=htons(port); - - // convert the string representation of the ip to a byte representation - addr.sin_addr.s_addr=inet_addr(ip); - - return SUCCESS; -} - -// arg1: string message to send -// return: NULL on failure, SUCCESS otherwise -extern "C" DLL_EXPORT const char* send_message(int n, char *v[]) -{ - // extract the args - if(n < 1) return 0; - const char* msg = v[0]; - - // send the message - int rc = sendto(sock,msg,strlen(msg),0,(SOCKADDR*)&addr,sizeof(SOCKADDR)); - - // check for errors - if (rc != -1) { - return SUCCESS; - } - else { - return 0; - } -} - -// no args -// return: message if any received, NULL otherwise -extern "C" DLL_EXPORT const char* recv_message(int n, char *v[]) -{ - SOCKADDR_IN sender; // we will store the sender address here - - socklen_t sender_byte_length = sizeof(sender); - - // Try receiving messages until we receive one that's valid, or there are no more messages - while(1) { - int rc = recvfrom(sock, return_buffer, BUFFER_SIZE,0,(SOCKADDR*) &sender,&sender_byte_length); - if(rc > 0) { - // we could read something - - if(sender.sin_addr.s_addr != addr.sin_addr.s_addr) { - continue; // not our connection, ignore and try again - } else { - return_buffer[rc] = 0; // 0-terminate the string - return return_buffer; - } - } - else { - break; // no more messages, stop trying to receive - } - } - - return 0; -} diff --git a/DLLSocket/server_controller.py b/DLLSocket/server_controller.py deleted file mode 100644 index 943f37f6777..00000000000 --- a/DLLSocket/server_controller.py +++ /dev/null @@ -1,51 +0,0 @@ -import subprocess -import socket -import urlparse - -UDP_IP="127.0.0.1" -UDP_PORT=8019 - -sock = socket.socket( socket.AF_INET, # Internet - socket.SOCK_DGRAM ) # UDP -sock.bind( (UDP_IP,UDP_PORT) ) - -last_ticker_state = None - -def handle_message(data, addr): - global last_ticker_state - - params = urlparse.parse_qs(data) - print(data) - - try: - if params["type"][0] == "log" and str(params["log"][0]) and str(params["message"][0]): - open(params["log"][0],"a+").write(params["message"][0]+"\n") - except IOError: - pass - except KeyError: - pass - - try: - if params["type"][0] == "ticker_state" and str(params["message"][0]): - last_ticker_state = str(params["message"][0]) - except KeyError: - pass - - try: - if params["type"][0] == "startup" and last_ticker_state: - open("crashlog.txt","a+").write("Server exited, last ticker state was: "+last_ticker_state+"\n") - except KeyError: - pass - -sock.settimeout(60*6) # 10 minute timeout -while True: - try: - data, addr = sock.recvfrom( 1024 ) # buffer size is 1024 bytes - handle_message(data,addr) - except socket.timeout: - # try to start the server again - print("Server timed out.. attempting restart.") - if last_ticker_state: - open("crashmsg.txt","a+").write("Server crashed, trying to reboot. last ticker state: "+last_ticker_state+"\n") - subprocess.call("killall -9 DreamDaemon") - subprocess.call("./start") \ No newline at end of file diff --git a/_maps/map_files/MetaStation/z2.dmm b/_maps/map_files/MetaStation/z2.dmm index fe4c3a6e2e3..79367d5c073 100644 --- a/_maps/map_files/MetaStation/z2.dmm +++ b/_maps/map_files/MetaStation/z2.dmm @@ -1312,7 +1312,7 @@ }, /area/vox_station) "dA" = ( -/obj/vox/win_button, +/obj/machinery/vox_win_button, /turf/unsimulated/floor{ tag = "icon-light_on"; icon_state = "light_on" diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm index 987c1ee28b4..4950ddf2763 100644 --- a/_maps/map_files/cyberiad/z2.dmm +++ b/_maps/map_files/cyberiad/z2.dmm @@ -109,7 +109,7 @@ }, /area/holodeck/source_wildlife) "ay" = ( -/obj/vox/win_button, +/obj/machinery/vox_win_button, /turf/unsimulated/floor/vox{ icon_state = "light_on" }, diff --git a/code/game/area/Dynamic areas.dm b/code/game/area/dynamic_areas.dm similarity index 100% rename from code/game/area/Dynamic areas.dm rename to code/game/area/dynamic_areas.dm diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/ss13_areas.dm similarity index 100% rename from code/game/area/Space Station 13 areas.dm rename to code/game/area/ss13_areas.dm diff --git a/code/game/gamemodes/devil/devil agent/devil_agent.dm b/code/game/gamemodes/devil/devil_agent/devil_agent.dm similarity index 100% rename from code/game/gamemodes/devil/devil agent/devil_agent.dm rename to code/game/gamemodes/devil/devil_agent/devil_agent.dm diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index f95702e7f28..ff4d1720de6 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -287,17 +287,17 @@ GLOBAL_LIST_EMPTY(cortical_stacks) //Stacks for 'leave nobody behind' objective. return ..() -/obj/vox/win_button +/obj/machinery/vox_win_button name = "shoal contact computer" desc = "Used to contact the Vox Shoal, generally to arrange for pickup." icon = 'icons/obj/computer.dmi' icon_state = "tcstation" -/obj/vox/win_button/New() +/obj/machinery/vox_win_button/New() . = ..() overlays += icon('icons/obj/computer.dmi', "syndie") -/obj/vox/win_button/attack_hand(mob/user) +/obj/machinery/vox_win_button/attack_hand(mob/user) if(!GAMEMODE_IS_HEIST || (world.time < 10 MINUTES)) //has to be heist, and at least ten minutes into the round to_chat(user, "\The [src] does not appear to have a connection.") return 0 diff --git a/code/game/objects/items/stacks/stack_recipe.dm b/code/game/objects/items/stacks/stack_recipe.dm index 2a2e91ef599..51970297281 100644 --- a/code/game/objects/items/stacks/stack_recipe.dm +++ b/code/game/objects/items/stacks/stack_recipe.dm @@ -24,27 +24,27 @@ src.on_floor = on_floor src.window_checks = window_checks -/datum/stack_recipe/proc/post_build(var/obj/item/stack/S, var/obj/result) +/datum/stack_recipe/proc/post_build(obj/item/stack/S, obj/result) return /* Special Recipes */ /datum/stack_recipe/cable_restraints -/datum/stack_recipe/cable_restraints/post_build(var/obj/item/stack/S, var/obj/result) +/datum/stack_recipe/cable_restraints/post_build(obj/item/stack/S, obj/result) if(istype(result, /obj/item/restraints/handcuffs/cable)) result.color = S.color ..() /datum/stack_recipe/dangerous -/datum/stack_recipe/dangerous/post_build(/obj/item/stack/S, /obj/result) +/datum/stack_recipe/dangerous/post_build(obj/item/stack/S, obj/result) var/turf/targ = get_turf(usr) message_admins("[title] made by [key_name_admin(usr)](?) in [get_area(usr)] [ADMIN_COORDJMP(targ)]!",0,1) log_game("[title] made by [key_name_admin(usr)] at [get_area(usr)] [targ.x], [targ.y], [targ.z].") ..() /datum/stack_recipe/rods -/datum/stack_recipe/rods/post_build(var/obj/item/stack/S, var/obj/result) +/datum/stack_recipe/rods/post_build(obj/item/stack/S, obj/result) if(istype(result, /obj/item/stack/rods)) var/obj/item/stack/rods/R = result R.update_icon() diff --git a/code/game/objects/items/weapons/fireworks.dm b/code/game/objects/items/weapons/fireworks.dm deleted file mode 100644 index 906c4f3fef7..00000000000 --- a/code/game/objects/items/weapons/fireworks.dm +++ /dev/null @@ -1,67 +0,0 @@ -/obj/item/firework - name = "fireworks" - icon = 'icons/obj/fireworks.dmi' - icon_state = "rocket_0" - var/litzor = 0 - var/datum/effect_system/sparkle_spread/S - -/obj/item/firework/attackby(obj/item/W,mob/user, params) - if(litzor) - return - if(is_hot(W)) - for(var/mob/M in viewers(user)) - to_chat(M, "[user] lits \the [src]") - litzor = 1 - icon_state = "rocket_1" - S = new() - S.set_up(5,0,src.loc) - sleep(30) - if(ismob(src.loc) || isobj(src.loc)) - S.attach(src.loc) - S.start() - qdel(src) - -/obj/item/sparkler - name = "sparkler" - icon = 'icons/obj/fireworks.dmi' - icon_state = "sparkler_0" - var/litzor = 0 - -/obj/item/sparkler/attackby(obj/item/W,mob/user, params) - if(litzor) - return - if(is_hot(W)) - for(var/mob/M in viewers(user)) - to_chat(M, "[user] lits \the [src]") - litzor = 1 - icon_state = "sparkler_1" - var/b = rand(5,9) - for(var/xy, xy<=b, xy++) - do_sparks(1, 0, loc) - sleep(10) - qdel(src) - -// TODO: Refactor this into a proper locker or something -// Or just axe the system. This code is 7 years old -/obj/crate/fireworks - name = "Fireworks!" - -/obj/crate/fireworks/New() - new /obj/item/sparkler(src) - new /obj/item/sparkler(src) - new /obj/item/sparkler(src) - new /obj/item/sparkler(src) - new /obj/item/sparkler(src) - new /obj/item/sparkler(src) - new /obj/item/sparkler(src) - new /obj/item/sparkler(src) - new /obj/item/firework(src) - new /obj/item/firework(src) - new /obj/item/firework(src) - new /obj/item/firework(src) - new /obj/item/firework(src) - new /obj/item/firework(src) - new /obj/item/firework(src) - new /obj/item/firework(src) - new /obj/item/firework(src) - new /obj/item/firework(src) diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 52b70590ee4..715c3754fc6 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -1,3 +1,4 @@ +// TODO: Refactor these into spawners /obj/random name = "Random Object" desc = "This item type is used to spawn random objects at round-start" diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/db_ban/functions.dm similarity index 100% rename from code/modules/admin/DB ban/functions.dm rename to code/modules/admin/db_ban/functions.dm diff --git a/code/modules/client/client defines.dm b/code/modules/client/client_defines.dm similarity index 100% rename from code/modules/client/client defines.dm rename to code/modules/client/client_defines.dm diff --git a/code/modules/client/client procs.dm b/code/modules/client/client_procs.dm similarity index 100% rename from code/modules/client/client procs.dm rename to code/modules/client/client_procs.dm diff --git a/code/modules/economy/POS.dm b/code/modules/economy/POS.dm deleted file mode 100644 index 60b774a2a3d..00000000000 --- a/code/modules/economy/POS.dm +++ /dev/null @@ -1,537 +0,0 @@ -/************************ -* Point Of Sale -* -* Takes cash or credit. -*************************/ - -/line_item - parent_type = /datum - - var/name = "" - var/price = 0 // Per unit - var/units = 0 - -GLOBAL_VAR_INIT(current_pos_id, 1) -GLOBAL_VAR_INIT(pos_sales, 0) - -#define RECEIPT_HEADER {" - - - - -"} -#define POS_HEADER {" - - - - -"} - -#define POS_TAX_RATE 0.10 // 10% - -#define POS_SCREEN_LOGIN 0 -#define POS_SCREEN_ORDER 1 -#define POS_SCREEN_FINALIZE 2 -#define POS_SCREEN_PRODUCTS 3 -#define POS_SCREEN_IMPORT 4 -#define POS_SCREEN_EXPORT 5 -#define POS_SCREEN_SETTINGS 6 -/obj/machinery/pos - icon = 'icons/obj/machines/pos.dmi' - icon_state = "pos" - density = 0 - name = "point of sale" - desc = "Also known as a cash register, or, more commonly, \"robbery magnet\"." - - var/id = 0 - var/sales = 0 - var/department - var/mob/logged_in - var/datum/money_account/linked_account - - var/credits_held = 0 - var/credits_needed = 0 - - var/list/products = list() // name = /line_item - var/list/line_items = list() // # = /line_item - - var/screen=POS_SCREEN_LOGIN - -/obj/machinery/pos/New() - ..() - id = GLOB.current_pos_id++ - if(department) - linked_account = GLOB.department_accounts[department] - else - linked_account = GLOB.station_account - update_icon() - -/obj/machinery/pos/proc/AddToOrder(var/name, var/units) - if(!(name in products)) - return 0 - var/line_item/LI = products[name] - var/line_item/LIC = new - LIC.name=LI.name - LIC.price=LI.price - LIC.units=units - line_items.Add(LIC) - -/obj/machinery/pos/proc/RemoveFromOrder(var/order_id) - line_items.Cut(order_id,order_id+1) - -/obj/machinery/pos/proc/NewOrder() - line_items.Cut() - -/obj/machinery/pos/proc/PrintReceipt(var/order_id) - var/receipt = {"[RECEIPT_HEADER]
POINT OF SALE #[id]
- Paying to: [linked_account.owner_name]
- Cashier: [logged_in]
"} - if(myArea) - receipt += myArea.name - receipt += "
" - receipt += {"
-
[station_time_timestamp()], [GLOB.current_date_string]
- - - - - - - "} - var/subtotal=0 - for(var/i=1;i<=line_items.len;i++) - var/line_item/LI = line_items[i] - var/linetotal=LI.units*LI.price - receipt += "" - subtotal += linetotal - var/taxes = POS_TAX_RATE*subtotal - receipt += {" - - - - - - "} - receipt += {" - - "} - receipt += "
ItemAmountUnit PriceLine Total
[LI.name][LI.units]$[num2septext(LI.price)]$[num2septext(linetotal)]
SUBTOTAL$[num2septext(subtotal)]
TAXES$[num2septext(taxes)]
TOTAL$[num2septext(taxes+subtotal)] -
" - - playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) - var/obj/item/paper/P = new(loc) - P.name="Receipt #[id]-[++sales]" - P.info=receipt - - P = new(loc) - P.name="Receipt #[id]-[sales] (Cashier Copy)" - P.info=receipt - - -/obj/machinery/pos/proc/LoginScreen() - return "
Please swipe ID to log in.
" - -/obj/machinery/pos/proc/OrderScreen() - var/receipt = {"
- POS Info - POINT OF SALE #[id]
- Paying to: [linked_account.owner_name]
- Cashier: [logged_in]
"} - if(myArea) - receipt += myArea.name - receipt += "
" - receipt += {"
Order Data -
- - - - - - - - - "} - var/subtotal=0 - if(line_items.len>0) - for(var/i=1;i<=line_items.len;i++) - var/line_item/LI = line_items[i] - var/linetotal=LI.units*LI.price - receipt += {" - - - - - - "} - subtotal += linetotal - var/taxes = POS_TAX_RATE*subtotal - var/presets = "(No presets available)" - if(products.len>0) - presets = {"" - receipt += {" - - - - - - - - - - - "} - receipt += {" - - "} - receipt += {"
ItemAmountUnit PriceLine Total...
[LI.name][LI.units]$[num2septext(LI.price)]$[num2septext(linetotal)]×
[presets] units
SUBTOTAL$[num2septext(subtotal)]
TAXES$[num2septext(taxes)]
TOTAL$[num2septext(taxes+subtotal)] -
- - -
-
"} - return receipt - -/obj/machinery/pos/proc/ProductsScreen() - var/dat={"
Product List -
- - - - - - - - "} - for(var/i in products) - var/line_item/LI = products[i] - dat += {" - - - - - "} - dat += {"
ItemUnit Price# Sold...
[LI.name]$[num2septext(LI.price)][LI.units]×
- New Product:
-
- $
-
- Import | Export -
-
"} - return dat - -/obj/machinery/pos/proc/ExportScreen() - var/dat={"
Export Products as CSV - - OK -
"} - return dat - -/obj/machinery/pos/proc/ImportScreen() - var/dat={"
- Import Products as CSV -
- - -

Data must be in the form of a CSV, with no headers or quotation marks.

-

First column must be product names, second must be prices as an unformatted number (####.##)

-

Deviations from this format will result in your import being rejected.

- -
-
"} - return dat - -/obj/machinery/pos/proc/FinalizeScreen() - return "
Waiting for Credit
Cancel
" - -/obj/machinery/pos/proc/SettingsScreen() - var/dat={"
- -
- Account Settings -
- Payable Account: -
-
-
- Locality Settings -
- Tax Rate: % (LOCKED) -
-
- -
"} - return dat - -/obj/machinery/pos/update_icon() - overlays = 0 - if(stat & (NOPOWER|BROKEN)) return - if(logged_in) - overlays += "pos-working" - else - overlays += "pos-standby" - -/obj/machinery/pos/attack_hand(var/mob/user) - user.set_machine(src) - var/logindata="" - if(logged_in) - logindata={"[logged_in.name]"} - var/dat = POS_HEADER + {" -
- [station_time_timestamp()], [GLOB.current_date_string]
- [logindata] - Order | - Products | - Settings -
"} - switch(screen) - if(POS_SCREEN_LOGIN) dat += LoginScreen() - if(POS_SCREEN_ORDER) dat += OrderScreen() - if(POS_SCREEN_FINALIZE) dat += FinalizeScreen() - if(POS_SCREEN_PRODUCTS) dat += ProductsScreen() - if(POS_SCREEN_EXPORT) dat += ExportScreen() - if(POS_SCREEN_IMPORT) dat += ImportScreen() - if(POS_SCREEN_SETTINGS) dat += SettingsScreen() - - dat += "" - // END AUTOFIX - user << browse(dat, "window=pos") - onclose(user, "pos") - return - -/obj/machinery/pos/proc/say(var/text) - src.visible_message("[bicon(src)] [name] states, \"[text]\"") - -/obj/machinery/pos/Topic(var/href, var/list/href_list) - if(..(href,href_list)) return - if("logout" in href_list) - if(alert(src, "You sure you want to log out?", "Confirm", "Yes", "No")!="Yes") return - logged_in=null - screen=POS_SCREEN_LOGIN - update_icon() - src.attack_hand(usr) - return - if(usr != logged_in) - to_chat(usr, "[logged_in.name] is already logged in. You cannot use this machine until they log out.") - return - if("act" in href_list) - switch(href_list["act"]) - if("Reset") - NewOrder() - screen=POS_SCREEN_ORDER - if("Finalize Sale") - var/subtotal=0 - if(line_items.len>0) - for(var/i=1;i<=line_items.len;i++) - var/line_item/LI = line_items[i] - subtotal += LI.units*LI.price - var/taxes = POS_TAX_RATE*subtotal - credits_needed=taxes+subtotal - say("Your total is $[num2septext(credits_needed)]. Please insert credit chips or swipe your ID.") - screen=POS_SCREEN_FINALIZE - if("Add Product") - var/line_item/LI = new - LI.name=sanitize(href_list["name"]) - LI.price=text2num(href_list["price"]) - products["[products.len+1]"]=LI - if("Add to Order") - AddToOrder(href_list["preset"],text2num(href_list["units"])) - if("Add Products") - for(var/list/line in splittext(href_list["csv"],"\n")) - var/list/cells = splittext(line,",") - if(cells.len<2) - to_chat(usr, "The CSV must have at least two columns: Product Name, followed by Price (as a number).") - src.attack_hand(usr) - return - var/line_item/LI = new - LI.name=sanitize(cells[1]) - LI.price=text2num(cells[2]) - products["[products.len+1]"]=LI - if("Export Products") - screen=POS_SCREEN_EXPORT - if("Import Products") - screen=POS_SCREEN_IMPORT - if("Save Settings") - var/datum/money_account/new_linked_account = get_money_account(text2num(href_list["payableto"]),z) - if(!new_linked_account) - to_chat(usr, "Unable to link new account.") - else - linked_account = new_linked_account - screen=POS_SCREEN_SETTINGS - else if("screen" in href_list) - screen=text2num(href_list["screen"]) - else if("rmproduct" in href_list) - products.Remove(href_list["rmproduct"]) - else if("removefromorder" in href_list) - RemoveFromOrder(text2num(href_list["removefromorder"])) - else if("setunits" in href_list) - var/lid = text2num(href_list["setunits"]) - var/newunits = input(usr,"Enter the units sold.") as num - if(!newunits) return - var/line_item/LI = line_items[lid] - LI.units = newunits - line_items[lid]=LI - else if("setpname" in href_list) - var/newtext = sanitize(input(usr,"Enter the product's name.")) - if(!newtext) return - var/pid = href_list["setpname"] - var/line_item/LI = products[pid] - LI.name = newtext - products[pid]=LI - else if("setprice" in href_list) - var/newprice = input(usr,"Enter the product's price.") as num - if(!newprice) return - var/pid = href_list["setprice"] - var/line_item/LI = products[pid] - LI.price = newprice - products[pid]=LI - src.attack_hand(usr) - -/obj/machinery/pos/attackby(var/atom/movable/A, var/mob/user, params) - if(istype(A,/obj/item/card/id)) - var/obj/item/card/id/I = A - if(!logged_in) - user.visible_message("The machine beeps, and logs you in","You hear a beep.") - logged_in = user - screen=POS_SCREEN_ORDER - update_icon() - src.attack_hand(user) //why'd you use usr nexis, why - return - else - if(!linked_account) - visible_message("The machine buzzes, and flashes \"NO LINKED ACCOUNT\" on the screen.","You hear a buzz.") - flick(src,"pos-error") - return - if(screen!=POS_SCREEN_FINALIZE) - visible_message("The machine buzzes.","You hear a buzz.") - flick(src,"pos-error") - return - var/datum/money_account/acct = get_card_account(I) - if(!acct) - visible_message("The machine buzzes, and flashes \"NO ACCOUNT\" on the screen.","You hear a buzz.") - flick(src,"pos-error") - return - if(credits_needed > acct.money) - visible_message("The machine buzzes, and flashes \"NOT ENOUGH FUNDS\" on the screen.","You hear a buzz.") - flick(src,"pos-error") - return - visible_message("The machine beeps, and begins printing a receipt","You hear a beep.") - PrintReceipt() - NewOrder() - acct.charge(credits_needed,linked_account,"Purchase at POS #[id].") - credits_needed=0 - screen=POS_SCREEN_ORDER - else if(istype(A, /obj/item/stack/spacecash)) - if(!linked_account) - visible_message("The machine buzzes, and flashes \"NO LINKED ACCOUNT\" on the screen.","You hear a buzz.") - flick(src,"pos-error") - return - if(!logged_in || screen!=POS_SCREEN_FINALIZE) - visible_message("The machine buzzes.","You hear a buzz.") - flick(src,"pos-error") - return - var/obj/item/stack/spacecash/C = A - credits_held += C.amount - if(credits_held >= credits_needed) - visible_message("The machine beeps, and begins printing a receipt","You hear a beep and the sound of paper being shredded.") - PrintReceipt() - NewOrder() - credits_held -= credits_needed - credits_needed=0 - screen=POS_SCREEN_ORDER - if(credits_held) - new /obj/item/stack/spacecash(loc, credits_held) - credits_held=0 - return - return ..() diff --git a/code/modules/security_levels/keycard authentication.dm b/code/modules/security_levels/keycard_authentication.dm similarity index 100% rename from code/modules/security_levels/keycard authentication.dm rename to code/modules/security_levels/keycard_authentication.dm diff --git a/code/modules/security_levels/security levels.dm b/code/modules/security_levels/security_levels.dm similarity index 100% rename from code/modules/security_levels/security levels.dm rename to code/modules/security_levels/security_levels.dm diff --git a/paradise.dme b/paradise.dme index ef51ec6d3a7..4352a07ef6c 100644 --- a/paradise.dme +++ b/paradise.dme @@ -469,8 +469,8 @@ #include "code\game\world.dm" #include "code\game\area\ai_monitored.dm" #include "code\game\area\areas.dm" -#include "code\game\area\Dynamic areas.dm" -#include "code\game\area\Space Station 13 areas.dm" +#include "code\game\area\dynamic_areas.dm" +#include "code\game\area\ss13_areas.dm" #include "code\game\area\areas\depot-areas.dm" #include "code\game\area\areas\mining.dm" #include "code\game\area\areas\ruins\lavaland.dm" @@ -548,7 +548,7 @@ #include "code\game\gamemodes\devil\game_mode.dm" #include "code\game\gamemodes\devil\objectives.dm" #include "code\game\gamemodes\devil\contracts\friend.dm" -#include "code\game\gamemodes\devil\devil agent\devil_agent.dm" +#include "code\game\gamemodes\devil\devil_agent\devil_agent.dm" #include "code\game\gamemodes\devil\imp\imp.dm" #include "code\game\gamemodes\devil\true_devil\_true_devil.dm" #include "code\game\gamemodes\devil\true_devil\inventory.dm" @@ -963,7 +963,6 @@ #include "code\game\objects\items\weapons\dnascrambler.dm" #include "code\game\objects\items\weapons\explosives.dm" #include "code\game\objects\items\weapons\extinguisher.dm" -#include "code\game\objects\items\weapons\fireworks.dm" #include "code\game\objects\items\weapons\flamethrower.dm" #include "code\game\objects\items\weapons\garrote.dm" #include "code\game\objects\items\weapons\gift_wrappaper.dm" @@ -1202,7 +1201,7 @@ #include "code\modules\admin\stickyban.dm" #include "code\modules\admin\topic.dm" #include "code\modules\admin\watchlist.dm" -#include "code\modules\admin\DB ban\functions.dm" +#include "code\modules\admin\db_ban\functions.dm" #include "code\modules\admin\permissionverbs\permissionedit.dm" #include "code\modules\admin\tickets\adminticketsverbs.dm" #include "code\modules\admin\tickets\mentorticketsverbs.dm" @@ -1324,8 +1323,8 @@ #include "code\modules\buildmode\submodes\throwing.dm" #include "code\modules\buildmode\submodes\variable_edit.dm" #include "code\modules\client\asset_cache.dm" -#include "code\modules\client\client defines.dm" -#include "code\modules\client\client procs.dm" +#include "code\modules\client\client_defines.dm" +#include "code\modules\client\client_procs.dm" #include "code\modules\client\message.dm" #include "code\modules\client\view.dm" #include "code\modules\client\preference\preferences.dm" @@ -1430,7 +1429,6 @@ #include "code\modules\economy\Economy_TradeDestinations.dm" #include "code\modules\economy\EFTPOS.dm" #include "code\modules\economy\Job_Departments.dm" -#include "code\modules\economy\POS.dm" #include "code\modules\economy\utils.dm" #include "code\modules\error_handler\error_handler.dm" #include "code\modules\error_handler\error_viewer.dm" @@ -2341,8 +2339,8 @@ #include "code\modules\ruins\lavalandruin_code\syndicate_base.dm" #include "code\modules\ruins\objects_and_mobs\gym.dm" #include "code\modules\ruins\objects_and_mobs\necropolis_gate.dm" -#include "code\modules\security_levels\keycard authentication.dm" -#include "code\modules\security_levels\security levels.dm" +#include "code\modules\security_levels\keycard_authentication.dm" +#include "code\modules\security_levels\security_levels.dm" #include "code\modules\shuttle\assault_pod.dm" #include "code\modules\shuttle\emergency.dm" #include "code\modules\shuttle\ert.dm" diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM.sln b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM.sln deleted file mode 100644 index 22ed586bbbf..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnstandardnessTestForDM", "UnstandardnessTestForDM\UnstandardnessTestForDM.csproj", "{A0EEBFC9-41D4-474D-853D-126AFDFB82DE}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A0EEBFC9-41D4-474D-853D-126AFDFB82DE}.Debug|x86.ActiveCfg = Debug|x86 - {A0EEBFC9-41D4-474D-853D-126AFDFB82DE}.Debug|x86.Build.0 = Debug|x86 - {A0EEBFC9-41D4-474D-853D-126AFDFB82DE}.Release|x86.ActiveCfg = Release|x86 - {A0EEBFC9-41D4-474D-853D-126AFDFB82DE}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM.suo b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM.suo deleted file mode 100644 index e62a5089375..00000000000 Binary files a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM.suo and /dev/null differ diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.Designer.cs b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.Designer.cs deleted file mode 100644 index 5ea6e86aa7a..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.Designer.cs +++ /dev/null @@ -1,160 +0,0 @@ -namespace UnstandardnessTestForDM -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.button1 = new System.Windows.Forms.Button(); - this.listBox1 = new System.Windows.Forms.ListBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.listBox2 = new System.Windows.Forms.ListBox(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.panel1.SuspendLayout(); - this.SuspendLayout(); - // - // button1 - // - this.button1.Location = new System.Drawing.Point(12, 12); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(222, 23); - this.button1.TabIndex = 0; - this.button1.Text = "Locate all #defines"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // listBox1 - // - this.listBox1.FormattingEnabled = true; - this.listBox1.Location = new System.Drawing.Point(12, 82); - this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(696, 160); - this.listBox1.TabIndex = 1; - this.listBox1.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged); - // - // panel1 - // - this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel1.Controls.Add(this.listBox2); - this.panel1.Controls.Add(this.label4); - this.panel1.Controls.Add(this.label3); - this.panel1.Controls.Add(this.label2); - this.panel1.Controls.Add(this.label1); - this.panel1.Location = new System.Drawing.Point(12, 297); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(696, 244); - this.panel1.TabIndex = 2; - // - // listBox2 - // - this.listBox2.FormattingEnabled = true; - this.listBox2.Location = new System.Drawing.Point(8, 71); - this.listBox2.Name = "listBox2"; - this.listBox2.Size = new System.Drawing.Size(683, 160); - this.listBox2.TabIndex = 4; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(5, 55); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(69, 13); - this.label4.TabIndex = 3; - this.label4.Text = "Referenced: "; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(5, 42); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(40, 13); - this.label3.TabIndex = 2; - this.label3.Text = "Value: "; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(5, 29); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(61, 13); - this.label2.TabIndex = 1; - this.label2.Text = "Defined in: "; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label1.Location = new System.Drawing.Point(3, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(79, 29); - this.label1.TabIndex = 0; - this.label1.Text = "label1"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(9, 38); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(81, 13); - this.label5.TabIndex = 3; - this.label5.Text = "Files searched: "; - // - // Form1 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(720, 553); - this.Controls.Add(this.label5); - this.Controls.Add(this.panel1); - this.Controls.Add(this.listBox1); - this.Controls.Add(this.button1); - this.Name = "Form1"; - this.Text = "Unstandardness Test For DM"; - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; - public System.Windows.Forms.ListBox listBox2; - public System.Windows.Forms.Label label5; - public System.Windows.Forms.ListBox listBox1; - } -} - diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.cs b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.cs deleted file mode 100644 index 4966c3f0c18..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.cs +++ /dev/null @@ -1,484 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; -using System.Collections; -using System.IO; - -namespace UnstandardnessTestForDM -{ - public partial class Form1 : Form - { - DMSource source; - - public Form1() - { - InitializeComponent(); - source = new DMSource(); - source.mainform = this; - } - - private void button1_Click(object sender, EventArgs e) - { - source.find_all_defines(); - generate_define_report(); - } - - public void generate_define_report() - { - - TextWriter tw = new StreamWriter("DEFINES REPORT.txt"); - - tw.WriteLine("Unstandardness Test For DM report for DEFINES"); - tw.WriteLine("Generated on " + DateTime.Now); - tw.WriteLine("Total number of defines " + source.defines.Count()); - tw.WriteLine("Total number of Files " + source.filessearched); - tw.WriteLine("Total number of references " + source.totalreferences); - tw.WriteLine("Total number of errorous defines " + source.errordefines); - tw.WriteLine("------------------------------------------------"); - - foreach (Define d in source.defines) - { - tw.WriteLine(d.name); - tw.WriteLine("\tValue: " + d.value); - tw.WriteLine("\tComment: " + d.comment); - tw.WriteLine("\tDefined in: " + d.location + " : " + d.line); - tw.WriteLine("\tNumber of references: " + d.references.Count()); - foreach (String s in d.references) - { - tw.WriteLine("\t\t" + s); - } - } - - tw.WriteLine("------------------------------------------------"); - tw.WriteLine("SUCCESS"); - - tw.Close(); - - } - - private void listBox1_SelectedIndexChanged(object sender, EventArgs e) - { - try - { - Define d = (Define)listBox1.Items[listBox1.SelectedIndex]; - label1.Text = d.name; - label2.Text = "Defined in: " + d.location + " : " + d.line; - label3.Text = "Value: " + d.value; - label4.Text = "References: " + d.references.Count(); - listBox2.Items.Clear(); - foreach (String s in d.references) - { - listBox2.Items.Add(s); - } - - } - catch (Exception ex) { Console.WriteLine("ERROR HERE: " + ex.Message); } - } - - - } - - public class DMSource - { - public List defines; - public const int FLAG_DEFINE = 1; - public Form1 mainform; - - public int filessearched = 0; - public int totalreferences = 0; - public int errordefines = 0; - - public List filenames; - - public DMSource() - { - defines = new List(); - filenames = new List(); - } - - public void find_all_defines() - { - find_all_files(); - foreach(String filename in filenames){ - searchFileForDefines(filename); - } - - } - - public void find_all_files() - { - filenames = new List(); - String dmefilename = ""; - - foreach (string f in Directory.GetFiles(".")) - { - if (f.ToLower().EndsWith(".dme")) - { - dmefilename = f; - break; - } - } - - if (dmefilename.Equals("")) - { - MessageBox.Show("dme file not found"); - return; - } - - using (var reader = File.OpenText(dmefilename)) - { - String s; - while (true) - { - s = reader.ReadLine(); - - if (!(s is String)) - break; - - if (s.StartsWith("#include")) - { - int start = s.IndexOf("\"")+1; - s = s.Substring(start, s.Length - 11); - - if (s.EndsWith(".dm")) - { - filenames.Add(s); - } - } - - s = s.Trim(' '); - if (s == "") { continue; } - } - reader.Close(); - } - } - - - public void DirSearch(string sDir, int flag) - { - try - { - foreach (string d in Directory.GetDirectories(sDir)) - { - foreach (string f in Directory.GetFiles(d)) - { - if (f.ToLower().EndsWith(".dm")) - { - if ((flag & FLAG_DEFINE) > 0) - { - searchFileForDefines(f); - } - } - } - DirSearch(d, flag); - } - } - catch (System.Exception excpt) - { - Console.WriteLine("ERROR IN DIRSEARCH"); - Console.WriteLine(excpt.Message); - Console.WriteLine(excpt.Data); - Console.WriteLine(excpt.ToString()); - Console.WriteLine(excpt.StackTrace); - Console.WriteLine("END OF ERROR IN DIRSEARCH"); - } - } - - //DEFINES - public void searchFileForDefines(String fileName) - { - filessearched++; - FileInfo f = new FileInfo(fileName); - List lines = new List(); - List lines_without_comments = new List(); - - mainform.label5.Text = "Files searched: " + filessearched + "; Defines found: " + defines.Count() + "; References found: " + totalreferences + "; Errorous defines: " + errordefines; - mainform.label5.Refresh(); - - //This code segment reads the file and stores it into the lines variable. - using (var reader = File.OpenText(fileName)) - { - try - { - String s; - while (true) - { - s = reader.ReadLine(); - lines.Add(s); - s = s.Trim(' '); - if (s == "") { continue; } - } - } - catch { } - reader.Close(); - } - - mainform.listBox1.Items.Add("ATTEMPTING: " + fileName); - lines_without_comments = remove_comments(lines); - - /*TextWriter tw = new StreamWriter(fileName); - foreach (String s in lines_without_comments) - { - tw.WriteLine(s); - } - tw.Close(); - mainform.listBox1.Items.Add("REWRITE: "+fileName);*/ - - try - { - for (int i = 0; i < lines_without_comments.Count; i++) - { - String line = lines_without_comments[i]; - - if (!(line is string)) - continue; - - //Console.WriteLine("LINE: " + line); - - foreach (Define define in defines) - { - - if (line.IndexOf(define.name) >= 0) - { - define.references.Add(fileName + " : " + i); - totalreferences++; - } - } - - if( line.ToLower().IndexOf("#define") >= 0 ) - { - line = line.Trim(); - line = line.Replace('\t', ' '); - //Console.WriteLine("LINE = "+line); - String[] slist = line.Split(' '); - if(slist.Length >= 3){ - //slist[0] has the value of "#define" - String name = slist[1]; - String value = slist[2]; - - for (int j = 3; j < slist.Length; j++) - { - value += " " + slist[j]; - //Console.WriteLine("LISTITEM["+j+"] = "+slist[j]); - } - - value = value.Trim(); - - String comment = ""; - - if (value.IndexOf("//") >= 0) - { - comment = value.Substring(value.IndexOf("//")); - value = value.Substring(0, value.IndexOf("//")); - } - - comment = comment.Trim(); - value = value.Trim(); - - Define d = new Define(fileName,i,name,value,comment); - defines.Add(d); - mainform.listBox1.Items.Add(d); - mainform.listBox1.Refresh(); - }else{ - Define d = new Define(fileName, i, "ERROR ERROR", "Something went wrong here", line); - errordefines++; - defines.Add(d); - mainform.listBox1.Items.Add(d); - mainform.listBox1.Refresh(); - } - } - } - } - catch (Exception e) { - Console.WriteLine(e.Message); - Console.WriteLine(e.StackTrace); - MessageBox.Show("Exception: " + e.Message + " | " + e.ToString()); - } - } - - bool iscomment = false; - int ismultilinecomment = 0; - bool isstring = false; - bool ismultilinestring = false; - int escapesequence = 0; - int stringvar = 0; - - public List remove_comments(List lines) - { - List r = new List(); - - iscomment = false; - ismultilinecomment = 0; - isstring = false; - ismultilinestring = false; - - bool skiponechar = false; //Used so the / in */ doesn't get written; - - for (int i = 0; i < lines.Count(); i++) - { - - String line = lines[i]; - - if (!(line is String)) - continue; - - iscomment = false; - isstring = false; - char ca = ' '; - escapesequence = 0; - - String newline = ""; - - int k = line.Length; - - for (int j = 0; j < k; j++) - { - - char c = line.ToCharArray()[j]; - - if (escapesequence == 0) - if (normalstatus()) - { - if (ca == '/' && c == '/') - { - c = ' '; - iscomment = true; - - newline = newline.Remove(newline.Length - 1); - k = line.Length; - } - if (ca == '/' && c == '*') - { - c = ' '; - ismultilinecomment = 1; - newline = newline.Remove(newline.Length - 1); - k = line.Length; - } - if (c == '"') - { - isstring = true; - } - if (ca == '{' && c == '"') - { - ismultilinestring = true; - } - } - else if (isstring) - { - - if (c == '\\') - { - escapesequence = 2; - } - else if (stringvar > 0) - { - if (c == ']') - { - stringvar--; - } - else if (c == '[') - { - stringvar++; - } - } - else if (c == '"') - { - isstring = false; - } - else if (c == '[') - { - stringvar++; - } - } - else if (ismultilinestring) - { - if (ca == '"' && c == '}') - { - ismultilinestring = false; - } - } - else if (ismultilinecomment > 0) - { - if (ca == '/' && c == '*') - { - c = ' '; //These things are here to prevent /*/ from bieng interpreted as the start and end of a comment. - skiponechar = true; - ismultilinecomment++; - } - if (ca == '*' && c == '/') - { - c = ' '; //These things are here to prevent /*/ from bieng interpreted as the start and end of a comment. - skiponechar = true; - ismultilinecomment--; - } - } - - if (!iscomment && (ismultilinecomment==0) && !skiponechar) - { - newline += c; - } - - if (skiponechar) - { - skiponechar = false; - } - if (escapesequence > 0) - { - escapesequence--; - } - else - { - ca = c; - } - } - - r.Add(newline.TrimEnd()); - - } - - return r; - } - - private bool normalstatus() - { - return !isstring && !ismultilinestring && (ismultilinecomment==0) && !iscomment && (escapesequence == 0); - } - - - } - - public class Define - { - public String location; - public int line; - public String name; - public String value; - public String comment; - public List references; - - public Define(String location, int line, String name, String value, String comment) - { - this.location = location; - this.line = line; - this.name = name; - this.value = value; - this.comment = comment; - this.references = new List(); - } - - public override String ToString() - { - return "DEFINE: \""+name+"\" is defined as \""+value+"\" AT "+location+" : "+line; - } - - } - - - - -} diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.resx b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.resx deleted file mode 100644 index 1af7de150c9..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Program.cs b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Program.cs deleted file mode 100644 index 1e8ac829d9e..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Program.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace UnstandardnessTestForDM -{ - static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); - } - } -} diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/AssemblyInfo.cs b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/AssemblyInfo.cs deleted file mode 100644 index 99c88721b31..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("UnstandardnessTestForDM")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("UnstandardnessTestForDM")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c0e09000-1840-4416-8bb2-d86a8227adf1")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.Designer.cs b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.Designer.cs deleted file mode 100644 index 92534f43fed..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.239 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace UnstandardnessTestForDM.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("UnstandardnessTestForDM.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.resx b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.resx deleted file mode 100644 index af7dbebbace..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.Designer.cs b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.Designer.cs deleted file mode 100644 index ab81379593f..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.239 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace UnstandardnessTestForDM.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.settings b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.settings deleted file mode 100644 index 39645652af6..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/UnstandardnessTestForDM.csproj b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/UnstandardnessTestForDM.csproj deleted file mode 100644 index 7cafd94f656..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/UnstandardnessTestForDM.csproj +++ /dev/null @@ -1,87 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {A0EEBFC9-41D4-474D-853D-126AFDFB82DE} - WinExe - Properties - UnstandardnessTestForDM - UnstandardnessTestForDM - v4.0 - Client - 512 - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - Form - - - Form1.cs - - - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - \ No newline at end of file diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.exe b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.exe deleted file mode 100644 index bb55cad8fd7..00000000000 Binary files a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.exe and /dev/null differ diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.pdb b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.pdb deleted file mode 100644 index b89e4d53eb7..00000000000 Binary files a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.pdb and /dev/null differ diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.vshost.exe b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.vshost.exe deleted file mode 100644 index bb84a51ac4f..00000000000 Binary files a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.vshost.exe and /dev/null differ diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.vshost.exe.manifest b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.vshost.exe.manifest deleted file mode 100644 index 061c9ca950d..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.vshost.exe.manifest +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index f4263115dfb..00000000000 Binary files a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/GenerateResource.read.1.tlog b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/GenerateResource.read.1.tlog deleted file mode 100644 index 247c250f975..00000000000 Binary files a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/GenerateResource.read.1.tlog and /dev/null differ diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/GenerateResource.write.1.tlog b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/GenerateResource.write.1.tlog deleted file mode 100644 index d100f54085b..00000000000 Binary files a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/GenerateResource.write.1.tlog and /dev/null differ diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.Form1.resources b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.Form1.resources deleted file mode 100644 index 6c05a9776bd..00000000000 Binary files a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.Form1.resources and /dev/null differ diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.Properties.Resources.resources b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.Properties.Resources.resources deleted file mode 100644 index 6c05a9776bd..00000000000 Binary files a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.Properties.Resources.resources and /dev/null differ diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.csproj.FileListAbsolute.txt b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.csproj.FileListAbsolute.txt deleted file mode 100644 index 1d36d1cd556..00000000000 --- a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,18 +0,0 @@ -c:\users\baloh\documents\visual studio 2010\Projects\UnstandardnessTestForDM\UnstandardnessTestForDM\bin\Debug\UnstandardnessTestForDM.exe -c:\users\baloh\documents\visual studio 2010\Projects\UnstandardnessTestForDM\UnstandardnessTestForDM\bin\Debug\UnstandardnessTestForDM.pdb -c:\users\baloh\documents\visual studio 2010\Projects\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\ResolveAssemblyReference.cache -c:\users\baloh\documents\visual studio 2010\Projects\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\UnstandardnessTestForDM.Form1.resources -c:\users\baloh\documents\visual studio 2010\Projects\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\UnstandardnessTestForDM.Properties.Resources.resources -c:\users\baloh\documents\visual studio 2010\Projects\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\GenerateResource.read.1.tlog -c:\users\baloh\documents\visual studio 2010\Projects\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\GenerateResource.write.1.tlog -c:\users\baloh\documents\visual studio 2010\Projects\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\UnstandardnessTestForDM.exe -c:\users\baloh\documents\visual studio 2010\Projects\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\UnstandardnessTestForDM.pdb -C:\Users\Baloh\Desktop\tgs13\tools\UnstandardnessTestForDM\UnstandardnessTestForDM\bin\Debug\UnstandardnessTestForDM.exe -C:\Users\Baloh\Desktop\tgs13\tools\UnstandardnessTestForDM\UnstandardnessTestForDM\bin\Debug\UnstandardnessTestForDM.pdb -C:\Users\Baloh\Desktop\tgs13\tools\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\ResolveAssemblyReference.cache -C:\Users\Baloh\Desktop\tgs13\tools\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\UnstandardnessTestForDM.Form1.resources -C:\Users\Baloh\Desktop\tgs13\tools\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\UnstandardnessTestForDM.Properties.Resources.resources -C:\Users\Baloh\Desktop\tgs13\tools\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\GenerateResource.read.1.tlog -C:\Users\Baloh\Desktop\tgs13\tools\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\GenerateResource.write.1.tlog -C:\Users\Baloh\Desktop\tgs13\tools\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\UnstandardnessTestForDM.exe -C:\Users\Baloh\Desktop\tgs13\tools\UnstandardnessTestForDM\UnstandardnessTestForDM\obj\x86\Debug\UnstandardnessTestForDM.pdb diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.exe b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.exe deleted file mode 100644 index bb55cad8fd7..00000000000 Binary files a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.exe and /dev/null differ diff --git a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.pdb b/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.pdb deleted file mode 100644 index b89e4d53eb7..00000000000 Binary files a/tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.pdb and /dev/null differ diff --git a/tools/Runtime Condenser/Input.txt b/tools/runtimeCondensor/Input.txt similarity index 100% rename from tools/Runtime Condenser/Input.txt rename to tools/runtimeCondensor/Input.txt diff --git a/tools/Runtime Condenser/Main.cpp b/tools/runtimeCondensor/Main.cpp similarity index 100% rename from tools/Runtime Condenser/Main.cpp rename to tools/runtimeCondensor/Main.cpp diff --git a/tools/Runtime Condenser/Output.txt b/tools/runtimeCondensor/Output.txt similarity index 100% rename from tools/Runtime Condenser/Output.txt rename to tools/runtimeCondensor/Output.txt diff --git a/tools/Runtime Condenser/RuntimeCondenser.exe b/tools/runtimeCondensor/RuntimeCondenser.exe similarity index 100% rename from tools/Runtime Condenser/RuntimeCondenser.exe rename to tools/runtimeCondensor/RuntimeCondenser.exe