- }
-
- 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]
-
-
- | Item |
- Amount |
- Unit Price |
- Line Total |
-
"}
- 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 += "| [LI.name] | [LI.units] | $[num2septext(LI.price)] | $[num2septext(linetotal)] |
|---|
"
- subtotal += linetotal
- var/taxes = POS_TAX_RATE*subtotal
- receipt += {"
-
- | SUBTOTAL | $[num2septext(subtotal)] |
-
-
- | TAXES | $[num2septext(taxes)] |
-
"}
- receipt += {"
-
- | TOTAL | $[num2septext(taxes+subtotal)]
- |
"}
- receipt += "
"
-
- 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 = {""
- receipt += {""}
- return receipt
-
-/obj/machinery/pos/proc/ProductsScreen()
- var/dat={""}
- return dat
-
-/obj/machinery/pos/proc/ExportScreen()
- var/dat={""}
- return dat
-
-/obj/machinery/pos/proc/ImportScreen()
- var/dat={""}
- return dat
-
-/obj/machinery/pos/proc/FinalizeScreen()
- return "Waiting for Credit
Cancel"
-
-/obj/machinery/pos/proc/SettingsScreen()
- var/dat={""}
- 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
-