Merge branch 'master' into ert

_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm

@@ -1456,32 +1456,34 @@
 /area/ruin)
 "dA" = (
 /obj/effect/turf_decal/trimline/transparent/neutral/filled/line,
-/obj/effect/turf_decal/weather/snow/corner{
-	dir = 10
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
+/obj/effect/turf_decal/weather/snow{
+	dir = 10
+	},
 /turf/open/floor/plasteel/dark{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin)
 "dB" = (
 /obj/effect/turf_decal/trimline/transparent/neutral/filled/line,
-/obj/effect/turf_decal/weather/snow/corner,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
+/obj/effect/turf_decal/weather/snow,
 /turf/open/floor/plasteel/dark{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin)
 "dC" = (
 /obj/effect/turf_decal/trimline/transparent/neutral/filled/line,
-/obj/effect/turf_decal/weather/snow/corner,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
+/obj/effect/turf_decal/weather/snow{
+	dir = 6
+	},
 /turf/open/floor/plasteel/dark{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},

_maps/RandomRuins/SpaceRuins/provinggrounds.dmm

@@ -324,7 +324,6 @@
 /area/ruin/space/has_grav/syndicircle/winter)
 "iR" = (
 /obj/effect/mine/shrapnel,
-/obj/effect/turf_decal/weather/snow/corner,
 /obj/item/stack/tile/mineral/snow,
 /obj/machinery/light/dim/directional/west,
 /obj/effect/decal/cleanable/dirt/dust,

_maps/RandomRuins/SpaceRuins/spacemall.dmm

@@ -4990,15 +4990,6 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/spacemall)
 "sH" = (
-/obj/item/clothing/under/pants/classicjeans{
-	pixel_y = -5
-	},
-/obj/item/clothing/under/pants/classicjeans{
-	pixel_y = -5
-	},
-/obj/item/clothing/under/pants/classicjeans{
-	pixel_y = -5
-	},
 /obj/item/clothing/suit/ianshirt,
 /obj/item/clothing/suit/ianshirt,
 /obj/item/clothing/suit/ianshirt,

_maps/outpost/nanotrasen_asteroid.dmm

@@ -580,16 +580,13 @@
 	pixel_y = -3
 	},
 /obj/item/toy/plush/beeplushie,
-/obj/effect/turf_decal/weather/snow/corner{
-	dir = 5
-	},
-/obj/effect/turf_decal/weather/snow/corner{
-	dir = 6
-	},
 /obj/item/reagent_containers/food/drinks/mug/tea{
 	pixel_y = -14;
 	pixel_x = -4
 	},
+/obj/effect/turf_decal/weather/snow/surround{
+	dir = 4
+	},
 /turf/open/floor/plating/asteroid/snow/under/lit,
 /area/outpost/external)
 "cm" = (
@@ -998,7 +995,7 @@
 /area/outpost/maintenance/fore)
 "dO" = (
 /obj/effect/turf_decal/snow,
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/effect/turf_decal/weather/snow{
 	dir = 8
 	},
 /turf/open/floor/concrete/reinforced,
@@ -3253,7 +3250,7 @@
 	pixel_y = 3;
 	pixel_x = -1
 	},
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/effect/turf_decal/weather/snow{
 	dir = 9
 	},
 /turf/open/floor/plating/asteroid/snow/under/lit,
@@ -6619,7 +6616,7 @@
 /area/outpost/hallway/central)
 "xk" = (
 /obj/structure/bonfire/prelit,
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/effect/turf_decal/weather/snow{
 	dir = 1
 	},
 /turf/open/floor/plating/asteroid/snow/under/lit,
@@ -9282,7 +9279,7 @@
 	pixel_y = 5;
 	pixel_x = 1
 	},
-/obj/effect/turf_decal/weather/snow/corner{
+/obj/effect/turf_decal/weather/snow{
 	dir = 10
 	},
 /turf/open/floor/plating/asteroid/snow/under/lit,
@@ -11618,13 +11615,13 @@
 /turf/open/floor/concrete/slab_3,
 /area/outpost/hallway/central)
 "Os" = (
-/obj/effect/turf_decal/weather/snow/corner{
-	dir = 6
-	},
 /obj/item/shovel,
 /obj/item/flashlight/lantern{
 	pixel_x = 7
 	},
+/obj/effect/turf_decal/weather/snow{
+	dir = 6
+	},
 /turf/open/floor/plating/asteroid/snow/under/lit,
 /area/outpost/external)
 "Ot" = (

_maps/shuttles/independent/independent_beluga.dmm

@@ -647,6 +647,7 @@
 /obj/item/clothing/head/hopcap,
 /obj/item/gun/energy/e_gun/mini,
 /obj/item/clothing/head/HoS/cowboy,
+/obj/item/clothing/suit/jacket/leather/duster/command,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "ge" = (
@@ -3504,10 +3505,9 @@
 	pixel_x = -28
 	},
 /obj/item/clothing/under/rank/command/captain,
-/obj/item/clothing/under/rank/command/lieutenant,
+/obj/item/clothing/under/rank/command,
 /obj/item/clothing/shoes/laceup,
 /obj/item/clothing/shoes/cowboy/black,
-/obj/item/clothing/suit/armor/vest/capcarapace/alt,
 /obj/item/clothing/suit/armor/vest/capcarapace/duster,
 /obj/item/clothing/head/beret/captain,
 /obj/item/clothing/head/caphat,
@@ -3521,6 +3521,7 @@
 /obj/item/areaeditor/shuttle,
 /obj/effect/turf_decal/spline/fancy/opaque/bottlegreen,
 /obj/item/clothing/head/caphat/cowboy,
+/obj/item/clothing/suit/armor/vest/capcarapace/captunic,
 /turf/open/floor/wood/walnut,
 /area/ship/bridge)
 "Hv" = (

_maps/shuttles/independent/independent_dwayne.dmm

@@ -1552,8 +1552,9 @@
 /obj/effect/turf_decal/corner/opaque/blue/half{
 	dir = 1
 	},
-/obj/item/clothing/head/caphat/cowboy,
 /obj/item/radio/intercom/wideband/directional/east,
+/obj/item/clothing/suit/armor/vest/capcarapace/duster,
+/obj/item/clothing/head/caphat/cowboy,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Ka" = (

_maps/shuttles/independent/independent_kilo.dmm

@@ -646,6 +646,7 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
+/obj/item/clothing/suit/armor/vest/capcarapace/duster,
 /turf/open/floor/carpet,
 /area/ship/crew)
 "da" = (

_maps/shuttles/independent/independent_tranquility.dmm

@@ -4729,7 +4729,6 @@
 /obj/item/clothing/head/beret/chem,
 /obj/item/clothing/suit/hooded/wintercoat/science,
 /obj/item/clothing/suit/jacket/miljacket,
-/obj/item/clothing/under/pants/mustangjeans,
 /obj/item/clothing/under/dress/sundress,
 /obj/item/clothing/under/color/random,
 /obj/item/clothing/under/color/jumpskirt/random,

_maps/shuttles/independent/nanotrasen_heron.dmm

@@ -773,7 +773,7 @@
 	dir = 5
 	},
 /obj/machinery/computer/atmos_control/tank/air_tank{
-	sensors = list("hairon"="Heron Air Mix Tank")
+	sensors = list("hairon"="Heron  Air  Mix  Tank")
 	},
 /obj/machinery/light_switch{
 	pixel_y = 23
@@ -6617,8 +6617,6 @@
 	req_access_txt = "20"
 	},
 /obj/item/clothing/neck/cloak/cap,
-/obj/item/clothing/gloves/color/captain,
-/obj/item/clothing/head/caphat,
 /obj/item/radio/headset/heads/captain/alt,
 /obj/item/storage/backpack/captain,
 /obj/item/clothing/under/rank/centcom/officer,
@@ -6640,6 +6638,8 @@
 /obj/item/clothing/suit/hooded/wintercoat/centcom,
 /obj/item/clothing/head/beret/centcom_formal,
 /obj/item/stock_parts/cell/gun/upgraded,
+/obj/item/clothing/head/centcom_cap,
+/obj/item/clothing/gloves/combat,
 /turf/open/floor/carpet/green,
 /area/ship/crew/dorm/dormtwo)
 "yc" = (
@@ -9267,6 +9267,10 @@
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
+"HR" = (
+/obj/item/clothing/gloves/color/captain/nt,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew/law_office)
 "HT" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -9707,7 +9711,7 @@
 	dir = 9
 	},
 /obj/machinery/computer/atmos_control/tank/toxin_tank{
-	sensors = list("heron_plasm"="Heron Plasma Tank")
+	sensors = list("heron_plasm"="Heron  Plasma  Tank")
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -15962,7 +15966,7 @@ oz
 Oa
 QG
 QG
-QG
+HR
 QG
 QG
 Ge

_maps/shuttles/nanotrasen/nanotrasen_delta.dmm

@@ -1105,6 +1105,8 @@
 /obj/item/gun/energy/laser,
 /obj/item/megaphone/command,
 /obj/machinery/light/small/directional/east,
+/obj/item/clothing/head/caphat/parade,
+/obj/item/clothing/suit/armor/vest/capcarapace,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "fy" = (

_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm

@@ -1934,7 +1934,7 @@
 /obj/structure/railing,
 /obj/machinery/computer/atmos_control/incinerator{
 	dir = 4;
-	sensors = list("gecko_burn_sensor"="Combustion Chamber")
+	sensors = list("gecko_burn_sensor"="Combustion    Chamber")
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering/engine)
@@ -3399,6 +3399,8 @@
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
 	},
+/obj/item/clothing/head/caphat/parade,
+/obj/item/clothing/suit/armor/vest/capcarapace,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Ij" = (

_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm

@@ -1035,7 +1035,6 @@
 /obj/item/clothing/under/rank/command/captain/nt/skirt,
 /obj/item/clothing/under/rank/command/captain/nt,
 /obj/item/clothing/suit/armor/vest/capcarapace/alt,
-/obj/item/clothing/gloves/color/captain,
 /obj/item/clothing/glasses/sunglasses,
 /obj/item/clothing/head/caphat/nt,
 /obj/item/storage/belt/sabre,
@@ -1044,6 +1043,9 @@
 	desc = "An ICW-era self-destruct authorization disk. The codes on this are long past obsolete, but it's still a flagrant violation of company policy.";
 	name = "outdated nuclear authentication disk"
 	},
+/obj/item/clothing/head/caphat/parade,
+/obj/item/clothing/suit/armor/vest/capcarapace,
+/obj/item/clothing/gloves/color/captain/nt,
 /turf/open/floor/carpet/royalblue,
 /area/ship/bridge)
 "hv" = (

_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm

@@ -1508,10 +1508,7 @@
 /obj/item/storage/backpack/satchel/leather,
 /obj/item/clothing/shoes/laceup,
 /obj/item/clothing/suit/armor/vest/hop,
-/obj/item/clothing/head/hopcap,
 /obj/item/clothing/head/hopcap/nt,
-/obj/item/clothing/under/rank/command/head_of_personnel,
-/obj/item/clothing/under/rank/command/head_of_personnel/skirt,
 /obj/item/storage/box/ids,
 /obj/item/storage/box/PDAs,
 /obj/item/assembly/flash/handheld,
@@ -1521,6 +1518,8 @@
 	pixel_y = 32
 	},
 /obj/effect/turf_decal/siding/wood,
+/obj/item/clothing/under/rank/command/head_of_personnel/nt,
+/obj/item/clothing/under/rank/command/head_of_personnel/nt/skirt,
 /turf/open/floor/wood,
 /area/ship/crew/crewthree)
 "lg" = (
@@ -1833,7 +1832,7 @@
 "nu" = (
 /obj/machinery/computer/atmos_control/incinerator{
 	dir = 4;
-	sensors = list("nemo_incinerator_sensor"="Incinerator Chamber")
+	sensors = list("nemo_incinerator_sensor"="Incinerator  Chamber")
 	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -5527,15 +5526,16 @@
 /obj/item/storage/backpack/captain,
 /obj/item/storage/belt/sabre,
 /obj/item/clothing/glasses/sunglasses,
-/obj/item/clothing/head/caphat,
-/obj/item/clothing/head/beret/captain,
 /obj/item/clothing/suit/armor/vest/capcarapace,
-/obj/item/clothing/under/rank/command/captain/skirt,
-/obj/item/clothing/under/rank/command/captain/suit,
 /obj/item/clothing/under/rank/command/captain/parade,
 /obj/item/clothing/shoes/laceup,
 /obj/item/door_remote/captain,
 /obj/item/clothing/suit/armor/vest/capcarapace/alt,
+/obj/item/clothing/gloves/color/captain/nt,
+/obj/item/clothing/under/rank/command/captain/nt/skirt,
+/obj/item/clothing/under/rank/command/captain/nt,
+/obj/item/clothing/head/caphat/parade,
+/obj/item/clothing/head/caphat/nt,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "UN" = (

code/__byond_version_compat.dm

@@ -16,8 +16,8 @@
 #endif
 
 #if (DM_VERSION == 514 && DM_BUILD == 1589)
-#error Warning! Byond 514.1589 has been known to be unstable. Use at your own risk.
-#error Please consider using 514.1588.
+#warn Warning! Byond 514.1589 has been known to be unstable. Use at your own risk.
+#warn Please consider using 514.1588.
 #endif
 
 // Keep savefile compatibilty at minimum supported level

code/_globalvars/lists/mobs.dm

@@ -35,6 +35,8 @@ GLOBAL_LIST_EMPTY(aiEyes)
 ///underages who have been reported to security for trying to buy things they shouldn't, so they can't spam
 GLOBAL_LIST_EMPTY(narcd_underages)
 
+GLOBAL_LIST_EMPTY(real_names_joined)
+
 GLOBAL_LIST_EMPTY(language_datum_instances)
 GLOBAL_LIST_EMPTY(all_languages)
 

code/game/objects/effects/decals/turfdecal/weather.dm

@@ -2,14 +2,14 @@
 	name = "sandy floor"
 	icon_state = "sandyfloor"
 
-/obj/effect/turf_decal/weather/snow
-	name = "snowy floor"
-	icon_state = "snowyfloor"
-
-/obj/effect/turf_decal/weather/snow/corner
-	name = "snow corner piece"
+/obj/effect/turf_decal/weather/snow //add a corner decal if you resprite this to look like the other sidings
+	name = "snow siding"
 	icon = 'icons/turf/snow.dmi'
-	icon_state = "snow_corner"
+	icon_state = "snow_side"
+
+/obj/effect/turf_decal/weather/snow/surround
+	name = "surround"
+	icon_state = "snow_surround"
 
 /obj/effect/turf_decal/weather/dirt
 	name = "dirt siding"

code/game/objects/effects/temporary_visuals/projectiles/impact.dm

@@ -40,3 +40,11 @@
 /obj/effect/projectile/impact/laser/emitter
 	name = "emitter impact"
 	icon_state = "impact_emitter"
+
+/obj/effect/projectile/impact/kalix
+	name = "beam impact"
+	icon_state = "impact_pgf"
+
+/obj/effect/projectile/impact/pgf
+	name = "beam impact"
+	icon_state = "impact_pgf"