@@ -123,17 +119,6 @@ Code:
return
-/*
- for(var/obj/item/device/assembly/signaler/S in world)
- if(!S)
- continue
- if(S == src)
- continue
- if((S.frequency == src.frequency) && (S.code == src.code))
- spawn(0)
- if(S)
- S.pulse(0)
- return 0*/
/obj/item/device/assembly/signaler/receive_signal(datum/signal/signal)
if(!signal)
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index 8ddde526a7..64d77a27dc 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -423,22 +423,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
continue reaction_loop
//at this point, all minimum requirements for the reaction are satisfied.
- /* currently no reactions have maximum requirements, so we can leave the checks commented out for a slight performance boost
- var/list/max_reqs = reaction.max_requirements.Copy()
- if((max_reqs["TEMP"] && temp > max_reqs["TEMP"]) \
- || (max_reqs["ENER"] && ener > max_reqs["ENER"]))
- continue
- max_reqs -= "TEMP"
- max_reqs -= "ENER"
-
- for(var/id in max_reqs)
- if(cached_gases[id] && cached_gases[id][MOLES] > max_reqs[id])
- continue reaction_loop
- //at this point, all requirements for the reaction are satisfied. we can now react()
- */
-
. |= reaction.react(src, dump_location)
- //to_chat(world,reaction.name)
if (. & STOP_REACTIONS)
break
if(.)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
index 15f0ccddd2..f8204947f1 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
@@ -197,7 +197,6 @@ Acts like a normal vent, but has an input AND output.
spawn(2)
broadcast_status()
return //do not update_icon
- //if(signal.data["tag"])
spawn(2)
broadcast_status()
update_icon()
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index ea02e81c23..d9b25939a5 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -31,7 +31,6 @@
// asset_cache
if(href_list["asset_cache_confirm_arrival"])
- //to_chat(src, "ASSET JOB [href_list["asset_cache_confirm_arrival"]] ARRIVED.")
var/job = text2num(href_list["asset_cache_confirm_arrival"])
//because we skip the limiter, we have to make sure this is a valid arrival and not somebody tricking us
// into letting append to a list without limit.
@@ -131,13 +130,6 @@
if(filelength > UPLOAD_LIMIT)
to_chat(src, "Error: AllowUpload(): File Upload too large. Upload Limit: [UPLOAD_LIMIT/1024]KiB.")
return 0
-/* //Don't need this at the moment. But it's here if it's needed later.
- //Helps prevent multiple files being uploaded at once. Or right after eachother.
- var/time_to_wait = fileaccess_timer - world.time
- if(time_to_wait > 0)
- to_chat(src, "Error: AllowUpload(): Spam prevention. Please wait [round(time_to_wait/10)] seconds.")
- return 0
- fileaccess_timer = world.time + FTPDELAY */
return 1
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index fac42b0787..96942af46a 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -239,8 +239,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
S["real_name"] >> name
if(!name)
name = "Character[i]"
- /*if(i!=1)
- dat += " | " */
dat += "[name] "
dat += ""
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 4a86008ad2..3bd255c058 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -18,7 +18,6 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
item_state = "welding"
materials = list(MAT_METAL=1750, MAT_GLASS=400)
-// var/up = 0
flash_protect = 2
tint = 2
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 60)
diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm
index 9bba04a68d..c7e9baf779 100755
--- a/code/modules/events/abductor.dm
+++ b/code/modules/events/abductor.dm
@@ -26,7 +26,11 @@
var/mob/living/carbon/human/agent = makeBody(pick_n_take(candidates))
var/mob/living/carbon/human/scientist = makeBody(pick_n_take(candidates))
- GM.post_setup_team(GM.make_abductor_team(agent.mind, scientist.mind))
+ var/team = GM.make_abductor_team(agent.mind, scientist.mind)
+ if(!team)
+ return MAP_ERROR
+
+ GM.post_setup_team(team)
spawned_mobs += list(agent, scientist)
return SUCCESSFUL_SPAWN
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index 2343a23c9a..a4c9a8563c 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -471,7 +471,6 @@
else //If tile is fully grown
SV.entangle_mob()
- //if(prob(25))
SV.spread()
if(i >= length)
break
diff --git a/code/modules/holodeck/area_copy.dm b/code/modules/holodeck/area_copy.dm
index bc2c92e3fb..4acedb4780 100644
--- a/code/modules/holodeck/area_copy.dm
+++ b/code/modules/holodeck/area_copy.dm
@@ -78,7 +78,6 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list("tag","area","type","loc","locs",
var/copiedobjs = list()
for (var/turf/T in refined_src)
- //var/datum/coords/C_src = refined_src[T]
var/coordstring = refined_src[T]
var/turf/B = refined_trg[coordstring]
if(!istype(B))
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index fb55a0565b..52077d2367 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -230,11 +230,9 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
dat += "Checked Out Books
"
for(var/datum/borrowbook/b in checkouts)
var/timetaken = world.time - b.getdate
- //timetaken *= 10
timetaken /= 600
timetaken = round(timetaken)
var/timedue = b.duedate - world.time
- //timedue *= 10
timedue /= 600
if(timedue <= 0)
timedue = "(OVERDUE) [timedue]"
diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm
index 31ddb27b2a..8e56acc2fb 100644
--- a/code/modules/lighting/lighting_source.dm
+++ b/code/modules/lighting/lighting_source.dm
@@ -138,42 +138,6 @@
// This is the define used to calculate falloff.
-/*
-/datum/light_source/proc/apply_lum()
- var/static/update_gen = 1
- applied = 1
-
- // Keep track of the last applied lum values so that the lighting can be reversed
- var/thing
- var/datum/lighting_corner/C
- var/corners = list()
- LAZYINITLIST(effect_str)
- FOR_DVIEW(var/turf/T, light_range+1, source_turf, INVISIBILITY_LIGHTING)
- var/list/turf_corners = T.get_corners()
-
- for (thing in turf_corners)
- C = thing
- if (C.update_gen == update_gen)
- continue
-
- C.update_gen = update_gen
- LAZYADD(C.affecting,src)
-
- if (!C.active)
- effect_str[C] = 0
- continue
-
- APPLY_CORNER(C)
-
- LAZYADD(T.affecting_lights, src)
- LAZYADD(affecting_turfs, T)
- FOR_DVIEW_END
- update_gen++
- applied_lum_r = lum_r
- applied_lum_g = lum_g
- applied_lum_b = lum_b
-*/
-
/datum/light_source/proc/remove_lum()
applied = FALSE
var/thing
diff --git a/code/modules/mob/living/brain/life.dm b/code/modules/mob/living/brain/life.dm
index 9d87f412e8..c8df16a1cf 100644
--- a/code/modules/mob/living/brain/life.dm
+++ b/code/modules/mob/living/brain/life.dm
@@ -24,14 +24,6 @@
if(BR)
BR.damaged_brain = 1 //beaten to a pulp
-/* //currently unused feature, since brain outside a mmi is always dead.
-/mob/living/brain/proc/handle_brain_revival_life()
- if(stat != DEAD)
- if(config.revival_brain_life != -1)
- if( !container && (world.time - timeofhostdeath) > config.revival_brain_life)
- death()
-*/
-
/mob/living/brain/proc/handle_emp_damage()
if(emp_damage)
if(stat == DEAD)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 36bd1893e2..3a5988e09a 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -32,7 +32,6 @@
var/aiRestorePowerRoutine = 0
var/requires_power = POWER_REQ_ALL
var/can_be_carded = TRUE
- //var/list/laws = list()
var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list(), "Burglar"=list())
var/viewalerts = 0
var/icon/holo_icon//Default is assigned when AI is created.
@@ -172,7 +171,6 @@
if(incapacitated())
return
- //if(icon_state == initial(icon_state))
var/icontype = input("Please, select a display!", "AI", null/*, null*/) in list("Clown", "Monochrome", "Blue", "Inverted", "Firewall", "Green", "Red", "Static", "Red October", "House", "Heartline", "Hades", "Helios", "President", "Syndicat Meow", "Alien", "Too Deep", "Triumvirate", "Triumvirate-M", "Text", "Matrix", "Dorf", "Bliss", "Not Malf", "Fuzzy", "Goon", "Database", "Glitchman", "Murica", "Nanotrasen", "Gentoo", "Angel")
if(icontype == "Clown")
icon_state = "ai-clown2"
@@ -238,9 +236,6 @@
icon_state = "ai-gentoo"
else if(icontype == "Angel")
icon_state = "ai-angel"
- //else
- //to_chat(usr, "You can only change your display once!")
- //return
/mob/living/silicon/ai/Stat()
..()
diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
index 812e207249..48ca0ac19c 100644
--- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
@@ -1,161 +1,149 @@
-// CAMERA NET
-//
-// The datum containing all the chunks.
-
-#define CHUNK_SIZE 16 // Only chunk sizes that are to the power of 2. E.g: 2, 4, 8, 16, etc..
-
-GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
-
-/datum/cameranet
- var/name = "Camera Net" // Name to show for VV and stat()
-
- // The cameras on the map, no matter if they work or not. Updated in obj/machinery/camera.dm by New() and Del().
- var/list/cameras = list()
- // The chunks of the map, mapping the areas that the cameras can see.
- var/list/chunks = list()
- var/ready = 0
-
- // The object used for the clickable stat() button.
- var/obj/effect/statclick/statclick
-
-// Checks if a chunk has been Generated in x, y, z.
-/datum/cameranet/proc/chunkGenerated(x, y, z)
- x &= ~(CHUNK_SIZE - 1)
- y &= ~(CHUNK_SIZE - 1)
- var/key = "[x],[y],[z]"
- return (chunks[key])
-
-// Returns the chunk in the x, y, z.
-// If there is no chunk, it creates a new chunk and returns that.
-/datum/cameranet/proc/getCameraChunk(x, y, z)
- x &= ~(CHUNK_SIZE - 1)
- y &= ~(CHUNK_SIZE - 1)
- var/key = "[x],[y],[z]"
- if(!chunks[key])
- chunks[key] = new /datum/camerachunk(null, x, y, z)
-
- return chunks[key]
-
-// Updates what the aiEye can see. It is recommended you use this when the aiEye moves or it's location is set.
-
-/datum/cameranet/proc/visibility(mob/camera/aiEye/ai)
- // 0xf = 15
- var/x1 = max(0, ai.x - 16) & ~(CHUNK_SIZE - 1)
- var/y1 = max(0, ai.y - 16) & ~(CHUNK_SIZE - 1)
- var/x2 = min(world.maxx, ai.x + 16) & ~(CHUNK_SIZE - 1)
- var/y2 = min(world.maxy, ai.y + 16) & ~(CHUNK_SIZE - 1)
-
- var/list/visibleChunks = list()
-
- for(var/x = x1; x <= x2; x += CHUNK_SIZE)
- for(var/y = y1; y <= y2; y += CHUNK_SIZE)
- visibleChunks |= getCameraChunk(x, y, ai.z)
-
- var/list/remove = ai.visibleCameraChunks - visibleChunks
- var/list/add = visibleChunks - ai.visibleCameraChunks
-
- for(var/chunk in remove)
- var/datum/camerachunk/c = chunk
- c.remove(ai)
-
- for(var/chunk in add)
- var/datum/camerachunk/c = chunk
- c.add(ai)
-
-// Updates the chunks that the turf is located in. Use this when obstacles are destroyed or when doors open.
-
-/datum/cameranet/proc/updateVisibility(atom/A, opacity_check = 1)
-
- if(!SSticker || (opacity_check && !A.opacity))
- return
- majorChunkChange(A, 2)
-
-/datum/cameranet/proc/updateChunk(x, y, z)
- // 0xf = 15
- if(!chunkGenerated(x, y, z))
- return
- var/datum/camerachunk/chunk = getCameraChunk(x, y, z)
- chunk.hasChanged()
-
-// Removes a camera from a chunk.
-
-/datum/cameranet/proc/removeCamera(obj/machinery/camera/c)
- if(c.can_use())
- majorChunkChange(c, 0)
-
-// Add a camera to a chunk.
-
-/datum/cameranet/proc/addCamera(obj/machinery/camera/c)
- if(c.can_use())
- majorChunkChange(c, 1)
-
-// Used for Cyborg cameras. Since portable cameras can be in ANY chunk.
-
-/datum/cameranet/proc/updatePortableCamera(obj/machinery/camera/c)
- if(c.can_use())
- majorChunkChange(c, 1)
- //else
- // majorChunkChange(c, 0)
-
-// Never access this proc directly!!!!
-// This will update the chunk and all the surrounding chunks.
-// It will also add the atom to the cameras list if you set the choice to 1.
-// Setting the choice to 0 will remove the camera from the chunks.
-// If you want to update the chunks around an object, without adding/removing a camera, use choice 2.
-
-/datum/cameranet/proc/majorChunkChange(atom/c, choice)
- // 0xf = 15
- if(!c)
- return
-
- var/turf/T = get_turf(c)
- if(T)
- var/x1 = max(0, T.x - (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
- var/y1 = max(0, T.y - (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
- var/x2 = min(world.maxx, T.x + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
- var/y2 = min(world.maxy, T.y + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
- for(var/x = x1; x <= x2; x += CHUNK_SIZE)
- for(var/y = y1; y <= y2; y += CHUNK_SIZE)
- if(chunkGenerated(x, y, T.z))
- var/datum/camerachunk/chunk = getCameraChunk(x, y, T.z)
- if(choice == 0)
- // Remove the camera.
- chunk.cameras -= c
- else if(choice == 1)
- // You can't have the same camera in the list twice.
- chunk.cameras |= c
- chunk.hasChanged()
-
-// Will check if a mob is on a viewable turf. Returns 1 if it is, otherwise returns 0.
-
-/datum/cameranet/proc/checkCameraVis(mob/living/target)
-
- // 0xf = 15
- var/turf/position = get_turf(target)
- return checkTurfVis(position)
-
-
-/datum/cameranet/proc/checkTurfVis(turf/position)
- var/datum/camerachunk/chunk = getCameraChunk(position.x, position.y, position.z)
- if(chunk)
- if(chunk.changed)
- chunk.hasChanged(1) // Update now, no matter if it's visible or not.
- if(chunk.visibleTurfs[position])
- return 1
- return 0
-
-/datum/cameranet/proc/stat_entry()
- if(!statclick)
- statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
-
- stat(name, statclick.update("Cameras: [GLOB.cameranet.cameras.len] | Chunks: [GLOB.cameranet.chunks.len]"))
-
-// Debug verb for VVing the chunk that the turf is in.
-/*
-/turf/verb/view_chunk()
- set src in world
-
- if(cameranet.chunkGenerated(x, y, z))
- var/datum/camerachunk/chunk = cameranet.getCameraChunk(x, y, z)
- usr.client.debug_variables(chunk)
-*/
+// CAMERA NET
+//
+// The datum containing all the chunks.
+
+#define CHUNK_SIZE 16 // Only chunk sizes that are to the power of 2. E.g: 2, 4, 8, 16, etc..
+
+GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
+
+/datum/cameranet
+ var/name = "Camera Net" // Name to show for VV and stat()
+
+ // The cameras on the map, no matter if they work or not. Updated in obj/machinery/camera.dm by New() and Del().
+ var/list/cameras = list()
+ // The chunks of the map, mapping the areas that the cameras can see.
+ var/list/chunks = list()
+ var/ready = 0
+
+ // The object used for the clickable stat() button.
+ var/obj/effect/statclick/statclick
+
+// Checks if a chunk has been Generated in x, y, z.
+/datum/cameranet/proc/chunkGenerated(x, y, z)
+ x &= ~(CHUNK_SIZE - 1)
+ y &= ~(CHUNK_SIZE - 1)
+ var/key = "[x],[y],[z]"
+ return (chunks[key])
+
+// Returns the chunk in the x, y, z.
+// If there is no chunk, it creates a new chunk and returns that.
+/datum/cameranet/proc/getCameraChunk(x, y, z)
+ x &= ~(CHUNK_SIZE - 1)
+ y &= ~(CHUNK_SIZE - 1)
+ var/key = "[x],[y],[z]"
+ if(!chunks[key])
+ chunks[key] = new /datum/camerachunk(null, x, y, z)
+
+ return chunks[key]
+
+// Updates what the aiEye can see. It is recommended you use this when the aiEye moves or it's location is set.
+
+/datum/cameranet/proc/visibility(mob/camera/aiEye/ai)
+ // 0xf = 15
+ var/x1 = max(0, ai.x - 16) & ~(CHUNK_SIZE - 1)
+ var/y1 = max(0, ai.y - 16) & ~(CHUNK_SIZE - 1)
+ var/x2 = min(world.maxx, ai.x + 16) & ~(CHUNK_SIZE - 1)
+ var/y2 = min(world.maxy, ai.y + 16) & ~(CHUNK_SIZE - 1)
+
+ var/list/visibleChunks = list()
+
+ for(var/x = x1; x <= x2; x += CHUNK_SIZE)
+ for(var/y = y1; y <= y2; y += CHUNK_SIZE)
+ visibleChunks |= getCameraChunk(x, y, ai.z)
+
+ var/list/remove = ai.visibleCameraChunks - visibleChunks
+ var/list/add = visibleChunks - ai.visibleCameraChunks
+
+ for(var/chunk in remove)
+ var/datum/camerachunk/c = chunk
+ c.remove(ai)
+
+ for(var/chunk in add)
+ var/datum/camerachunk/c = chunk
+ c.add(ai)
+
+// Updates the chunks that the turf is located in. Use this when obstacles are destroyed or when doors open.
+
+/datum/cameranet/proc/updateVisibility(atom/A, opacity_check = 1)
+
+ if(!SSticker || (opacity_check && !A.opacity))
+ return
+ majorChunkChange(A, 2)
+
+/datum/cameranet/proc/updateChunk(x, y, z)
+ // 0xf = 15
+ if(!chunkGenerated(x, y, z))
+ return
+ var/datum/camerachunk/chunk = getCameraChunk(x, y, z)
+ chunk.hasChanged()
+
+// Removes a camera from a chunk.
+
+/datum/cameranet/proc/removeCamera(obj/machinery/camera/c)
+ if(c.can_use())
+ majorChunkChange(c, 0)
+
+// Add a camera to a chunk.
+
+/datum/cameranet/proc/addCamera(obj/machinery/camera/c)
+ if(c.can_use())
+ majorChunkChange(c, 1)
+
+// Used for Cyborg cameras. Since portable cameras can be in ANY chunk.
+
+/datum/cameranet/proc/updatePortableCamera(obj/machinery/camera/c)
+ if(c.can_use())
+ majorChunkChange(c, 1)
+
+// Never access this proc directly!!!!
+// This will update the chunk and all the surrounding chunks.
+// It will also add the atom to the cameras list if you set the choice to 1.
+// Setting the choice to 0 will remove the camera from the chunks.
+// If you want to update the chunks around an object, without adding/removing a camera, use choice 2.
+
+/datum/cameranet/proc/majorChunkChange(atom/c, choice)
+ // 0xf = 15
+ if(!c)
+ return
+
+ var/turf/T = get_turf(c)
+ if(T)
+ var/x1 = max(0, T.x - (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
+ var/y1 = max(0, T.y - (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
+ var/x2 = min(world.maxx, T.x + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
+ var/y2 = min(world.maxy, T.y + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
+ for(var/x = x1; x <= x2; x += CHUNK_SIZE)
+ for(var/y = y1; y <= y2; y += CHUNK_SIZE)
+ if(chunkGenerated(x, y, T.z))
+ var/datum/camerachunk/chunk = getCameraChunk(x, y, T.z)
+ if(choice == 0)
+ // Remove the camera.
+ chunk.cameras -= c
+ else if(choice == 1)
+ // You can't have the same camera in the list twice.
+ chunk.cameras |= c
+ chunk.hasChanged()
+
+// Will check if a mob is on a viewable turf. Returns 1 if it is, otherwise returns 0.
+
+/datum/cameranet/proc/checkCameraVis(mob/living/target)
+
+ // 0xf = 15
+ var/turf/position = get_turf(target)
+ return checkTurfVis(position)
+
+
+/datum/cameranet/proc/checkTurfVis(turf/position)
+ var/datum/camerachunk/chunk = getCameraChunk(position.x, position.y, position.z)
+ if(chunk)
+ if(chunk.changed)
+ chunk.hasChanged(1) // Update now, no matter if it's visible or not.
+ if(chunk.visibleTurfs[position])
+ return 1
+ return 0
+
+/datum/cameranet/proc/stat_entry()
+ if(!statclick)
+ statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
+
+ stat(name, statclick.update("Cameras: [GLOB.cameranet.cameras.len] | Chunks: [GLOB.cameranet.chunks.len]"))
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index 8593eafc37..13f0609c0d 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -138,14 +138,6 @@
for(var/word in words)
play_vox_word(word, src.z, null)
-/*
- for(var/mob/M in player_list)
- if(M.client)
- var/turf/T = get_turf(M)
- var/turf/our_turf = get_turf(src)
- if(T.z == our_turf.z)
- to_chat(M, "AI announcement: [message]")
-*/
/proc/play_vox_word(word, z_level, mob/only_listener)
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index e21abfc6b2..7df929f20a 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -588,7 +588,6 @@
if(!istype(machine, /obj/machinery/door))
dat += "Connected device's firmware does not appear to be compatible with Airlock Jack protocols.
"
return dat
-// var/obj/machinery/airlock/door = machine
if(!hackdoor)
dat += "Begin Airlock Jacking
"
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index 81e99abcc6..c566aaf082 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -1,215 +1,214 @@
-//These procs handle putting stuff in your hand. It's probably best to use these rather than setting stuff manually
-//as they handle all relevant stuff like adding it to the player's screen and such
-
-//Returns the thing in our active hand (whatever is in our active module-slot, in this case)
-/mob/living/silicon/robot/get_active_held_item()
- return module_active
-
-
-
-/*-------TODOOOOOOOOOO--------*/ //fuck yooooooooooooou
-/mob/living/silicon/robot/proc/uneq_module(obj/item/O)
- if(!O)
- return 0
- O.mouse_opacity = MOUSE_OPACITY_OPAQUE
- if(istype(O, /obj/item/borg/sight))
- var/obj/item/borg/sight/S = O
- sight_mode &= ~S.sight_mode
- update_sight()
- else if(istype(O, /obj/item/storage/bag/tray/))
- var/obj/item/storage/bag/tray/T = O
- T.do_quick_empty()
- if(client)
- client.screen -= O
- observer_screen_update(O,FALSE)
- O.forceMove(module) //Return item to module so it appears in its contents, so it can be taken out again.
-
- if(O.flags_1 & DROPDEL_1)
- O.flags_1 &= ~DROPDEL_1 //we shouldn't HAVE things with DROPDEL_1 in our modules, but better safe than runtiming horribly
-
- O.dropped(src)
-
- if(module_active == O)
- module_active = null
- if(held_items[1] == O)
- inv1.icon_state = "inv1"
- held_items[1] = null
- else if(held_items[2] == O)
- inv2.icon_state = "inv2"
- held_items[2] = null
- else if(held_items[3] == O)
- inv3.icon_state = "inv3"
- held_items[3] = null
- hud_used.update_robot_modules_display()
- return 1
-
-/mob/living/silicon/robot/proc/activate_module(obj/item/O)
- . = FALSE
- if(!(O in module.modules))
- return
- if(activated(O))
- to_chat(src, "That module is already activated.")
- return
- if(!held_items[1])
- held_items[1] = O
- O.screen_loc = inv1.screen_loc
- . = TRUE
- else if(!held_items[2])
- held_items[2] = O
- O.screen_loc = inv2.screen_loc
- . = TRUE
- else if(!held_items[3])
- held_items[3] = O
- O.screen_loc = inv3.screen_loc
- . = TRUE
- else
- to_chat(src, "You need to disable a module first!")
- if(.)
- O.equipped(src, slot_hands)
- O.mouse_opacity = initial(O.mouse_opacity)
- O.layer = ABOVE_HUD_LAYER
- O.plane = ABOVE_HUD_PLANE
- observer_screen_update(O,TRUE)
- O.forceMove(src)
- if(istype(O, /obj/item/borg/sight))
- var/obj/item/borg/sight/S = O
- sight_mode |= S.sight_mode
- update_sight()
-
-
-/mob/living/silicon/robot/proc/observer_screen_update(obj/item/I,add = TRUE)
- if(observers && observers.len)
- for(var/M in observers)
- var/mob/dead/observe = M
- if(observe.client && observe.client.eye == src)
- if(add)
- observe.client.screen += I
- else
- observe.client.screen -= I
- else
- observers -= observe
- if(!observers.len)
- observers = null
- break
-
-/mob/living/silicon/robot/proc/uneq_active()
- uneq_module(module_active)
-
-/mob/living/silicon/robot/proc/uneq_all()
- for(var/obj/item/I in held_items)
- uneq_module(I)
-
-/mob/living/silicon/robot/proc/activated(obj/item/O)
- if(O in held_items)
- return TRUE
- return FALSE
-
-//Helper procs for cyborg modules on the UI.
-//These are hackish but they help clean up code elsewhere.
-
-//module_selected(module) - Checks whether the module slot specified by "module" is currently selected.
-/mob/living/silicon/robot/proc/module_selected(module) //Module is 1-3
- return module == get_selected_module()
-
-//module_active(module) - Checks whether there is a module active in the slot specified by "module".
-/mob/living/silicon/robot/proc/module_active(module) //Module is 1-3
- if(module < 1 || module > 3)
- return FALSE
-
- if(LAZYLEN(held_items) >= module)
- if(held_items[module])
- return TRUE
- return FALSE
-
-//get_selected_module() - Returns the slot number of the currently selected module. Returns 0 if no modules are selected.
-/mob/living/silicon/robot/proc/get_selected_module()
- if(module_active)
- return held_items.Find(module_active)
-
- return 0
-
-//select_module(module) - Selects the module slot specified by "module"
-/mob/living/silicon/robot/proc/select_module(module) //Module is 1-3
- if(module < 1 || module > 3)
- return
-
- if(!module_active(module))
- return
-
- switch(module)
- if(1)
- if(module_active != held_items[module])
- inv1.icon_state = "inv1 +a"
- inv2.icon_state = "inv2"
- inv3.icon_state = "inv3"
- if(2)
- if(module_active != held_items[module])
- inv1.icon_state = "inv1"
- inv2.icon_state = "inv2 +a"
- inv3.icon_state = "inv3"
- if(3)
- if(module_active != held_items[module])
- inv1.icon_state = "inv1"
- inv2.icon_state = "inv2"
- inv3.icon_state = "inv3 +a"
- module_active = held_items[module]
-
-//deselect_module(module) - Deselects the module slot specified by "module"
-/mob/living/silicon/robot/proc/deselect_module(module) //Module is 1-3
- if(module < 1 || module > 3)
- return
-
- if(!module_active(module))
- return
-
- switch(module)
- if(1)
- if(module_active == held_items[module])
- inv1.icon_state = "inv1"
- if(2)
- if(module_active == held_items[module])
- inv2.icon_state = "inv2"
- if(3)
- if(module_active == held_items[module])
- inv3.icon_state = "inv3"
- module_active = null
-
-//toggle_module(module) - Toggles the selection of the module slot specified by "module".
-/mob/living/silicon/robot/proc/toggle_module(module) //Module is 1-3
- if(module < 1 || module > 3)
- return
-
- if(module_selected(module))
- deselect_module(module)
- else
- if(module_active(module))
- select_module(module)
- else
- deselect_module(get_selected_module()) //If we can't do select anything, at least deselect the current module.
- return
-
-//cycle_modules() - Cycles through the list of selected modules.
-/mob/living/silicon/robot/proc/cycle_modules()
- var/slot_start = get_selected_module()
- if(slot_start)
- deselect_module(slot_start) //Only deselect if we have a selected slot.
-
- var/slot_num
- if(slot_start == 0)
- slot_num = 1
- slot_start = 4
- else
- slot_num = slot_start + 1
-
- while(slot_num != slot_start) //If we wrap around without finding any free slots, just give up.
- if(module_active(slot_num))
- select_module(slot_num)
- return
- slot_num++
- if(slot_num > 4) // not >3 otherwise cycling with just one item on module 3 wouldn't work
- slot_num = 1 //Wrap around.
-
-
-
-/mob/living/silicon/robot/swap_hand()
- cycle_modules()
+//These procs handle putting stuff in your hand. It's probably best to use these rather than setting stuff manually
+//as they handle all relevant stuff like adding it to the player's screen and such
+
+//Returns the thing in our active hand (whatever is in our active module-slot, in this case)
+/mob/living/silicon/robot/get_active_held_item()
+ return module_active
+
+
+
+/mob/living/silicon/robot/proc/uneq_module(obj/item/O)
+ if(!O)
+ return 0
+ O.mouse_opacity = MOUSE_OPACITY_OPAQUE
+ if(istype(O, /obj/item/borg/sight))
+ var/obj/item/borg/sight/S = O
+ sight_mode &= ~S.sight_mode
+ update_sight()
+ else if(istype(O, /obj/item/storage/bag/tray/))
+ var/obj/item/storage/bag/tray/T = O
+ T.do_quick_empty()
+ if(client)
+ client.screen -= O
+ observer_screen_update(O,FALSE)
+ O.forceMove(module) //Return item to module so it appears in its contents, so it can be taken out again.
+
+ if(O.flags_1 & DROPDEL_1)
+ O.flags_1 &= ~DROPDEL_1 //we shouldn't HAVE things with DROPDEL_1 in our modules, but better safe than runtiming horribly
+
+ O.dropped(src)
+
+ if(module_active == O)
+ module_active = null
+ if(held_items[1] == O)
+ inv1.icon_state = "inv1"
+ held_items[1] = null
+ else if(held_items[2] == O)
+ inv2.icon_state = "inv2"
+ held_items[2] = null
+ else if(held_items[3] == O)
+ inv3.icon_state = "inv3"
+ held_items[3] = null
+ hud_used.update_robot_modules_display()
+ return 1
+
+/mob/living/silicon/robot/proc/activate_module(obj/item/O)
+ . = FALSE
+ if(!(O in module.modules))
+ return
+ if(activated(O))
+ to_chat(src, "That module is already activated.")
+ return
+ if(!held_items[1])
+ held_items[1] = O
+ O.screen_loc = inv1.screen_loc
+ . = TRUE
+ else if(!held_items[2])
+ held_items[2] = O
+ O.screen_loc = inv2.screen_loc
+ . = TRUE
+ else if(!held_items[3])
+ held_items[3] = O
+ O.screen_loc = inv3.screen_loc
+ . = TRUE
+ else
+ to_chat(src, "You need to disable a module first!")
+ if(.)
+ O.equipped(src, slot_hands)
+ O.mouse_opacity = initial(O.mouse_opacity)
+ O.layer = ABOVE_HUD_LAYER
+ O.plane = ABOVE_HUD_PLANE
+ observer_screen_update(O,TRUE)
+ O.forceMove(src)
+ if(istype(O, /obj/item/borg/sight))
+ var/obj/item/borg/sight/S = O
+ sight_mode |= S.sight_mode
+ update_sight()
+
+
+/mob/living/silicon/robot/proc/observer_screen_update(obj/item/I,add = TRUE)
+ if(observers && observers.len)
+ for(var/M in observers)
+ var/mob/dead/observe = M
+ if(observe.client && observe.client.eye == src)
+ if(add)
+ observe.client.screen += I
+ else
+ observe.client.screen -= I
+ else
+ observers -= observe
+ if(!observers.len)
+ observers = null
+ break
+
+/mob/living/silicon/robot/proc/uneq_active()
+ uneq_module(module_active)
+
+/mob/living/silicon/robot/proc/uneq_all()
+ for(var/obj/item/I in held_items)
+ uneq_module(I)
+
+/mob/living/silicon/robot/proc/activated(obj/item/O)
+ if(O in held_items)
+ return TRUE
+ return FALSE
+
+//Helper procs for cyborg modules on the UI.
+//These are hackish but they help clean up code elsewhere.
+
+//module_selected(module) - Checks whether the module slot specified by "module" is currently selected.
+/mob/living/silicon/robot/proc/module_selected(module) //Module is 1-3
+ return module == get_selected_module()
+
+//module_active(module) - Checks whether there is a module active in the slot specified by "module".
+/mob/living/silicon/robot/proc/module_active(module) //Module is 1-3
+ if(module < 1 || module > 3)
+ return FALSE
+
+ if(LAZYLEN(held_items) >= module)
+ if(held_items[module])
+ return TRUE
+ return FALSE
+
+//get_selected_module() - Returns the slot number of the currently selected module. Returns 0 if no modules are selected.
+/mob/living/silicon/robot/proc/get_selected_module()
+ if(module_active)
+ return held_items.Find(module_active)
+
+ return 0
+
+//select_module(module) - Selects the module slot specified by "module"
+/mob/living/silicon/robot/proc/select_module(module) //Module is 1-3
+ if(module < 1 || module > 3)
+ return
+
+ if(!module_active(module))
+ return
+
+ switch(module)
+ if(1)
+ if(module_active != held_items[module])
+ inv1.icon_state = "inv1 +a"
+ inv2.icon_state = "inv2"
+ inv3.icon_state = "inv3"
+ if(2)
+ if(module_active != held_items[module])
+ inv1.icon_state = "inv1"
+ inv2.icon_state = "inv2 +a"
+ inv3.icon_state = "inv3"
+ if(3)
+ if(module_active != held_items[module])
+ inv1.icon_state = "inv1"
+ inv2.icon_state = "inv2"
+ inv3.icon_state = "inv3 +a"
+ module_active = held_items[module]
+
+//deselect_module(module) - Deselects the module slot specified by "module"
+/mob/living/silicon/robot/proc/deselect_module(module) //Module is 1-3
+ if(module < 1 || module > 3)
+ return
+
+ if(!module_active(module))
+ return
+
+ switch(module)
+ if(1)
+ if(module_active == held_items[module])
+ inv1.icon_state = "inv1"
+ if(2)
+ if(module_active == held_items[module])
+ inv2.icon_state = "inv2"
+ if(3)
+ if(module_active == held_items[module])
+ inv3.icon_state = "inv3"
+ module_active = null
+
+//toggle_module(module) - Toggles the selection of the module slot specified by "module".
+/mob/living/silicon/robot/proc/toggle_module(module) //Module is 1-3
+ if(module < 1 || module > 3)
+ return
+
+ if(module_selected(module))
+ deselect_module(module)
+ else
+ if(module_active(module))
+ select_module(module)
+ else
+ deselect_module(get_selected_module()) //If we can't do select anything, at least deselect the current module.
+ return
+
+//cycle_modules() - Cycles through the list of selected modules.
+/mob/living/silicon/robot/proc/cycle_modules()
+ var/slot_start = get_selected_module()
+ if(slot_start)
+ deselect_module(slot_start) //Only deselect if we have a selected slot.
+
+ var/slot_num
+ if(slot_start == 0)
+ slot_num = 1
+ slot_start = 4
+ else
+ slot_num = slot_start + 1
+
+ while(slot_num != slot_start) //If we wrap around without finding any free slots, just give up.
+ if(module_active(slot_num))
+ select_module(slot_num)
+ return
+ slot_num++
+ if(slot_num > 4) // not >3 otherwise cycling with just one item on module 3 wouldn't work
+ slot_num = 1 //Wrap around.
+
+
+
+/mob/living/silicon/robot/swap_hand()
+ cycle_modules()
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 6ff04231af..641e78a0f3 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -70,8 +70,6 @@
var/parrot_dam_zone = list("chest", "head", "l_arm", "l_leg", "r_arm", "r_leg") //For humans, select a bodypart to attack
var/parrot_speed = 5 //"Delay in world ticks between movement." according to byond. Yeah, that's BS but it does directly affect movement. Higher number = slower.
- //var/parrot_been_shot = 0 this wasn't working right, and parrots don't survive bullets.((Parrots get a speed bonus after being shot. This will deincrement every Life() and at 0 the parrot will return to regular speed.))
-
var/parrot_lastmove = null //Updates/Stores position of the parrot while it's moving
var/parrot_stuck = 0 //If parrot_lastmove hasnt changed, this will increment until it reaches parrot_stuck_threshold
var/parrot_stuck_threshold = 10 //if this == parrot_stuck, it'll force the parrot back to wandering
@@ -547,8 +545,6 @@
parrot_state = PARROT_WANDER
walk_away(src, parrot_interest, 1, parrot_speed)
- /*if(parrot_been_shot > 0)
- parrot_been_shot-- didn't work anyways, and besides, any bullet poly survives isn't worth the speed boost.*/
if(isStuck())
return
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index 0ec41119dc..6cc1df085c 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -112,7 +112,6 @@
if(!environment)
return
- //var/environment_heat_capacity = environment.heat_capacity()
var/loc_temp = get_temperature(environment)
bodytemperature += adjust_body_temperature(bodytemperature, loc_temp, 1)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index df80302743..9a9b161e51 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -420,18 +420,6 @@
I.attack_self(src)
update_inv_hands()
-
-/*
-/mob/verb/dump_source()
-
- var/master = ""
- for(var/t in typesof(/area))
- master += text("[]\n", t)
- //Foreach goto(26)
- src << browse(master)
- return
-*/
-
/mob/verb/memory()
set name = "Notes"
set category = "IC"
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 525e6ecb2c..58cb82714e 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -110,9 +110,6 @@
var/list/mob_spell_list = list() //construct spells and mime spells. Spells that do not transfer from one mob to another and can not be lost in mindswap.
-//Changlings, but can be used in other modes
-// var/obj/effect/proc_holder/changpower/list/power_list = list()
-
//List of active diseases
var/list/viruses = list() // list of all diseases in a mob
diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
index ae719c9bc4..2141f4fdd7 100644
--- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
@@ -41,7 +41,6 @@
var/turf/T = get_turf(ui_host())
if(!T)
return
- //var/valid_z_levels = (GetConnectedZlevels(T.z) & using_map.station_levels)
for(var/obj/machinery/power/supermatter_shard/S in GLOB.machines)
// Delaminating, not within coverage, not on a tile.
if(!((S.z in GLOB.station_z_levels) || S.z == ZLEVEL_MINING || S.z == T.z || !isturf(S.loc)))
diff --git a/code/modules/ninja/Ninja_Readme.dm b/code/modules/ninja/Ninja_Readme.dm
deleted file mode 100644
index 2d383f9b1f..0000000000
--- a/code/modules/ninja/Ninja_Readme.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
-
-Removing Snowflake:
-- Search for NINJACODE (one word, all caps) to find Space Ninja Code outside of the /modules/ninja folder.
-
-Ninja Folder:
-- This folder contains 90% of Ninja code and will eventually contain it all, once snowflake is cleaned out
-
-*/
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index 72dce2b8d2..21d157a33c 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -101,7 +101,6 @@
if(href_list["retrieve"])
usr << browse("", "window=filingcabinet") // Close the menu
- //var/retrieveindex = text2num(href_list["retrieve"])
var/obj/item/P = locate(href_list["retrieve"])//contents[retrieveindex]
if(istype(P) && P.loc == src && in_range(src, usr))
usr.put_in_hands(P)
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index f0bcf5e9f1..327b3a716a 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -180,7 +180,6 @@
for(var/direction in GLOB.alldirs)
var/found_am_device=0
for(var/obj/machinery/machine in get_step(loc, direction))
- //var/machine = locate(/obj/machinery, get_step(loc, direction))
if(!machine)
continue//Need all for a core
if(istype(machine, /obj/machinery/am_shielding) || istype(machine, /obj/machinery/power/am_control_unit))
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index ce1148f985..35d104819f 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1052,15 +1052,6 @@
force_update = 1
return
- /*
- if (equipment > 1) // off=0, off auto=1, on=2, on auto=3
- use_power(src.equip_consumption, EQUIP)
- if (lighting > 1) // off=0, off auto=1, on=2, on auto=3
- use_power(src.light_consumption, LIGHT)
- if (environ > 1) // off=0, off auto=1, on=2, on auto=3
- use_power(src.environ_consumption, ENVIRON)
-
- area.calc_lighting() */
lastused_light = area.usage(STATIC_LIGHT)
lastused_light += area.usage(LIGHT)
lastused_equip = area.usage(EQUIP)
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 040a05c1cb..3e57ae2689 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -111,12 +111,6 @@
/obj/item/stock_parts/cell/proc/explode()
var/turf/T = get_turf(src.loc)
-/*
- * 1000-cell explosion(T, -1, 0, 1, 1)
- * 2500-cell explosion(T, -1, 0, 1, 1)
- * 10000-cell explosion(T, -1, 1, 3, 3)
- * 15000-cell explosion(T, -1, 2, 4, 4)
- * */
if (charge==0)
return
var/devastation_range = -1 //round(charge/11000)
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index 5369686b31..6a8c6ec5ec 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -1,12 +1,3 @@
-// dummy generator object for testing
-
-/*/obj/machinery/power/generator/verb/set_amount(var/g as num)
- set src in view(1)
-
- gen_amount = g
-
-*/
-
/obj/machinery/power/generator
name = "thermoelectric generator"
desc = "It's a high efficiency thermoelectric generator."
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index d17071eeb3..933cfc70e0 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -188,7 +188,6 @@
// if unmarked==1, only return those with no powernet
/proc/power_list(turf/T, source, d, unmarked=0, cable_only = 0)
. = list()
- //var/fdir = (!d)? 0 : turn(d, 180) // the opposite direction to d (or 0 if d==0)
for(var/AM in T)
if(AM == source)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index fc06adfe78..7596d890e0 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -152,11 +152,6 @@
/obj/machinery/power/emitter/emp_act(severity)//Emitters are hardened but still might have issues
-// add_load(1000)
-/* if((severity == 1)&&prob(1)&&prob(1))
- if(src.active)
- src.active = 0
- src.use_power = IDLE_POWER_USE */
return 1
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 0d1a8904f4..497fc53ae3 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -139,7 +139,6 @@
// It's a simplified version taking only 1/10 of the moles from the turf nearby. It should be later changed into a better version
var/transfer_moles = environment.total_moles()/10
- //var/transfer_moles = rpm/10000*capacity
var/datum/gas_mixture/removed = inturf.remove_air(transfer_moles)
gas_contained.merge(removed)
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index bb26694021..a45b713b85 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -336,7 +336,6 @@
step_towards(src, locate(new_x, new_y, z))
pixel_x = old_pixel_x
pixel_y = old_pixel_y
- //var/animation_time = ((SSprojectiles.flags & SS_TICKER? (SSprojectiles.wait * world.tick_lag) : SSprojectiles.wait) / moves)
animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = 1, flags = ANIMATION_END_NOW)
old_pixel_x = pixel_x_offset
old_pixel_y = pixel_y_offset
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 6d541dad1a..05135e9765 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -179,12 +179,6 @@
if(C)
C.set_operable(stepdir, id, op)
-/*
-/obj/machinery/conveyor/verb/destroy()
- set src in view()
- src.broken()
-*/
-
/obj/machinery/conveyor/power_change()
..()
update()
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 51485380ce..6d0c32fcb1 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -191,16 +191,6 @@
construction_time = 130
category = list("Odysseus")
-/*/datum/design/odysseus_armor
- name = "Exosuit Armor (\"Odysseus\")"
- id = "odysseus_armor"
- build_type = MECHFAB
- build_path = /obj/item/mecha_parts/part/odysseus_armor
- materials = list(MAT_METAL=15000)
- construction_time = 200
- category = list("Odysseus")
- */
-
//Gygax
/datum/design/gygax_chassis
name = "Exosuit Chassis (\"Gygax\")"
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 1f2a3bb472..57ca602774 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -43,20 +43,6 @@
temp_list[O] = text2num(temp_list[O])
return temp_list
-/* //uncomment to enable forced reactions.
-/obj/machinery/r_n_d/experimentor/verb/forceReaction()
- set name = "Force Experimentor Reaction"
- set category = "Debug"
- set src in oview(1)
- var/reaction = input(usr,"What reaction?") in list(SCANTYPE_POKE,SCANTYPE_IRRADIATE,SCANTYPE_GAS,SCANTYPE_HEAT,SCANTYPE_COLD,SCANTYPE_OBLITERATE)
- var/oldReaction = item_reactions["[loaded_item.type]"]
- item_reactions["[loaded_item.type]"] = reaction
- experiment(item_reactions["[loaded_item.type]"],loaded_item)
- spawn(10)
- if(loaded_item)
- item_reactions["[loaded_item.type]"] = oldReaction
-*/
-
/obj/machinery/r_n_d/experimentor/proc/SetTypeReactions()
var/probWeight = 0
for(var/I in typesof(/obj/item))
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index 295dd4429a..d42e43ec9a 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -98,8 +98,6 @@ GLOBAL_LIST_INIT(message_servers, list())
return newKey
/obj/machinery/message_server/process()
- //if(decryptkey == "password")
- // decryptkey = generateKey()
if(active && (stat & (BROKEN|NOPOWER)))
active = 0
return
diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm
index a145028ad3..22f420df91 100644
--- a/code/modules/security_levels/security_levels.dm
+++ b/code/modules/security_levels/security_levels.dm
@@ -56,11 +56,6 @@ GLOBAL_VAR_INIT(security_level, 0)
else
minor_announce(CONFIG_GET(string/alert_red_downto), "Attention! Code red!")
GLOB.security_level = SEC_LEVEL_RED
-
- /* - At the time of commit, setting status displays didn't work properly
- var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world)
- if(CC)
- CC.post_status("alert", "redalert")*/
sound_to_playing_players('sound/misc/voyalert.ogg')
for(var/obj/machinery/firealarm/FA in GLOB.machines)
if(FA.z in GLOB.station_z_levels)
@@ -116,15 +111,3 @@ GLOBAL_VAR_INIT(security_level, 0)
return SEC_LEVEL_RED
if("delta")
return SEC_LEVEL_DELTA
-
-
-/*DEBUG
-/mob/verb/set_thing0()
- set_security_level(0)
-/mob/verb/set_thing1()
- set_security_level(1)
-/mob/verb/set_thing2()
- set_security_level(2)
-/mob/verb/set_thing3()
- set_security_level(3)
-*/
diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
index f2d451f6e2..6db6e73cff 100644
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -140,6 +140,7 @@
name = "Bardrone"
desc = "A barkeeping drone, an indestructible robot built to tend bars."
seeStatic = FALSE
+ hacked = TRUE
laws = "1. Serve drinks.\n\
2. Talk to patrons.\n\
3. Don't get messed up in their affairs."
@@ -227,10 +228,10 @@
/obj/effect/forcefield/luxury_shuttle/CollidedWith(atom/movable/AM)
if(!isliving(AM))
return ..()
-
+
if(check_times[AM] && check_times[AM] > world.time) //Let's not spam the message
return ..()
-
+
check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN
var/total_cash = 0
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 20a79903ef..24cfd9ab92 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -57,6 +57,9 @@
H.throw_at(throw_target, 4, 3)
H.Knockdown(100)
H.adjustStaminaLoss(40)
+ if(!istype(H.head,/obj/item/clothing/head/helmet/) && !istype(H.head,/obj/item/clothing/head/hardhat))
+ H.adjustBrainLoss(3)
+ H.updatehealth()
visible_message("[src] crashes into [A], sending [H] flying!")
playsound(src, 'sound/effects/bang.ogg', 50, 1)
@@ -131,4 +134,4 @@
var/mob/living/carbon/H = buckled_mobs[1]
unbuckle_mob(H)
S.buckle_mob(H)
- qdel(src)
\ No newline at end of file
+ qdel(src)
diff --git a/html/changelogs/AutoChangeLog-pr-4030.yml b/html/changelogs/AutoChangeLog-pr-4030.yml
new file mode 100644
index 0000000000..ca630fbfd8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4030.yml
@@ -0,0 +1,5 @@
+author: "zennerx"
+delete-after: True
+changes:
+ - tweak: "Skateboard crashes now give slight brain damage!"
+ - rscadd: "Using a helmet prevents brain damage from the skateboard!"
diff --git a/html/changelogs/AutoChangeLog-pr-4032.yml b/html/changelogs/AutoChangeLog-pr-4032.yml
new file mode 100644
index 0000000000..4969c5bcaf
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4032.yml
@@ -0,0 +1,4 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "PubbyStation - Unpowered air injectors in various locations have been fixed."
diff --git a/html/changelogs/AutoChangeLog-pr-4033.yml b/html/changelogs/AutoChangeLog-pr-4033.yml
new file mode 100644
index 0000000000..effc283b83
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4033.yml
@@ -0,0 +1,5 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "MetaStation - Air injector leading out of the incinerator has been fixed"
+ - bugfix: "MetaStation - Corrected a couple maintenance airlocks being powered by the wrong areas."
diff --git a/html/changelogs/AutoChangeLog-pr-4038.yml b/html/changelogs/AutoChangeLog-pr-4038.yml
new file mode 100644
index 0000000000..9500855d83
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4038.yml
@@ -0,0 +1,4 @@
+author: "WJohnston"
+delete-after: True
+changes:
+ - bugfix: "Green banded default airlocks now have extended click area like all other airlocks."
diff --git a/html/changelogs/AutoChangeLog-pr-4043.yml b/html/changelogs/AutoChangeLog-pr-4043.yml
new file mode 100644
index 0000000000..b867396350
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4043.yml
@@ -0,0 +1,4 @@
+author: "Francinum"
+delete-after: True
+changes:
+ - tweak: "The shuttle build plate is now better sized for all stations."
diff --git a/icons/obj/doors/airlocks/station/public.dmi b/icons/obj/doors/airlocks/station/public.dmi
index efb4600adb..ac135873a6 100644
Binary files a/icons/obj/doors/airlocks/station/public.dmi and b/icons/obj/doors/airlocks/station/public.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index b68ee744a2..cf8d759a69 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1663,7 +1663,6 @@
#include "code\modules\mob\login.dm"
#include "code\modules\mob\logout.dm"
#include "code\modules\mob\mob.dm"
-#include "code\modules\mob\mob_cleanup.dm"
#include "code\modules\mob\mob_defines.dm"
#include "code\modules\mob\mob_helpers.dm"
#include "code\modules\mob\mob_movement.dm"
@@ -2011,7 +2010,6 @@
#include "code\modules\ninja\__ninjaDefines.dm"
#include "code\modules\ninja\energy_katana.dm"
#include "code\modules\ninja\ninja_event.dm"
-#include "code\modules\ninja\Ninja_Readme.dm"
#include "code\modules\ninja\outfit.dm"
#include "code\modules\ninja\suit\gloves.dm"
#include "code\modules\ninja\suit\head.dm"
@@ -2060,7 +2058,6 @@
#include "code\modules\power\rtg.dm"
#include "code\modules\power\smes.dm"
#include "code\modules\power\solar.dm"
-#include "code\modules\power\switch.dm"
#include "code\modules\power\terminal.dm"
#include "code\modules\power\tracker.dm"
#include "code\modules\power\turbine.dm"
![](\"tmp[REF(value)][rnd].png\")
"
- #else
- html += "[name] = /image (
refresh)