Merge branch 'master' into voting-moment

Signed-off-by: Mark Suckerberg <[email protected]>
shiptest-ss13 · Feb 11, 2024 · b533932 · b533932
2 parents fa40a55 + b3750d1
commit b533932
Show file tree

Hide file tree

Showing 400 changed files with 17,564 additions and 9,856 deletions.
diff --git a/.github/MC_tab.md b/.github/MC_tab.md
@@ -0,0 +1,36 @@
+The MC tab hold information on how the game is performing. Here's a crash course on what the most important of those numbers mean.
+
+If you already know what these numbers mean and you want to see them update faster than the default refresh rate of once every 2 seconds, you can enable the admin pref to make the MC tab refresh every 4 deciseconds. Please don't do this unless you actually need that information at a faster refresh rate since updating every subsystems information is expensive.
+
+# Main Entries:
+
+ * CPU: What percentage of a tick the game is using before starting the next tick. If this is above 100 it means we are over budget.
+
+ * TickCount: How many ticks should have elapsed since the start of the game if no ticks were ever delayed from starting.
+
+ * TickDrift: How many ticks since the game started that have been delayed. Essentially this is how many ticks the game is running behind. If this is increasing then the game is currently not able to keep up with demand.
+
+ * Internal Tick Usage: You might have heard of this referred to as "maptick". It's how much of the tick that an internal byond function called SendMaps() has taken recently. The higher this is the less time our code has to run. SendMaps() deals with sending players updates of their view of the game world so it has to run every tick but it's expensive so ideally this is optimized as much as possible. You can see a more detailed breakdown of the cost of SendMaps by looking at the profiler in the debug tab -> "Send Maps Profile". 
+
+# Master Controller Entry:
+
+ * TickRate: How many Byond ticks go between each master controller iteration. By default this is 1 meaning the MC runs once every byond tick. But certain configurations can increase this slightly.
+
+ * Iteration: How many times the MC has ran since starting.
+
+ * TickLimit: This SHOULD be what percentage of the tick the MC can use when it starts a run, however currently it just represents how much of the tick the MC can use by the time that SSstatpanels fires. Someone should fix that.
+
+# Subsystem Entries:
+
+Subsystems will typically have a base stat entry of the form: 
+[ ] Name	12ms|28%(2%)|3
+
+The brackets hold a letter if the subsystem is in a state other than idle.
+
+The first numbered entry is the cost of the subsystem, which is a running average of how many milliseconds the subsystem takes to complete a full run. This is increased every time the subsystem resumes an uncompleted run or starts a new run and decays when runs take less time. If this balloons to huge values then it means that the amount of work the subsystem needs to complete in a run is far greater than the amount of time it actually has to execute in whenever it is its turn to fire.
+
+The second numbered entry is like cost, but in percentage of an ideal tick this subsystem takes to complete a run. They both represent the same data.
+
+The third entry (2%) is how much time this subsystem spent executing beyond the time it was allocated by the MC. This is bad, it means that this subsystem doesn't yield when it's taking too much time and makes the job of the MC harder. The MC will attempt to account for this but it is better for all subsystems to be able to correctly yield when their turn is done.
+
+The fourth entry represents how many times this subsystem fires before it completes a run. 
diff --git a/_maps/RandomRuins/BeachRuins/beach_colony.dmm b/_maps/RandomRuins/BeachRuins/beach_colony.dmm
@@ -383,7 +383,7 @@
 	},
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "NG" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
 	pixel_x = 13
 	},
 /obj/item/toy/plush/carpplushie{

diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
@@ -230,7 +230,7 @@
 /turf/open/floor/plating,
 /area/ruin/unpowered)
 "kH" = (
-/obj/item/book/manual/wiki/engineering_construction,
+/obj/item/book/manual/wiki/construction,
 /turf/open/floor/plating/beach/sand{
 	light_range = 2
 	},
@@ -453,7 +453,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ruin/unpowered)
 "sB" = (
-/obj/item/book/manual/wiki/engineering_guide,
+/obj/item/book/manual/wiki/engineering,
 /turf/open/floor/plating/beach/sand{
 	light_range = 2
 	},
@@ -858,7 +858,7 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Kl" = (
 /obj/effect/radiation,
-/obj/item/book/manual/wiki/engineering_singulo_tesla,
+/obj/item/book/manual/wiki/engineering,
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Ko" = (

diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
@@ -3374,7 +3374,7 @@
 /obj/structure/cable/orange{
 	icon_state = "2-10"
 	},
-/obj/item/gun/ballistic/shotgun/lethal,
+/obj/item/gun/ballistic/shotgun/brimstone,
 /obj/structure/spacevine,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/beach/starwalker)

diff --git a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
@@ -297,7 +297,7 @@
 "mD" = (
 /obj/structure/table/wood,
 /obj/machinery/light/small/directional/north,
-/obj/item/gun/ballistic/shotgun/winchester,
+/obj/item/gun/ballistic/shotgun/flamingarrow,
 /turf/open/floor/wood,
 /area/ruin/beach)
 "mE" = (

diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -3308,7 +3308,7 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "MY" = (
 /obj/structure/table,
-/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/book/manual/wiki/drinks,
 /turf/open/floor/wood{
 	light_range = 2
 	},
@@ -3321,7 +3321,7 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Ni" = (
 /obj/structure/table/wood,
-/obj/item/book/manual/wiki/medical_cloning,
+/obj/item/book/manual/wiki/medicine,
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/wood,
 /area/ruin/beach/oceantown)

diff --git a/_maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm b/_maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm
@@ -870,7 +870,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ruin/powered/hydroponicslab)
 "oo" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
 	pixel_x = 2;
 	pixel_y = -3
 	},
@@ -1794,7 +1794,7 @@
 /area/ruin/powered/hydroponicslab)
 "Mz" = (
 /obj/effect/decal/cleanable/blood,
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
@@ -617,7 +617,7 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/obj/item/book/manual/wiki/engineering_singulo_tesla,
+/obj/item/book/manual/wiki/engineering,
 /turf/open/floor/plasteel/icemoon,
 /area/ruin)
 "bE" = (
@@ -828,7 +828,7 @@
 /turf/open/floor/plasteel/icemoon,
 /area/ruin)
 "cc" = (
-/obj/item/book/manual/wiki/atmospherics,
+/obj/item/book/manual/wiki/engineering,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm
@@ -127,7 +127,8 @@
 "iT" = (
 /obj/structure/stone_tile/slab,
 /mob/living/simple_animal/hostile/megafauna/dragon/icemoon{
-	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair)
+	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair);
+	crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher,/obj/item/keycard/gatedrop/drakelair)
 	},
 /turf/open/indestructible/boss,
 /area/ruin)

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
@@ -56,7 +56,7 @@
 /turf/open/floor/wood,
 /area/ruin/powered)
 "sC" = (
-/obj/item/gun/ballistic/rifle/boltaction,
+/obj/item/gun/ballistic/rifle/illestren,
 /obj/structure/table/wood,
 /obj/item/flashlight/lantern,
 /turf/open/floor/wood,

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm
@@ -1416,7 +1416,6 @@
 "ex" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
-/obj/item/book/manual/wiki/security_space_law,
 /obj/effect/turf_decal/corner/opaque/red{
 	dir = 1
 	},

diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
@@ -597,7 +597,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/item/book/manual/wiki/medical_cloning{
+/obj/item/book/manual/wiki/medicine{
 	pixel_x = 14
 	},
 /obj/structure/fluff/paper/stack{
@@ -1305,7 +1305,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/item/book/manual/wiki/engineering_guide{
+/obj/item/book/manual/wiki/engineering{
 	pixel_x = -6;
 	pixel_y = 9
 	},
@@ -1581,7 +1581,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/item/book/manual/wiki/plumbing{
+/obj/item/book/manual/wiki/piloting{
 	pixel_y = 7;
 	pixel_x = 5
 	},
@@ -2058,7 +2058,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/item/book/manual/wiki/telescience{
+/obj/item/book/manual/wiki/surgery{
 	pixel_y = 11;
 	pixel_x = -4
 	},
@@ -2760,7 +2760,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/item/book/manual/wiki/robotics_cyborgs{
+/obj/item/book/manual/wiki/robotics{
 	pixel_x = -5;
 	pixel_y = 4
 	},
@@ -2929,7 +2929,7 @@
 /turf/open/floor/wood,
 /area/ruin/jungle)
 "SN" = (
-/obj/item/book/manual/wiki/research_and_development{
+/obj/item/book/manual/wiki/command{
 	pixel_y = 5;
 	pixel_x = -5
 	},
@@ -2980,7 +2980,7 @@
 /turf/closed/mineral/random/jungle,
 /area/ruin/jungle)
 "TE" = (
-/obj/structure/bookcase/manuals/research_and_development,
+/obj/structure/bookcase/manuals/chemistry,
 /turf/open/floor/wood,
 /area/ruin/jungle)
 "TH" = (
@@ -3254,7 +3254,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/item/book/manual/wiki/infections{
+/obj/item/book/manual/wiki/piloting{
 	pixel_x = 2;
 	pixel_y = 10
 	},

diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -544,7 +544,7 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "dZ" = (
 /obj/structure/table/wood,
-/obj/item/book/manual/wiki/engineering_guide,
+/obj/item/book/manual/wiki/engineering,
 /obj/machinery/light/small/broken/directional/west,
 /turf/open/floor/wood,
 /area/ruin/jungle/starport)
@@ -1939,7 +1939,7 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "nI" = (
 /obj/structure/table/wood,
-/obj/item/book/manual/wiki/toxins,
+/obj/item/book/manual/wiki/chemistry,
 /obj/machinery/light/small/broken/directional/east,
 /turf/open/floor/wood{
 	icon_state = "wood-broken3"

diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -1379,7 +1379,7 @@
 /obj/item/gun/ballistic/shotgun/automatic/combat{
 	pixel_y = 5
 	},
-/obj/item/gun/ballistic/revolver/nagant{
+/obj/item/gun/ballistic/revolver/ashhand{
 	pixel_y = -1
 	},
 /turf/open/floor/plasteel/tech,
@@ -1760,13 +1760,12 @@
 	pixel_x = -3;
 	pixel_y = -5
 	},
-/obj/item/ammo_box/n762_clip,
-/obj/item/ammo_box/n762,
+/obj/item/ammo_casing/a4570,
 /obj/item/ammo_box/magazine/aks74u,
 /obj/item/ammo_box/magazine/aks74u,
 /obj/item/ammo_box/magazine/aks74u,
-/obj/item/ammo_box/n762,
-/obj/item/ammo_box/n762_clip,
+/obj/item/ammo_box/magazine/illestren_a850r,
+/obj/item/ammo_box/magazine/illestren_a850r,
 /turf/open/floor/plasteel/tech,
 /area/ruin/jungle/cavecrew/security)
 "vr" = (
@@ -2332,14 +2331,10 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/siding/wood/corner,
-/obj/item/book/manual/wiki/engineering_guide{
+/obj/item/book/manual/wiki/engineering{
 	pixel_x = 5;
 	pixel_y = -7
 	},
-/obj/item/book/manual/wiki/grenades{
-	pixel_x = -3;
-	pixel_y = 1
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/wrapping,
 /turf/open/floor/wood,
@@ -2818,11 +2813,11 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/siding/wood,
-/obj/item/book/manual/wiki/engineering_hacking{
+/obj/item/book/manual/wiki/hacking{
 	pixel_x = -8;
 	pixel_y = 6
 	},
-/obj/item/book/manual/wiki/cooking_to_serve_man{
+/obj/item/book/manual/wiki/cooking{
 	pixel_x = 5;
 	pixel_y = -6
 	},
@@ -3119,7 +3114,7 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/machinery/fax/frontiersmen,
+/obj/machinery/fax/ruin,
 /turf/open/floor/plasteel/tech,
 /area/ruin/jungle/cavecrew/bridge)
 "Ls" = (
@@ -3782,7 +3777,7 @@
 	color = "#66b266";
 	dir = 4
 	},
-/obj/item/book/manual/wiki/experimentor{
+/obj/item/book/manual/wiki/surgery{
 	pixel_x = 10;
 	pixel_y = -5
 	},

diff --git a/_maps/RandomRuins/JungleRuins/jungle_demon.dmm b/_maps/RandomRuins/JungleRuins/jungle_demon.dmm
@@ -515,7 +515,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/suit_storage_unit/inherit,
 /obj/item/tank/internals/oxygen/red,
-/obj/item/clothing/suit/space/hardsuit/syndi,
+/obj/item/clothing/suit/space/hardsuit/syndi/ramzi,
 /obj/item/clothing/mask/gas/syndicate,
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered)

diff --git a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
@@ -745,7 +745,7 @@
 /obj/effect/mob_spawn/human/corpse/assistant{
 	outfit = /datum/outfit/job/chemist
 	},
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
 	pixel_y = -13
 	},
 /turf/open/floor/plating/dirt/jungle/wasteland/lit,

diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -5802,7 +5802,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "Lv" = (
 /obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/tcomms{
+/obj/item/book/manual/wiki/construction{
 	pixel_x = -7;
 	pixel_y = 4
 	},
@@ -6376,10 +6376,6 @@
 /obj/item/radio/intercom/directional/south{
 	name = "Station Intercom (General)"
 	},
-/obj/item/book/manual/wiki/security_space_law{
-	pixel_x = -4;
-	pixel_y = 4
-	},
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/overmap_encounter/planetoid/cave/explored)
 "OC" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm b/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm
@@ -265,7 +265,7 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "LD" = (
-/obj/item/ammo_box/n762,
+/obj/item/ammo_box/c45_speedloader,
 /obj/structure/table/wood/poker,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
@@ -313,9 +313,9 @@
 /area/ruin/unpowered)
 "Sk" = (
 /obj/structure/safe,
-/obj/item/gun/ballistic/shotgun/lethal,
-/obj/item/gun/ballistic/shotgun/lethal,
-/obj/item/gun/ballistic/shotgun/lethal,
+/obj/item/gun/ballistic/shotgun/brimstone,
+/obj/item/gun/ballistic/shotgun/brimstone,
+/obj/item/gun/ballistic/shotgun/brimstone,
 /obj/item/gun/grenadelauncher,
 /turf/open/floor/wood,
 /area/ruin/unpowered)