TGS Test Merge (#5306)

citadel.dme

@@ -3258,6 +3258,7 @@
 #include "code\modules\maps\templates\shuttles\admin_spawn\manta_mercship.dm"
 #include "code\modules\maps\templates\shuttles\admin_spawn\mercenarybase.dm"
 #include "code\modules\maps\templates\shuttles\admin_spawn\mercship.dm"
+#include "code\modules\maps\templates\shuttles\admin_spawn\OM_paperclipper.dm"
 #include "code\modules\maps\templates\shuttles\admin_spawn\salamander.dm"
 #include "code\modules\maps\templates\shuttles\admin_spawn\screebarge.dm"
 #include "code\modules\maps\templates\shuttles\admin_spawn\shelter_5.dm"
@@ -3269,6 +3270,8 @@
 #include "code\modules\maps\templates\submaps\class_p\class_p.dm"
 #include "code\modules\maps\templates\submaps\debrisfield\debrisfield_old.dm"
 #include "code\modules\maps\templates\submaps\debrisfield\debrisfield_submaptemplate.dm"
+#include "code\modules\maps\templates\submaps\generic\generic_areas.dm"
+#include "code\modules\maps\templates\submaps\generic\generic_templates.dm"
 #include "code\modules\maps\templates\submaps\lavaland\lavaland.dm"
 #include "code\modules\maps\templates\submaps\lythios_rift\lyhtios.dm"
 #include "code\modules\maps\templates\submaps\lythios_rift\lythios_areas.dm"

code/game/turfs/simulated.dm

@@ -183,9 +183,6 @@
  else if(ishuman(M))
  add_blood(M)
 
-/turf/simulated/floor/plating
- can_start_dirty = TRUE // But let maints and decrepit areas have some randomness
-
 //? Radiation
 
 /turf/simulated/update_rad_insulation()

code/game/turfs/simulated/floor/floor.dm

@@ -40,6 +40,8 @@
  var/singleton/flooring/flooring
  var/mineral = MAT_STEEL
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor)
+
 /turf/simulated/floor/is_plating()
  return !flooring
 
@@ -235,3 +237,5 @@
  add_overlay(GLOB.no_ceiling_image, TRUE)
  else
  cut_overlay(GLOB.no_ceiling_image, TRUE)
+
+

code/game/turfs/simulated/floor/floor_types_eris.dm

@@ -883,6 +883,8 @@
  /obj/structure/flora/ausbushes/sparsegrass,
  /obj/structure/flora/ausbushes/fullgrass
  )
+
+CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/grass/heavy)
 /turf/simulated/floor/outdoors/grass/heavy/interior
  name = "heavy grass"
  desc = "A dense sheet of harvested turf used in interior decoration."

code/game/turfs/simulated/floor_types/concrete.dm

@@ -8,6 +8,8 @@
  edge_blending_priority = 0
  smoothing_flags = NONE
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/concrete)
+
 /turf/simulated/floor/concrete/tile
  name = "concrete tile"
  desc = "That's concrete baby!"
@@ -16,6 +18,8 @@
  initial_flooring = /singleton/flooring/concrete/tile
  baseturfs = /turf/simulated/floor/outdoors/dirt
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/concrete/tile)
+
 /turf/simulated/floor/concrete/rng/Initialize(mapload)
  . = ..()
  if(prob(5))

code/game/turfs/simulated/floor_types/dirt.dm

@@ -6,6 +6,8 @@
  initial_flooring = /singleton/flooring/outdoors/dirt
  baseturfs = /turf/baseturf_bottom
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/dirt)
+
 /turf/simulated/floor/outdoors/dirt
  outdoors = FALSE
 
@@ -17,5 +19,7 @@
  initial_flooring = /singleton/flooring/outdoors/dirt
  baseturfs = /turf/baseturf_bottom
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/dirtlight)
+
 /turf/simulated/floor/outdoors/dirtlight
  outdoors = FALSE

code/game/turfs/simulated/floor_types/glass.dm

@@ -16,6 +16,8 @@
 
  mz_flags = MZ_MIMIC_DEFAULTS
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/glass)
+
 /turf/simulated/floor/glass/Initialize()
  . = ..()
  return INITIALIZE_HINT_LATELOAD
@@ -35,3 +37,5 @@
 
  // Currently if flooring is set, it breaks the layering of the glass floor.
  // initial_flooring = /singleton/flooring/glass/reinforced
+
+CREATE_STANDARD_TURFS(/turf/simulated/floor/glass/reinforced)

code/game/turfs/simulated/floor_types/outdoors.dm

@@ -13,12 +13,14 @@
  name = "mud"
  icon_state = "mud_dark"
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/mud)
 /turf/simulated/floor/outdoors/rocks
  name = "rocks"
  desc = "Hard as a rock."
  icon_state = "rock"
  baseturfs = /turf/baseturf_bottom
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/rocks)
 /turf/simulated/floor/outdoors/rocks/caves
  outdoors = FALSE
 

code/game/turfs/simulated/floor_types/snow.dm

@@ -12,6 +12,8 @@
 
  var/crossed_dirs = NONE
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/snow)
+
 /turf/simulated/floor/outdoors/snow/Entered(atom/movable/AM)
  if(AM.hovering || AM.is_incorporeal()) // Flying things shouldn't make footprints.
  return ..()
@@ -58,6 +60,8 @@
  desc = "Looks slippery."
  edge_blending_priority = 0
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/ice)
+
 /turf/simulated/floor/outdoors/ice/Entered(var/mob/living/M)
  . = ..()
  if(istype(M, /mob/living))
@@ -73,6 +77,8 @@
  slowdown = 4
  edge_blending_priority = 0
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/outdoors/shelfice)
+
 // Ice that is safe to walk on.
 /turf/simulated/floor/outdoors/safeice
  name = "ice"

code/game/turfs/simulated/flooring/flooring_premade.dm

@@ -122,6 +122,8 @@
  icon_state = "wood"
  initial_flooring = /singleton/flooring/wood
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/wood)
+
 /turf/simulated/floor/wood/broken
  icon_state = "broken0" // This gets changed when spawned.
 
@@ -135,6 +137,8 @@
  icon_state = "sifwood"
  initial_flooring = /singleton/flooring/wood/sif
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/wood/sif)
+
 /turf/simulated/floor/wood/sif/broken
  icon_state = "sifwood_broken0" // This gets changed when spawned.
 
@@ -147,12 +151,14 @@
  icon = 'icons/turf/flooring/grass.dmi'
  icon_state = "grass0"
  initial_flooring = /singleton/flooring/grass
+CREATE_STANDARD_TURFS(/turf/simulated/floor/grass)
 
 /turf/simulated/floor/tiled
  name = "floor"
  icon = 'icons/turf/flooring/tiles.dmi'
  icon_state = "tiled"
  initial_flooring = /singleton/flooring/tiling
+CREATE_STANDARD_TURFS(/turf/simulated/floor/tiled)
 
 /turf/simulated/floor/tiled/techmaint
  name = "floor"
@@ -177,6 +183,7 @@
  name = "floor"
  icon_state = "monotile"
  initial_flooring = /singleton/flooring/tiling/new_tile/monotile
+CREATE_STANDARD_TURFS(/turf/simulated/floor/tiled/monotile)
 
 /turf/simulated/floor/tiled/monowhite
  name = "floor"
@@ -439,6 +446,8 @@ CREATE_STANDARD_TURFS(/turf/simulated/floor/reinforced)
  icon_state = "plasteel"
  initial_flooring = /singleton/flooring/plasteel
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/plasteel)
+
 /turf/simulated/floor/durasteel
  name = "durasteel"
  icon = 'icons/turf/flooring/misc.dmi'
@@ -463,6 +472,8 @@ CREATE_STANDARD_TURFS(/turf/simulated/floor/reinforced)
  icon_state = "phoron"
  initial_flooring = /singleton/flooring/phoron
 
+CREATE_STANDARD_TURFS(/turf/simulated/floor/phoron)
+
 /turf/simulated/floor/uranium
  name = "uranium"
  icon = 'icons/turf/flooring/misc.dmi'
@@ -538,14 +549,12 @@ CREATE_STANDARD_TURFS(/turf/simulated/floor/reinforced)
 /turf/simulated/floor/beach/water
 /turf/simulated/floor/beach/water/ocean
 */
+/**This literally does nothing, need to axe or make it do something */
 /turf/simulated/floor/airless/ceiling
-/turf/simulated/floor/plating
-
-/turf/simulated/floor/plating/external
- outdoors = TRUE
 
-/turf/simulated/floor/tiled/external
- outdoors = TRUE
+/turf/simulated/floor/plating
+ can_start_dirty = TRUE // But let maints and decrepit areas have some randomness
+CREATE_STANDARD_TURFS(/turf/simulated/floor/plating)
 
 //**** Here lives snow ****
 /turf/simulated/floor/snow

code/modules/awaymissions/pamphlet.dm

@@ -41,3 +41,8 @@
  name = "pamphlet - \'Violent Video Games and You\'"
  desc = "A pamphlet encouraging the reader to maintain a balanced lifestyle and take care of their mental health, while still enjoying video games in a healthy way. You probably don't need this..."
  info = "They don't make you kill people. There, we said it. Now get back to work!"
+
+/obj/item/paper/pamphlet/vacation
+ name = "pamphlet - \'Five Planets You MUST Visit\'"
+ desc = "A pamphlet showing of various resorts in exotic systems with exorbident prices."
+ info = "<i> Most of this is just advertisements and pictures of resorts with little actual substanence </i>"

code/modules/mapping/spawner/_spawner.dm

@@ -6,6 +6,7 @@
  icon = 'icons/mapping/spawners/spawners.dmi'
  icon_state = ""
  layer = MID_LANDMARK_LAYER
+ anchored = TRUE
  /// lateload?
  var/late = FALSE
 

code/modules/maps/templates/shuttles/admin_spawn/OM_paperclipper.dm

@@ -0,0 +1,59 @@
+// -- Datums -- //
+/datum/map_template/shuttle/overmap/generic/paper_clipper
+ name = "OM Ship - Paper Clipper (Cylon) (New Z)"
+ desc = "An old salvage ship, abandoned but seemingly intact."
+ suffix = "overmap_ship_paperclipper.dmm"
+
+// The 'shuttle'
+/datum/shuttle/autodock/overmap/paper_clipper
+ name = "Cylon"
+ current_location = "omship_spawn_paper_clipper"
+ docking_controller_tag = "paperclipper_airlock"
+ shuttle_area = list(/area/shuttle/paper_clipper,
+ /area/shuttle/paper_clipper/left_wing,
+ /area/shuttle/paper_clipper/right_wing,
+ /area/shuttle/paper_clipper/right_wing/shuttle_hanger
+ )
+ defer_initialisation = TRUE //We're not loaded until an admin does it
+ move_direction = NORTH
+ ceiling_type = /turf/simulated/floor/reinforced/airless
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/paper_clipper
+ name = "Cylon"
+ base_area = /area/space
+ base_turf = /turf/space
+ landmark_tag = "omship_spawn_paper_clipper"
+ shuttle_type = /datum/shuttle/autodock/overmap/paper_clipper
+
+/obj/overmap/entity/visitable/ship/landable/paper_clipper
+ scanner_name = "Cylon-class Vessel"
+ scanner_desc = @{"[i]Registration[/i]: Unknown
+[i]Class[/i]: Small Shuttle
+[i]Transponder[/i]: Transmitting (CIV), non-hostile
+[b]Notice[/b]: Small private vessel"}
+ color = "#292636"
+ vessel_mass = 1000
+ known = FALSE
+ vessel_size = SHIP_SIZE_SMALL
+ shuttle = "Cylon"
+
+// The shuttle's 'shuttle' computer
+/obj/machinery/computer/shuttle_control/explore/paper_clipper
+ name = "short jump console"
+ shuttle_tag = "Cylon"
+ req_one_access = list()
+
+/area/shuttle/paper_clipper
+ name = "\improper Central Section"
+ icon_state = "shuttle"
+ requires_power = 1
+
+/area/shuttle/paper_clipper/left_wing
+ name = "\improper Left Wing"
+
+/area/shuttle/paper_clipper/right_wing
+ name = "\improper Right Wing"
+
+/area/shuttle/paper_clipper/right_wing/shuttle_hanger
+ name = "\improper Right Wing Shuttle Hanger"

code/modules/maps/templates/submaps/generic/generic_areas.dm

@@ -0,0 +1,17 @@
+/area/submap/generic
+ name = "Generic Submap Area"
+ icon_state = "submap"
+ ambience = AMBIENCE_RUINS
+ unique = FALSE
+
+/area/submap/generic/outside_open_air
+ is_outside = OUTSIDE_YES
+ initial_gas_mix = ATMOSPHERE_USE_OUTDOORS
+
+/area/submap/generic/outside_roofed
+ is_outside = OUTSIDE_NO
+ initial_gas_mix = ATMOSPHERE_USE_OUTDOORS
+
+/area/submap/generic/inside_breath_mix
+ is_outside = OUTSIDE_NO
+ initial_gas_mix = GAS_STRING_STP

code/modules/maps/templates/submaps/generic/generic_templates.dm

@@ -0,0 +1,12 @@
+/datum/map_template/submap/level_specific/generic
+ name = "Generic POIs"
+ desc = "Generic "
+ allow_duplicates = FALSE // TRUE means the same submap can spawn twice
+ prefix = "maps/submaps/generic/"
+
+/datum/map_template/submap/level_specific/generic/test_1
+ name = "Generic Room 1"
+ suffix = "test_template_001.dmm" // map is in root folder, so just the name.dmm is fine
+ cost = 5 // budget cost for this submap. total budget is set in _triumph_submaps.dm where the seed_submaps proc is called
+ discard_prob = 0 // set probability of not spawning. 0 ensures always spawn.
+ allow_duplicates = TRUE

code/modules/mining/mine_turfs.dm

@@ -51,22 +51,27 @@ CREATE_STANDARD_TURFS(/turf/unsimulated/mineral)
  var/ignore_oregen = FALSE
  var/ignore_cavegen = FALSE
 
+CREATE_STANDARD_TURFS(/turf/simulated/mineral)
+
 /turf/simulated/mineral/rich
  //Placeholder, go to the oregen stuff at the bottom to see the oregen weight
-
+CREATE_STANDARD_TURFS(/turf/simulated/mineral/rich)
 // Alternatives that ignore ore_gen and cavegen
 /turf/simulated/mineral/ignore_oregen
  ignore_oregen = TRUE
 
+CREATE_STANDARD_TURFS(/turf/simulated/mineral/ignore_oregen)
 /turf/simulated/mineral/floor/ignore_oregen
  ignore_oregen = TRUE
 
 /turf/simulated/mineral/ignore_cavegen
  ignore_cavegen = TRUE
 
+CREATE_STANDARD_TURFS(/turf/simulated/mineral/ignore_cavegen)
 /turf/simulated/mineral/floor/ignore_cavegen
  ignore_cavegen = TRUE
 
+CREATE_STANDARD_TURFS(/turf/simulated/mineral/floor/ignore_cavegen)
 /turf/simulated/mineral/floor/ignore_cavegen/has_air
  initial_gas_mix = GAS_STRING_STP
 

code/unit_tests/datum/access.dm

@@ -6,6 +6,6 @@
  continue
  var/id = num2text(initial(A.access_value))
  if(lookup_ids[id])
- Fail("Collission on access value [id]")
+ Fail("Collision on [A] and [lookup_ids[id]]")
  continue
  lookup_ids[id] = A