[MIRROR] mixed global tweaks

code/__defines/items_clothing.dm

@@ -260,6 +260,7 @@
 	8 - things that take up an entire turf, like wall girders or door assemblies
 */
 
+<<<<<<< ours
 GLOBAL_LIST_INIT(default_onmob_icons, list(
 	slot_l_hand_str = 'icons/mob/onmob/items/lefthand.dmi',\
 	slot_r_hand_str = 'icons/mob/onmob/items/righthand.dmi',\
@@ -279,4 +280,25 @@ GLOBAL_LIST_INIT(default_onmob_icons, list(
 	slot_gloves_str = 'icons/mob/onmob/onmob_hands.dmi',\
 	slot_s_store_str = 'icons/mob/onmob/onmob_belt_mirror.dmi',\
 	slot_tie_str = 'icons/mob/onmob/onmob_accessories.dmi'\
+=======
+GLOBAL_LIST_AS(default_onmob_icons, list(
+	slot_l_hand_str = 'icons/mob/onmob/items/lefthand.dmi',
+	slot_r_hand_str = 'icons/mob/onmob/items/righthand.dmi',
+	slot_belt_str = 'icons/mob/onmob/onmob_belt.dmi',
+	slot_back_str = 'icons/mob/onmob/onmob_back.dmi',
+	slot_l_ear_str = 'icons/mob/onmob/onmob_ears.dmi',
+	slot_r_ear_str = 'icons/mob/onmob/onmob_ears.dmi',
+	slot_glasses_str = 'icons/mob/onmob/onmob_eyes.dmi',
+	slot_wear_id_str = 'icons/mob/onmob/onmob_id.dmi',
+	slot_w_uniform_str = 'icons/mob/onmob/onmob_under.dmi',
+	slot_wear_suit_str = 'icons/mob/onmob/onmob_suit.dmi',
+	slot_head_str = 'icons/mob/onmob/onmob_head.dmi',
+	slot_shoes_str = 'icons/mob/onmob/onmob_feet.dmi',
+	slot_wear_mask_str = 'icons/mob/onmob/onmob_mask.dmi',
+	slot_handcuffed_str = 'icons/mob/onmob/onmob_cuff.dmi',
+	slot_legcuffed_str = 'icons/mob/onmob/onmob_cuff.dmi',
+	slot_gloves_str = 'icons/mob/onmob/onmob_hands.dmi',
+	slot_s_store_str = 'icons/mob/onmob/onmob_belt_mirror.dmi',
+	slot_tie_str = 'icons/mob/onmob/onmob_accessories.dmi'
+>>>>>>> theirs
 ))

code/_global_vars/misc.dm

@@ -4,11 +4,19 @@ GLOBAL_LIST_EMPTY(all_observable_events)
 //GLOBAL_VAR_INIT(defer_powernet_rebuild, FALSE) //[SIERRA-REMOVE]
 
 // Those networks can only be accessed by pre-existing terminals. AIs and new terminals can't use them.
+<<<<<<< ours
 GLOBAL_LIST_INIT(restricted_camera_networks, list(\
 	NETWORK_ERT,\
 	NETWORK_MERCENARY,\
 	NETWORK_CRESCENT,\
 	"Secret"\
+=======
+GLOBAL_LIST_AS(restricted_camera_networks, list(
+	NETWORK_ERT,
+	NETWORK_MERCENARY,
+	NETWORK_CRESCENT,
+	"Secret"
+>>>>>>> theirs
 ))
 
 GLOBAL_VAR_INIT(stat_flags_planted, 0)

code/datums/repositories/repository.dm

@@ -1,6 +1,3 @@
-/repository/New()
-	return
-
 /datum/cache_entry
 	var/timestamp
 	var/data

code/datums/repositories/sound_channels.dm

@@ -1,3 +1,4 @@
+<<<<<<< ours
 GLOBAL_DATUM_INIT(sound_channels, /repository/sound_channels, new)
 GLOBAL_VAR_INIT(lobby_sound_channel, GLOB.sound_channels.RequestChannel("LOBBY"))
 GLOBAL_VAR_INIT(vote_sound_channel, GLOB.sound_channels.RequestChannel("VOTE"))
@@ -6,6 +7,16 @@ GLOBAL_VAR_INIT(admin_sound_channel, GLOB.sound_channels.RequestChannel("ADMIN_F
 GLOBAL_VAR_INIT(ambience_channel_vents, GLOB.sound_channels.RequestChannel("AMBIENCE_VENTS"))
 GLOBAL_VAR_INIT(ambience_channel_forced, GLOB.sound_channels.RequestChannel("AMBIENCE_FORCED"))
 GLOBAL_VAR_INIT(ambience_channel_common, GLOB.sound_channels.RequestChannel("AMBIENCE_COMMON"))
+=======
+GLOBAL_TYPED_NEW_STEP(sound_channels, /repository/sound_channels, 40)
+GLOBAL_VAR_AS(lobby_sound_channel, GLOB.sound_channels.RequestChannel("LOBBY"))
+GLOBAL_VAR_AS(vote_sound_channel, GLOB.sound_channels.RequestChannel("VOTE"))
+GLOBAL_VAR_AS(admin_sound_channel, GLOB.sound_channels.RequestChannel("ADMIN_FUN"))
+
+GLOBAL_VAR_AS(ambience_channel_vents, GLOB.sound_channels.RequestChannel("AMBIENCE_VENTS"))
+GLOBAL_VAR_AS(ambience_channel_forced, GLOB.sound_channels.RequestChannel("AMBIENCE_FORCED"))
+GLOBAL_VAR_AS(ambience_channel_common, GLOB.sound_channels.RequestChannel("AMBIENCE_COMMON"))
+>>>>>>> theirs
 
 /repository/sound_channels
 	var/datum/stack/available_channels

code/datums/uplink/uplink_sources.dm

@@ -5,7 +5,8 @@
 GLOBAL_LIST_INIT(default_uplink_source_priority, list(
 	/singleton/uplink_source/pda,
 	/singleton/uplink_source/radio,
-	/singleton/uplink_source/unit))
+	/singleton/uplink_source/unit
+))
 
 /singleton/uplink_source
 	var/name

code/game/objects/items/buttons.dm

@@ -15,6 +15,7 @@
 	icon_state = "light-p"
 	obj_flags = OBJ_FLAG_CONDUCTIBLE
 
+<<<<<<< ours
 GLOBAL_LIST_INIT(possible_switch_offsets, list(
 		"North" = list(
 			"Middle Lower" = list(0,25),
@@ -36,6 +37,34 @@ GLOBAL_LIST_INIT(possible_switch_offsets, list(
 			"Offset Lower" = list(-25,7),
 			"Middle Upper" = list(-32,0),
 			"Offset Upper" = list(-32,7))))
+=======
+GLOBAL_LIST_AS(possible_switch_offsets, list(
+	"North" = list(
+		"Middle Lower" = list(0, 25),
+		"Offset Lower" = list(7, 25),
+		"Middle Upper" = list(0, 32),
+		"Offset Upper" = list(7, 32)
+	),
+	"East" = list(
+		"Middle Lower" = list(25, 0),
+		"Offset Lower" = list(25, 7),
+		"Middle Upper" = list(32, 0),
+		"Offset Upper" = list(32, 7)
+	),
+	"South" = list(
+		"Middle Lower" = list(0, -25),
+		"Offset Lower" = list(7, -25),
+		"Middle Upper" = list(0, -32),
+		"Offset Upper" = list(7, -32)
+	),
+	"West" = list(
+		"Middle Lower" = list(-25, 0),
+		"Offset Lower" = list(-25, 7),
+		"Middle Upper" = list(-32, 0),
+		"Offset Upper" = list(-32, 7)
+	)
+))
+>>>>>>> theirs
 
 
 /obj/item/frame/light_switch/proc/position_with_direction(obj/item/frame/light_switch/S as obj, mob/user as mob)

code/game/objects/items/weapons/RPD.dm

@@ -1,3 +1,4 @@
+<<<<<<< ours
 GLOBAL_LIST_INIT(rpd_pipe_selection, list(
 	new /datum/pipe/pipe_dispenser/simple() = list(
 		new /datum/pipe/pipe_dispenser/simple/straight(),
@@ -62,6 +63,75 @@ GLOBAL_LIST_INIT(rpd_pipe_selection_skilled, list(
 		new /datum/pipe/pipe_dispenser/device/manualvalve()
 		)
 	))
+=======
+GLOBAL_LIST_AS(rpd_pipe_selection, list(
+	new /datum/pipe/pipe_dispenser/simple = list(
+		new /datum/pipe/pipe_dispenser/simple/straight,
+		new /datum/pipe/pipe_dispenser/simple/bent,
+		new /datum/pipe/pipe_dispenser/simple/manifold,
+		new /datum/pipe/pipe_dispenser/simple/manifold4w,
+		new /datum/pipe/pipe_dispenser/simple/cap
+	),
+	new /datum/pipe/pipe_dispenser/supply = list(
+		new /datum/pipe/pipe_dispenser/supply/straight,
+		new /datum/pipe/pipe_dispenser/supply/bent,
+		new /datum/pipe/pipe_dispenser/supply/manifold,
+		new /datum/pipe/pipe_dispenser/supply/manifold4w,
+		new /datum/pipe/pipe_dispenser/supply/cap
+	),
+	new /datum/pipe/pipe_dispenser/scrubber = list(
+		new /datum/pipe/pipe_dispenser/scrubber/straight,
+		new /datum/pipe/pipe_dispenser/scrubber/bent,
+		new /datum/pipe/pipe_dispenser/scrubber/manifold,
+		new /datum/pipe/pipe_dispenser/scrubber/manifold4w,
+		new /datum/pipe/pipe_dispenser/scrubber/cap
+	),
+))
+
+GLOBAL_LIST_AS(rpd_pipe_selection_skilled, list(
+	new /datum/pipe/pipe_dispenser/simple = list(
+		new /datum/pipe/pipe_dispenser/simple/straight,
+		new /datum/pipe/pipe_dispenser/simple/bent,
+		new /datum/pipe/pipe_dispenser/simple/manifold,
+		new /datum/pipe/pipe_dispenser/simple/manifold4w,
+		new /datum/pipe/pipe_dispenser/simple/cap,
+		new /datum/pipe/pipe_dispenser/simple/up,
+		new /datum/pipe/pipe_dispenser/simple/down
+	),
+	new /datum/pipe/pipe_dispenser/supply = list(
+		new /datum/pipe/pipe_dispenser/supply/straight,
+		new /datum/pipe/pipe_dispenser/supply/bent,
+		new /datum/pipe/pipe_dispenser/supply/manifold,
+		new /datum/pipe/pipe_dispenser/supply/manifold4w,
+		new /datum/pipe/pipe_dispenser/supply/cap,
+		new /datum/pipe/pipe_dispenser/supply/up,
+		new /datum/pipe/pipe_dispenser/supply/down
+	),
+	new /datum/pipe/pipe_dispenser/scrubber = list(
+		new /datum/pipe/pipe_dispenser/scrubber/straight,
+		new /datum/pipe/pipe_dispenser/scrubber/bent,
+		new /datum/pipe/pipe_dispenser/scrubber/manifold,
+		new /datum/pipe/pipe_dispenser/scrubber/manifold4w,
+		new /datum/pipe/pipe_dispenser/scrubber/cap,
+		new /datum/pipe/pipe_dispenser/scrubber/up,
+		new /datum/pipe/pipe_dispenser/scrubber/down
+	),
+	new /datum/pipe/pipe_dispenser/fuel = list(
+		new /datum/pipe/pipe_dispenser/fuel/straight,
+		new /datum/pipe/pipe_dispenser/fuel/bent,
+		new /datum/pipe/pipe_dispenser/fuel/manifold,
+		new /datum/pipe/pipe_dispenser/fuel/manifold4w,
+		new /datum/pipe/pipe_dispenser/fuel/cap,
+		new /datum/pipe/pipe_dispenser/fuel/up,
+		new /datum/pipe/pipe_dispenser/fuel/down
+	),
+	new /datum/pipe/pipe_dispenser/device = list(
+		new /datum/pipe/pipe_dispenser/device/universaladapter,
+		new /datum/pipe/pipe_dispenser/device/gaspump,
+		new /datum/pipe/pipe_dispenser/device/manualvalve
+	)
+))
+>>>>>>> theirs
 
 /obj/item/rpd
 	name = "rapid piping device"

code/game/sound.dm

@@ -36,6 +36,7 @@
 #define ASTEROID CAVE
 #define SPACE UNDERWATER
 
+<<<<<<< ours
 GLOBAL_LIST_INIT(shatter_sound,list('sound/effects/Glassbr1.ogg','sound/effects/Glassbr2.ogg','sound/effects/Glassbr3.ogg'))
 GLOBAL_LIST_INIT(explosion_sound,list('sound/effects/Explosion1.ogg','sound/effects/Explosion2.ogg'))
 GLOBAL_LIST_INIT(spark_sound,list('sound/effects/sparks1.ogg','sound/effects/sparks2.ogg','sound/effects/sparks3.ogg','sound/effects/sparks4.ogg'))
@@ -54,6 +55,124 @@ GLOBAL_LIST_INIT(button_sound,list('sound/machines/button1.ogg','sound/machines/
 GLOBAL_LIST_INIT(chop_sound,list('sound/weapons/chop1.ogg','sound/weapons/chop2.ogg','sound/weapons/chop3.ogg'))
 GLOBAL_LIST_INIT(glasscrack_sound,list('sound/effects/glass_crack1.ogg','sound/effects/glass_crack2.ogg','sound/effects/glass_crack3.ogg','sound/effects/glass_crack4.ogg'))
 GLOBAL_LIST_INIT(tray_hit_sound,list('sound/items/trayhit1.ogg', 'sound/items/trayhit2.ogg'))
+=======
+GLOBAL_LIST_AS(shatter_sound, list(
+	'sound/effects/Glassbr1.ogg',
+	'sound/effects/Glassbr2.ogg',
+	'sound/effects/Glassbr3.ogg'
+))
+
+GLOBAL_LIST_AS(explosion_sound, list(
+	'sound/effects/Explosion1.ogg',
+	'sound/effects/Explosion2.ogg'
+))
+
+GLOBAL_LIST_AS(spark_sound, list(
+	'sound/effects/sparks1.ogg',
+	'sound/effects/sparks2.ogg',
+	'sound/effects/sparks3.ogg',
+	'sound/effects/sparks4.ogg'
+))
+
+GLOBAL_LIST_AS(rustle_sound, list(
+	'sound/effects/rustle1.ogg',
+	'sound/effects/rustle2.ogg',
+	'sound/effects/rustle3.ogg',
+	'sound/effects/rustle4.ogg',
+	'sound/effects/rustle5.ogg'
+))
+
+GLOBAL_LIST_AS(punch_sound, list(
+	'sound/weapons/punch1.ogg',
+	'sound/weapons/punch2.ogg',
+	'sound/weapons/punch3.ogg',
+	'sound/weapons/punch4.ogg'
+))
+
+GLOBAL_LIST_AS(clown_sound, list(
+	'sound/effects/clownstep1.ogg',
+	'sound/effects/clownstep2.ogg'
+))
+
+GLOBAL_LIST_AS(swing_hit_sound, list(
+	'sound/weapons/genhit1.ogg',
+	'sound/weapons/genhit2.ogg',
+	'sound/weapons/genhit3.ogg'
+))
+
+GLOBAL_LIST_AS(hiss_sound, list(
+	'sound/voice/hiss1.ogg',
+	'sound/voice/hiss2.ogg',
+	'sound/voice/hiss3.ogg',
+	'sound/voice/hiss4.ogg'
+))
+
+GLOBAL_LIST_AS(page_sound, list(
+	'sound/effects/pageturn1.ogg',
+	'sound/effects/pageturn2.ogg',
+	'sound/effects/pageturn3.ogg'
+))
+
+GLOBAL_LIST_AS(fracture_sound, list(
+	'sound/effects/bonebreak1.ogg',
+	'sound/effects/bonebreak2.ogg',
+	'sound/effects/bonebreak3.ogg',
+	'sound/effects/bonebreak4.ogg'
+))
+
+GLOBAL_LIST_AS(lighter_sound, list(
+	'sound/items/lighter1.ogg',
+	'sound/items/lighter2.ogg',
+	'sound/items/lighter3.ogg'
+))
+
+GLOBAL_LIST_AS(keyboard_sound, list(
+	'sound/machines/keyboard/keypress1.ogg',
+	'sound/machines/keyboard/keypress2.ogg',
+	'sound/machines/keyboard/keypress3.ogg',
+	'sound/machines/keyboard/keypress4.ogg'
+))
+
+GLOBAL_LIST_AS(keystroke_sound, list(
+	'sound/machines/keyboard/keystroke1.ogg',
+	'sound/machines/keyboard/keystroke2.ogg',
+	'sound/machines/keyboard/keystroke3.ogg',
+	'sound/machines/keyboard/keystroke4.ogg'
+))
+
+GLOBAL_LIST_AS(switch_sound, list(
+	'sound/machines/switch1.ogg',
+	'sound/machines/switch2.ogg',
+	'sound/machines/switch3.ogg',
+	'sound/machines/switch4.ogg'
+))
+
+GLOBAL_LIST_AS(button_sound, list(
+	'sound/machines/button1.ogg',
+	'sound/machines/button2.ogg',
+	'sound/machines/button3.ogg',
+	'sound/machines/button4.ogg'
+))
+
+GLOBAL_LIST_AS(chop_sound, list(
+	'sound/weapons/chop1.ogg',
+	'sound/weapons/chop2.ogg',
+	'sound/weapons/chop3.ogg'
+))
+
+GLOBAL_LIST_AS(glasscrack_sound, list(
+	'sound/effects/glass_crack1.ogg',
+	'sound/effects/glass_crack2.ogg',
+	'sound/effects/glass_crack3.ogg',
+	'sound/effects/glass_crack4.ogg'
+))
+
+GLOBAL_LIST_AS(tray_hit_sound, list(
+	'sound/items/trayhit1.ogg',
+	'sound/items/trayhit2.ogg'
+))
+
+>>>>>>> theirs
 
 /proc/playsound(atom/source, soundin, vol as num, vary, extrarange as num, falloff, is_global, frequency, is_ambiance = 0)
 	if (isnull(soundin))

code/modules/atmospherics/components/omni_devices/filter.dm

@@ -2,6 +2,7 @@
 // on the XGM gas datums - would need to have a consistent/constant
 // id for the gasses but otherwise should allow for true omni filters.
 
+<<<<<<< ours
 GLOBAL_LIST_INIT(filter_gas_to_mode, list(    \
 	"None" =           ATM_NONE,              \
 	"Oxygen" =         ATM_O2,                \
@@ -31,6 +32,37 @@ GLOBAL_LIST_INIT(filter_mode_to_gas_id, list( \
 	"[ATM_N2O]" =      "[GAS_N2O]",           \
 	"[ATM_H2]" =       "[GAS_HYDROGEN]",      \
 	"[ATM_CH3BR]" =    "[GAS_METHYL_BROMIDE]" \
+=======
+GLOBAL_LIST_AS(filter_gas_to_mode, list(
+	"None" = ATM_NONE,
+	"Oxygen" = ATM_O2,
+	"Nitrogen" = ATM_N2,
+	"Carbon Dioxide" = ATM_CO2,
+	"Phoron" = ATM_P,
+	"Nitrous Oxide" = ATM_N2O,
+	"Hydrogen" = ATM_H2,
+	"Methyl Bromide" = ATM_CH3BR
+))
+
+GLOBAL_LIST_AS(filter_mode_to_gas, list(
+	"[ATM_O2]" = "Oxygen",
+	"[ATM_N2]" = "Nitrogen",
+	"[ATM_CO2]" = "Carbon Dioxide",
+	"[ATM_P]" = "Phoron",
+	"[ATM_N2O]" = "Nitrous Oxide",
+	"[ATM_H2]" = "Hydrogen",
+	"[ATM_CH3BR]" = "Methyl Bromide"
+))
+
+GLOBAL_LIST_AS(filter_mode_to_gas_id, list(
+	"[ATM_O2]" = "[GAS_OXYGEN]",
+	"[ATM_N2]" = "[GAS_NITROGEN]",
+	"[ATM_CO2]" = "[GAS_CO2]",
+	"[ATM_P]" = "[GAS_PHORON]",
+	"[ATM_N2O]" = "[GAS_N2O]",
+	"[ATM_H2]" = "[GAS_HYDROGEN]",
+	"[ATM_CH3BR]" = "[GAS_METHYL_BROMIDE]"
+>>>>>>> theirs
 ))
 
 //--------------------------------------------