Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…

…to hostile-humans

_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm

@@ -84,8 +84,8 @@
 "cN" = (
 /obj/structure/safe/floor,
 /obj/item/hand_tele,
-/obj/item/stack/sheet/mineral/adamantine,
-/obj/item/stack/sheet/mineral/adamantine,
+/obj/item/stack/sheet/mineral/hidden/hellstone,
+/obj/item/stack/sheet/mineral/hidden/hellstone,
 /turf/open/floor/plating/asteroid/snow/icemoon,
 /area/ruin/unpowered/corprejectrooms)
 "cP" = (
@@ -1726,11 +1726,11 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/stack/sheet/bluespace_crystal/five,
-/obj/item/stack/sheet/mineral/bananium{
+/obj/item/stack/sheet/mineral/hidden/hellstone{
 	amount = 15
 	},
 /obj/item/stack/sheet/mineral/gold/twenty,
-/obj/item/stack/sheet/mineral/runite/ten,
+/obj/item/stack/sheet/mineral/hidden/hellstone/ten,
 /obj/item/toy/figure/captain,
 /obj/item/organ/cyberimp/brain/anti_stun,
 /obj/item/disk/design_disk/adv/knight_gear,

_maps/RandomRuins/SpaceRuins/crashedship.dmm

@@ -2232,7 +2232,7 @@
 /turf/closed/mineral/diamond,
 /area/awaymission/BMPship)
 "hw" = (
-/turf/closed/mineral/bananium,
+/turf/closed/mineral/bscrystal,
 /area/awaymission/BMPship)
 "hE" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,

_maps/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm

@@ -96,7 +96,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "r" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/ore/bananium,
+/obj/item/stack/ore/hellstone,
 /turf/open/floor/plating/asteroid,
 /area/overmap_encounter/planetoid/cave/explored)
 "s" = (

_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm

@@ -342,7 +342,7 @@
 "cX" = (
 /obj/structure/statue/bananium/clown,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "dg" = (
 /obj/structure/sign/poster/contraband/eat,
@@ -430,7 +430,7 @@
 /area/ruin/powered)
 "ed" = (
 /obj/item/trash/cheesie,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "ee" = (
 /obj/machinery/photocopier,
@@ -578,12 +578,8 @@
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
 "fk" = (
-/obj/machinery/door/airlock/bananium{
-	name = "Clown Embassy";
-	dir = 4
-	},
 /obj/item/grown/bananapeel,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "fn" = (
 /obj/effect/gibspawner/human,
@@ -695,7 +691,7 @@
 /area/ruin/powered)
 "go" = (
 /obj/machinery/light/small/directional/west,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "gp" = (
 /mob/living/simple_animal/hostile/rat,
@@ -735,7 +731,7 @@
 /turf/open/floor/plating,
 /area/ruin/powered)
 "gL" = (
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "gM" = (
 /obj/structure/rack,
@@ -762,7 +758,7 @@
 /area/ruin/powered)
 "hd" = (
 /obj/item/reagent_containers/food/snacks/cakeslice/clown_slice,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "he" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -1123,7 +1119,7 @@
 /obj/effect/decal/cleanable/blood,
 /obj/effect/mob_spawn/human/clown/corpse,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "kO" = (
 /obj/item/trash/chips,
@@ -1133,7 +1129,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "kS" = (
 /obj/effect/decal/cleanable/blood,
@@ -1507,7 +1503,7 @@
 /obj/item/pneumatic_cannon/pie,
 /obj/item/reagent_containers/spray/waterflower/lube,
 /obj/machinery/light/small/directional/east,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "nK" = (
 /obj/structure/table,
@@ -2375,7 +2371,7 @@
 /obj/effect/decal/cleanable/blood,
 /obj/effect/mob_spawn/human/clown/corpse,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "vX" = (
 /obj/item/ammo_casing,
@@ -2773,7 +2769,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/generic,
 /obj/item/trash/cheesie,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "Aa" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -3113,7 +3109,7 @@
 /area/ruin/powered)
 "Cy" = (
 /obj/structure/closet/cardboard,
-/obj/item/coin/bananium,
+/obj/item/coin/hellstone,
 /obj/item/reagent_containers/food/snacks/soup/clownstears,
 /turf/open/floor/plating,
 /area/ruin/powered)
@@ -4333,7 +4329,7 @@
 "Ow" = (
 /obj/structure/table/wood/fancy/orange,
 /obj/item/clothing/under/rank/civilian/clown/rainbow,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "Ox" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -4422,7 +4418,7 @@
 /area/ruin/powered)
 "Pr" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/gold,
 /area/ruin/powered)
 "Px" = (
 /mob/living/simple_animal/hostile/rat,

_maps/configs/independent_beluga.json

@@ -13,7 +13,6 @@
 	],
 	"starting_funds": 4000,
 	"limit": 2,
-	"roundstart": true,
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/independent/captain",

_maps/configs/independent_dwayne.json

@@ -15,7 +15,6 @@
 		"Mining",
 		"Generalist"
 	],
-	"roundstart": true,
 	"limit": 1,
 	"job_slots": {
 		"Captain": {

_maps/configs/independent_mudskipper.json

@@ -14,7 +14,6 @@
 		"SPACE"
 	],
 	"map_path": "_maps/shuttles/independent/independent_mudskipper.dmm",
-	"roundstart": true,
 	"limit": 2,
 	"starting_funds": 1500,
 	"job_slots": {

_maps/configs/independent_rigger.json

@@ -15,7 +15,6 @@
 		"Generalist"
 	],
 	"map_path": "_maps/shuttles/independent/independent_rigger.dmm",
-	"roundstart": true,
 	"limit": 1,
 	"job_slots": {
 		"Captain": {

_maps/configs/independent_shetland.json

@@ -14,7 +14,6 @@
 	],
 	"map_path": "_maps/shuttles/independent/independent_shetland.dmm",
 	"map_id": "independent_shetland",
-	"roundstart": true,
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/independent/captain/cheap",

_maps/configs/nanotrasen_skipper.json

@@ -17,7 +17,6 @@
 	"Mining"
 	],
 	"starting_funds": 4500,
-	"roundstart": true,
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/nanotrasen/captain",

_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm

@@ -2868,7 +2868,7 @@
 	pixel_x = 4;
 	pixel_y = 8
 	},
-/obj/item/coin/adamantine{
+/obj/item/coin/hellstone{
 	pixel_x = -12;
 	pixel_y = -3
 	},

code/__DEFINES/icon_smoothing.dm

@@ -99,7 +99,6 @@ DEFINE_BITFIELD(smoothing_flags, list(
 #define SMOOTH_GROUP_SILVER_WALLS S_OBJ(3) ///turf/closed/wall/mineral/silver, /obj/structure/falsewall/silver
 #define SMOOTH_GROUP_DIAMOND_WALLS S_OBJ(4) ///turf/closed/wall/mineral/diamond, /obj/structure/falsewall/diamond
 #define SMOOTH_GROUP_PLASMA_WALLS S_OBJ(5) ///turf/closed/wall/mineral/plasma, /obj/structure/falsewall/plasma
-#define SMOOTH_GROUP_BANANIUM_WALLS S_OBJ(6) ///turf/closed/wall/mineral/bananium, /obj/structure/falsewall/bananium
 #define SMOOTH_GROUP_SANDSTONE_WALLS S_OBJ(7) ///turf/closed/wall/mineral/sandstone, /obj/structure/falsewall/sandstone
 #define SMOOTH_GROUP_WOOD_WALLS S_OBJ(8) ///turf/closed/wall/mineral/wood, /obj/structure/falsewall/wood
 #define SMOOTH_GROUP_IRON_WALLS S_OBJ(9) ///turf/closed/wall/mineral/iron, /obj/structure/falsewall/iron

code/__DEFINES/traits.dm

@@ -294,8 +294,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NIGHT_VISION "night_vision"
 #define TRAIT_LIGHT_STEP "light_step"
 #define TRAIT_SPIRITUAL "spiritual"
-#define TRAIT_FAN_CLOWN "fan_clown"
-#define TRAIT_FAN_MIME "fan_mime"
 #define TRAIT_FAN_RILENA "fan_rilena"
 #define TRAIT_VORACIOUS "voracious"
 #define TRAIT_SELF_AWARE "self_aware"

code/_globalvars/traits.dm

@@ -125,8 +125,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NIGHT_VISION" = TRAIT_NIGHT_VISION,
 		"TRAIT_LIGHT_STEP" = TRAIT_LIGHT_STEP,
 		"TRAIT_SPIRITUAL" = TRAIT_SPIRITUAL,
-		"TRAIT_FAN_CLOWN" = TRAIT_FAN_CLOWN,
-		"TRAIT_FAN_MIME" = TRAIT_FAN_MIME,
 		"TRAIT_VORACIOUS" = TRAIT_VORACIOUS,
 		"TRAIT_SELF_AWARE" = TRAIT_SELF_AWARE,
 		"TRAIT_FREERUNNING" = TRAIT_FREERUNNING,

code/controllers/subsystem/overmap.dm

@@ -133,7 +133,7 @@ SUBSYSTEM_DEF(overmap)
 		spawn_ruin_levels()
 
 	spawn_outpost()
-	spawn_initial_ships()
+	//spawn_initial_ships()
 
 /**
  * VERY Simple random generation for overmap events, spawns the event in a random turf and sometimes spreads it out similar to ores
@@ -212,6 +212,7 @@ SUBSYSTEM_DEF(overmap)
 	new found_type(location)
 	return
 
+/*
 /datum/controller/subsystem/overmap/proc/spawn_initial_ships()
 #ifndef UNIT_TESTS
 	var/datum/map_template/shuttle/selected_template = SSmapping.maplist[pick(SSmapping.maplist)]
@@ -224,10 +225,11 @@ SUBSYSTEM_DEF(overmap)
 		query_round_map_name.Execute()
 		qdel(query_round_map_name)
 #endif
+*/
 
 /**
  * Spawns a controlled ship with the passed template at the template's preferred spawn location.
- * Inteded for ship purchases, etc.
+ * Intended for ship purchases, etc.
  */
 /datum/controller/subsystem/overmap/proc/spawn_ship_at_start(datum/map_template/shuttle/template)
 	//Should never happen, but just in case. This'll delay the next spawn until the current one is done.

code/controllers/subsystem/processing/quirks.dm

@@ -23,7 +23,6 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 							list("Ageusia","Vegetarian","Deviant Tastes"), \
 							list("Ananas Affinity","Ananas Aversion"), \
 							list("Alcohol Tolerance","Light Drinker"), \
-							list("Clown Fan","Mime Fan", "RILENA Super Fan"), \
 							list("Bad Touch", "Friendly"))
 
 	species_blacklist = list("Blood Deficiency" = list(SPECIES_IPC, SPECIES_JELLYPERSON, SPECIES_PLASMAMAN, SPECIES_VAMPIRE))

code/controllers/subsystem/traumas.dm

@@ -128,7 +128,7 @@ SUBSYSTEM_DEF(traumas)
 			/obj/item/melee/cultblade, /obj/item/cult_bastard,
 			/obj/item/restraints/legcuffs/bola/cult, /obj/item/clothing/suit/space/hardsuit/cult,
 			/obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune,
-			/obj/item/stack/sheet/runed_metal, /obj/machinery/door/airlock/cult, /obj/singularity/narsie,
+			/obj/machinery/door/airlock/cult, /obj/singularity/narsie,
 			/obj/item/soulstone,
 			/obj/item/clothing/suit/wizrobe, /obj/item/clothing/head/wizard, /obj/item/spellbook, /obj/item/staff,
 			/obj/item/clothing/suit/space/hardsuit/shielded/wizard, /obj/item/clothing/suit/space/hardsuit/wizard,

code/datums/components/crafting/recipes/misc.dm

@@ -211,3 +211,10 @@
 				/obj/item/organ/heart = 1,
 				/obj/item/stack/sheet/cotton/cloth = 3)
 	category = CAT_MISC
+
+/datum/crafting_recipe/candorupgrade
+	name = "Candor Upgrade"
+	result = /obj/item/gun/ballistic/automatic/pistol/candor/phenex
+	reqs = list(/obj/item/stack/sheet/mineral/hidden = 4,
+				/obj/item/gun/ballistic/automatic/pistol/candor = 1)
+	category = CAT_MISC

code/datums/components/forensics.dm

@@ -192,4 +192,4 @@
 		return
 	if(isitem(parent))
 		var/obj/item/I = parent
-		I.AddElement(/datum/element/decal/blood, initial(I.icon) || I.icon, initial(I.icon_state) || I.icon_state, _color = get_blood_dna_color(blood_DNA))
+		I.AddElement(/datum/element/decal/blood, I.icon, I.icon_state, _color = get_blood_dna_color(blood_DNA))

code/datums/components/remote_materials.dm

@@ -52,7 +52,7 @@ handles linking back and forth.
 		/datum/material/diamond,
 		/datum/material/plasma,
 		/datum/material/uranium,
-		/datum/material/bananium,
+		/datum/material/hellstone,
 		/datum/material/titanium,
 		/datum/material/bluespace,
 		/datum/material/plastic,

code/datums/elements/decals/blood.dm

@@ -6,9 +6,11 @@
 
 	. = ..()
 	RegisterSignal(target, COMSIG_ATOM_GET_EXAMINE_NAME, PROC_REF(get_examine_name), TRUE)
+	RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), PROC_REF(redraw), TRUE)
 
 /datum/element/decal/blood/Detach(atom/source, force)
 	UnregisterSignal(source, COMSIG_ATOM_GET_EXAMINE_NAME)
+	UnregisterSignal(source, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
 	return ..()
 
 /datum/element/decal/blood/generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha, source)
@@ -30,3 +32,11 @@
 	override[EXAMINE_POSITION_ARTICLE] = A.gender == PLURAL? "some" : "a"
 	override[EXAMINE_POSITION_BEFORE] = " blood-stained "
 	return COMPONENT_EXNAME_CHANGED
+
+///this is probably quite bad, let me know if you have a better solution for this -S
+/datum/element/decal/blood/proc/redraw(datum/source, mob/user)
+	SIGNAL_HANDLER
+
+	var/atom/bloodsource = source
+	Detach(source)
+	bloodsource.AddElement(/datum/element/decal/blood, bloodsource.icon, bloodsource.icon_state, _color = get_blood_dna_color(bloodsource.return_blood_DNA()))