Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG …

…into upstream-mirror-298

_maps/safehouses/ancientmilsim_nova.dmm

@@ -4,33 +4,32 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/virtual_domain/safehouse)
 "b" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /obj/structure/closet/crate/secure/weapon,
-/obj/item/storage/pouch/medical/firstaid/stabilizer,
-/obj/item/storage/pouch/ammo,
-/obj/item/clothing/head/helmet/hecu,
-/obj/item/clothing/suit/armor/vest/hecu,
+/obj/item/storage/medkit/combat_surgeon/stocked,
+/obj/item/storage/medkit/civil_defense/stocked,
+/obj/item/clothing/glasses/hud/health/night,
+/obj/item/storage/belt/military/assault,
 /obj/item/storage/box/survival/syndie,
-/obj/item/gun/ballistic/automatic/sol_smg,
+/obj/item/clothing/head/helmet/sf_peacekeeper,
+/obj/item/clothing/suit/armor/sf_peacekeeper,
 /obj/item/knife/combat,
-/obj/item/gun/ballistic/automatic/pistol/sol,
 /obj/item/ammo_box/magazine/c35sol_pistol,
 /obj/item/ammo_box/magazine/c35sol_pistol,
 /obj/item/ammo_box/magazine/c35sol_pistol,
-/obj/item/storage/belt/military/assault/hecu,
+/obj/item/ammo_box/magazine/c35sol_pistol,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
-/obj/item/stack/medical/mesh/bloody,
-/obj/item/stack/medical/suture/bloody,
-/obj/item/clothing/gloves/military,
-/obj/item/clothing/glasses/hud/health/night,
+/obj/item/gun/ballistic/automatic/sol_smg,
+/obj/item/gun/ballistic/automatic/pistol/sol,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/sand/volcanic,
 /turf/open/floor/iron,
 /area/virtual_domain/safehouse)
 "e" = (
@@ -131,29 +130,27 @@
 /turf/open/floor/iron,
 /area/virtual_domain/safehouse)
 "G" = (
-/obj/effect/turf_decal/stripes/end,
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate/secure/weapon,
-/obj/item/storage/pouch/medical/firstaid/stabilizer,
-/obj/item/storage/pouch/ammo,
-/obj/item/clothing/head/helmet/hecu,
-/obj/item/clothing/suit/armor/vest/hecu,
+/obj/item/storage/medkit/combat_surgeon/stocked,
+/obj/item/storage/medkit/civil_defense/stocked,
+/obj/item/clothing/glasses/hud/health/night,
+/obj/item/storage/belt/military/assault,
 /obj/item/storage/box/survival/syndie,
-/obj/item/gun/ballistic/automatic/sol_smg,
+/obj/item/clothing/head/helmet/sf_peacekeeper,
+/obj/item/clothing/suit/armor/sf_peacekeeper,
 /obj/item/knife/combat,
-/obj/item/gun/ballistic/automatic/pistol/sol,
 /obj/item/ammo_box/magazine/c35sol_pistol,
 /obj/item/ammo_box/magazine/c35sol_pistol,
 /obj/item/ammo_box/magazine/c35sol_pistol,
-/obj/item/storage/belt/military/assault/hecu,
+/obj/item/ammo_box/magazine/c35sol_pistol,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
-/obj/item/stack/medical/mesh/bloody,
-/obj/item/stack/medical/suture/bloody,
-/obj/item/clothing/gloves/military,
-/obj/item/clothing/glasses/hud/health/night,
+/obj/item/gun/ballistic/automatic/sol_smg,
+/obj/item/gun/ballistic/automatic/pistol/sol,
+/obj/effect/turf_decal/stripes/end,
+/obj/effect/turf_decal/sand/volcanic,
 /turf/open/floor/iron,
 /area/virtual_domain/safehouse)
 "H" = (
@@ -170,7 +167,6 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/computer{
-	dir = 2;
 	name = "hovercraft console";
 	icon_screen = "shuttle";
 	desc = "An armored hovercraft control computer. Doesn't work anymore... who would've thought."
@@ -223,26 +219,24 @@
 	},
 /obj/effect/turf_decal/sand/volcanic,
 /obj/structure/closet/crate/secure/weapon,
-/obj/item/storage/pouch/medical/firstaid/loaded,
-/obj/item/storage/pouch/medical/loaded,
-/obj/item/clothing/head/helmet/hecu,
-/obj/item/clothing/suit/armor/vest/hecu,
+/obj/item/storage/medkit/combat_surgeon/stocked,
+/obj/item/storage/medkit/civil_defense/stocked,
+/obj/item/clothing/glasses/hud/health/night,
+/obj/item/storage/belt/military/assault,
 /obj/item/storage/box/survival/syndie,
-/obj/item/gun/ballistic/automatic/sol_smg,
+/obj/item/clothing/head/helmet/sf_peacekeeper,
+/obj/item/clothing/suit/armor/sf_peacekeeper,
 /obj/item/knife/combat,
-/obj/item/gun/ballistic/automatic/pistol/sol,
 /obj/item/ammo_box/magazine/c35sol_pistol,
 /obj/item/ammo_box/magazine/c35sol_pistol,
 /obj/item/ammo_box/magazine/c35sol_pistol,
-/obj/item/storage/belt/military/assault/hecu,
+/obj/item/ammo_box/magazine/c35sol_pistol,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
-/obj/item/stack/medical/mesh/bloody,
-/obj/item/stack/medical/suture/bloody,
-/obj/item/clothing/gloves/military,
-/obj/item/clothing/glasses/hud/health/night,
+/obj/item/gun/ballistic/automatic/sol_smg,
+/obj/item/gun/ballistic/automatic/pistol/sol,
 /turf/open/floor/iron,
 /area/virtual_domain/safehouse)
 

_maps/virtual_domains/ancientmilsim_nova.dmm

@@ -195,7 +195,7 @@
 /area/virtual_domain/ancient_milsim/snpc_garage)
 "gL" = (
 /obj/structure/table,
-/obj/item/grenade/chem_grenade/clf3,
+/obj/item/grenade/stingbang,
 /turf/open/floor/plating,
 /area/virtual_domain/ancient_milsim/janitor)
 "gP" = (
@@ -1709,7 +1709,7 @@
 /turf/open/floor/iron,
 /area/virtual_domain/ancient_milsim/snpc_cafe)
 "Vr" = (
-/obj/item/ammo_box/magazine/lanca,
+/obj/item/ammo_box/magazine/wylom,
 /turf/open/misc/grass/planet/ancient_milsim,
 /area/virtual_domain/ancient_milsim/loot_camp)
 "VA" = (
@@ -4625,7 +4625,7 @@ Uz
 (49,1,1) = {"
 Uz
 Vl
-Vr
+Vl
 Vl
 Vl
 Vl
@@ -4682,7 +4682,7 @@ Uz
 "}
 (50,1,1) = {"
 Uz
-Vl
+Vr
 wz
 Vl
 Vl

code/__DEFINES/station.dm

@@ -2,12 +2,10 @@
 #define STATION_TRAIT_NEUTRAL 2
 #define STATION_TRAIT_NEGATIVE 3
 
-/// For traits that shouldn't be selected, like abstract types (wow)
-#define STATION_TRAIT_ABSTRACT (1<<0)
 /// Only run on planet stations
-#define STATION_TRAIT_PLANETARY (1<<1)
+#define STATION_TRAIT_PLANETARY (1<<0)
 /// Only run on space stations
-#define STATION_TRAIT_SPACE_BOUND (1<<2)
+#define STATION_TRAIT_SPACE_BOUND (1<<1)
 
 /// Not restricted by space or planet, can always just happen
 #define STATION_TRAIT_MAP_UNRESTRICTED STATION_TRAIT_PLANETARY | STATION_TRAIT_SPACE_BOUND

code/_onclick/hud/hud.dm

@@ -270,6 +270,7 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list(
 	combo_display = null
 
 	//NOVA EDIT START - SKYRAT HUD
+	ammo_counter = null
 	wanted_lvl = null
 	// NOVA EDIT END - SKYRAT HUD
 

code/controllers/subsystem/processing/station.dm

@@ -58,7 +58,7 @@ PROCESSING_SUBSYSTEM_DEF(station)
 			setup_trait(trait_typepath)
 			continue
 
-		if(initial(trait_typepath.trait_flags) & STATION_TRAIT_ABSTRACT)
+		if(initial(trait_typepath.abstract_type) == trait_typepath)
 			continue //Dont add abstract ones to it
 
 		if(!(initial(trait_typepath.trait_flags) & STATION_TRAIT_PLANETARY) && SSmapping.is_planetary()) // we're on a planet but we can't do planet ;_;

code/datums/components/material/material_container.dm

@@ -459,15 +459,15 @@
 					if(MATERIAL_INSERT_ITEM_SUCCESS) //no problems full item was consumed
 						if(chat_data["stack"])
 							var/sheets = min(count, amount) //minimum between sheets inserted vs sheets consumed(values differ for alloys)
-							to_chat(user, span_notice("[sheets > 1 ? sheets : ""] [item_name][sheets > 1 ? "'s" : ""] was consumed by [parent]"))
+							to_chat(user, span_notice("[sheets > 1 ? sheets : ""] [item_name][sheets > 1 ? "s were" : " was"] added to [parent]."))
 						else
-							to_chat(user, span_notice("[count > 1 ? count : ""] [item_name][count > 1 ? "'s" : ""] worth [amount] sheets of material was consumed by [parent]"))
+							to_chat(user, span_notice("[count > 1 ? count : ""] [item_name][count > 1 ? "s" : ""], worth [amount] sheets, [count > 1 ? "were" : "was"] added to [parent]."))
 					if(MATERIAL_INSERT_ITEM_NO_SPACE) //no space
-						to_chat(user, span_warning("[parent] has no space to accept [item_name]"))
+						to_chat(user, span_warning("[parent] has no space to accept [item_name]!"))
 					if(MATERIAL_INSERT_ITEM_NO_MATS) //no materials inside these items
-						to_chat(user, span_warning("[count > 1 ? count : ""] [item_name][count > 1 ? "'s" : ""] has no materials to be accepted by [parent]"))
+						to_chat(user, span_warning("[item_name][count > 1 ? "s have" : " has"] no materials that can be accepted by [parent]!"))
 					if(MATERIAL_INSERT_ITEM_FAILURE) //could be because the material type was not accepted or other stuff
-						to_chat(user, span_warning("[count > 1 ? count : ""] [item_name][count > 1 ? "'s" : ""] was rejected by [parent]"))
+						to_chat(user, span_warning("[item_name][count > 1 ? "s were" : " was"] rejected by [parent]!"))
 
 /// Proc that allows players to fill the parent with mats
 /datum/component/material_container/proc/on_attackby(datum/source, obj/item/weapon, mob/living/user)

code/datums/helper_datums/teleport.dm

@@ -66,7 +66,8 @@
 
 	if(!forced)
 		if(!check_teleport_valid(teleatom, destination, channel))
-			teleatom.balloon_alert(teleatom, "something holds you back!")
+			if(ismob(teleatom))
+				teleatom.balloon_alert(teleatom, "something holds you back!")
 			return FALSE
 
 	if(isobserver(teleatom))

code/datums/station_traits/_station_trait.dm

@@ -33,6 +33,8 @@ GLOBAL_LIST_EMPTY(lobby_station_traits)
 	var/dynamic_threat_id
 	/// If ran during dynamic, do we reduce the total threat? Will be overriden by config if set
 	var/threat_reduction = 0
+	/// Trait should not be instantiated in a round if its type matches this type
+	var/abstract_type = /datum/station_trait
 
 /datum/station_trait/New()
 	. = ..()

code/datums/station_traits/job_traits.dm

@@ -4,7 +4,7 @@
  */
 /datum/station_trait/job
 	sign_up_button = TRUE
-	trait_flags = STATION_TRAIT_ABSTRACT
+	abstract_type = /datum/station_trait/job
 	/// What tooltip to show on the button
 	var/button_desc = "Sign up to gain some kind of unusual job, not available in most rounds."
 	/// Type of job to enable
@@ -68,7 +68,6 @@
 	weight = 1
 	show_in_report = FALSE // Selective attention test. Did you spot the gorilla?
 	job_to_add = /datum/job/cargo_gorilla
-	trait_flags = STATION_TRAIT_MAP_UNRESTRICTED
 
 /datum/station_trait/job/cargorilla/New()
 	. = ..()

code/datums/station_traits/negative_traits.dm

@@ -281,7 +281,7 @@
 	name = "Random Event Modifier"
 	report_message = "A random event has been modified this shift! Someone forgot to set this!"
 	show_in_report = TRUE
-	trait_flags = STATION_TRAIT_ABSTRACT
+	abstract_type = /datum/station_trait/random_event_weight_modifier
 	weight = 0
 
 	/// The path to the round_event_control that we modify.
@@ -304,7 +304,6 @@
 	name = "Ionic Stormfront"
 	report_message = "An ionic stormfront is passing over your station's system. Expect an increased likelihood of ion storms afflicting your station's silicon units."
 	trait_type = STATION_TRAIT_NEGATIVE
-	trait_flags = STATION_TRAIT_MAP_UNRESTRICTED
 	weight = 3
 	event_control_path = /datum/round_event_control/ion_storm
 	weight_multiplier = 2
@@ -313,7 +312,6 @@
 	name = "Radiation Stormfront"
 	report_message = "A radioactive stormfront is passing through your station's system. Expect an increased likelihood of radiation storms passing over your station, as well the potential for multiple radiation storms to occur during your shift."
 	trait_type = STATION_TRAIT_NEGATIVE
-	trait_flags = STATION_TRAIT_MAP_UNRESTRICTED
 	weight = 2
 	event_control_path = /datum/round_event_control/radiation_storm
 	weight_multiplier = 1.5
@@ -323,7 +321,6 @@
 	name = "Dust Stormfront"
 	report_message = "The space around your station is clouded by heavy pockets of space dust. Expect an increased likelyhood of space dust storms damaging the station hull."
 	trait_type = STATION_TRAIT_NEGATIVE
-	trait_flags = STATION_TRAIT_MAP_UNRESTRICTED
 	weight = 2
 	cost = STATION_TRAIT_COST_LOW
 	event_control_path = /datum/round_event_control/meteor_wave/dust_storm
@@ -452,7 +449,7 @@
 ///Station traits that influence the space background and apply some unique effects!
 /datum/station_trait/nebula
 	name = "Nebula"
-	trait_flags = STATION_TRAIT_ABSTRACT
+	abstract_type = /datum/station_trait/nebula
 	weight = 0
 
 	show_in_report = TRUE
@@ -473,7 +470,7 @@
 
 ///Station nebula that incur some sort of effect if no shielding is created
 /datum/station_trait/nebula/hostile
-	trait_flags = STATION_TRAIT_ABSTRACT
+	abstract_type = /datum/station_trait/nebula/hostile
 	trait_processes = TRUE
 
 	///Intensity of the nebula
@@ -703,7 +700,7 @@
 
 ///Starts a storm on roundstart
 /datum/station_trait/storm
-	trait_flags = STATION_TRAIT_ABSTRACT
+	abstract_type = /datum/station_trait/storm
 	var/datum/weather/storm_type
 
 /datum/station_trait/storm/on_round_start()

code/datums/station_traits/positive_traits.dm

@@ -101,7 +101,7 @@
 	name = "deathrattled department"
 	trait_type = STATION_TRAIT_POSITIVE
 	show_in_report = TRUE
-	trait_flags = STATION_TRAIT_ABSTRACT
+	abstract_type = /datum/station_trait/deathrattle_department
 	blacklist = list(/datum/station_trait/deathrattle_all)
 
 	var/department_to_apply_to
@@ -129,49 +129,42 @@
 
 /datum/station_trait/deathrattle_department/service
 	name = "Deathrattled Service"
-	trait_flags = STATION_TRAIT_MAP_UNRESTRICTED
 	weight = 1
 	department_to_apply_to = DEPARTMENT_BITFLAG_SERVICE
 	department_name = "Service"
 
 /datum/station_trait/deathrattle_department/cargo
 	name = "Deathrattled Cargo"
-	trait_flags = STATION_TRAIT_MAP_UNRESTRICTED
 	weight = 1
 	department_to_apply_to = DEPARTMENT_BITFLAG_CARGO
 	department_name = "Cargo"
 
 /datum/station_trait/deathrattle_department/engineering
 	name = "Deathrattled Engineering"
-	trait_flags = STATION_TRAIT_MAP_UNRESTRICTED
 	weight = 1
 	department_to_apply_to = DEPARTMENT_BITFLAG_ENGINEERING
 	department_name = "Engineering"
 
 /datum/station_trait/deathrattle_department/command
 	name = "Deathrattled Command"
-	trait_flags = STATION_TRAIT_MAP_UNRESTRICTED
 	weight = 1
 	department_to_apply_to = DEPARTMENT_BITFLAG_COMMAND
 	department_name = "Command"
 
 /datum/station_trait/deathrattle_department/science
 	name = "Deathrattled Science"
-	trait_flags = STATION_TRAIT_MAP_UNRESTRICTED
 	weight = 1
 	department_to_apply_to = DEPARTMENT_BITFLAG_SCIENCE
 	department_name = "Science"
 
 /datum/station_trait/deathrattle_department/security
 	name = "Deathrattled Security"
-	trait_flags = STATION_TRAIT_MAP_UNRESTRICTED
 	weight = 1
 	department_to_apply_to = DEPARTMENT_BITFLAG_SECURITY
 	department_name = "Security"
 
 /datum/station_trait/deathrattle_department/medical
 	name = "Deathrattled Medical"
-	trait_flags = STATION_TRAIT_MAP_UNRESTRICTED
 	weight = 1
 	department_to_apply_to = DEPARTMENT_BITFLAG_MEDICAL
 	department_name = "Medical"

code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm

@@ -84,7 +84,7 @@
 
 /mob/living/basic/mining/goldgrub/proc/barf_contents(gibbed)
 	playsound(src, 'sound/effects/splat.ogg', 50, TRUE)
-	for(var/obj/item/ore as anything in src)
+	for(var/obj/item/stack/ore/ore in src)
 		ore.forceMove(loc)
 	if(!gibbed)
 		visible_message(span_danger("[src] spits out its consumed ores!"))

html/changelogs/AutoChangeLog-pr-1639.yml

@@ -0,0 +1,5 @@
+author: "Paxilmaniac"
+delete-after: True
+changes:
+  - rscadd: "Hunter shotgun slugs can now mine mineral walls, shotgun mining time baby."
+  - bugfix: "Hunter slugs and .60 AMR ammo will now properly do extra damage to the biotypes they are strong against."