Codebase Cleanup - 2020-09-27 (#14472)

* Codebase Cleanup - 2020-09-27 * Endings * Forgot meta * Farie Tweaks
NULL882 · Oct 15, 2020 · f40a816 · f40a816
1 parent 632d913
commit f40a816
Show file tree

Hide file tree

Showing 48 changed files with 18 additions and 2,040 deletions.
diff --git a/DLLSocket/DLLSocket.cbp b/DLLSocket/DLLSocket.cbp
diff --git a/DLLSocket/compile.sh b/DLLSocket/compile.sh
diff --git a/DLLSocket/main.cpp b/DLLSocket/main.cpp
diff --git a/DLLSocket/server_controller.py b/DLLSocket/server_controller.py
diff --git 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
@@ -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 → code/game/area/dynamic_areas.dm b/code/game/area/Dynamic areas.dm → code/game/area/dynamic_areas.dm
diff --git a/code/game/area/Space Station 13 areas.dm → code/game/area/ss13_areas.dm b/code/game/area/Space Station 13 areas.dm → code/game/area/ss13_areas.dm
diff --git a/...amemodes/devil/devil agent/devil_agent.dm → ...amemodes/devil/devil_agent/devil_agent.dm b/...amemodes/devil/devil agent/devil_agent.dm → ...amemodes/devil/devil_agent/devil_agent.dm
diff --git 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, "<span class='warning'>\The [src] does not appear to have a connection.</span>")
 		return 0

diff --git 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)](<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) 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
diff --git 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 → code/modules/admin/db_ban/functions.dm b/code/modules/admin/DB ban/functions.dm → code/modules/admin/db_ban/functions.dm
diff --git a/code/modules/client/client defines.dm → code/modules/client/client_defines.dm b/code/modules/client/client defines.dm → code/modules/client/client_defines.dm
diff --git a/code/modules/client/client procs.dm → code/modules/client/client_procs.dm b/code/modules/client/client procs.dm → code/modules/client/client_procs.dm