Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps

code/__DEFINES/skills.dm

@@ -1,17 +1,17 @@
 // Skill defines
-///CQC skill; higher disarm chance on humans(+5% per level); slight increase in punch damage.
-#define SKILL_CQC "cqc"
-
-#define SKILL_CQC_WEAK -1
-#define SKILL_CQC_DEFAULT 0
-#define SKILL_CQC_TRAINED 1
-#define SKILL_CQC_MP 2
-#define SKILL_CQC_MASTER 5
-
-///Unarmed damage mod from CQC skill
-#define CQC_SKILL_DAMAGE_MOD 5
-///Disarm chance mod from CQC skill
-#define CQC_SKILL_DISARM_MOD 5
+///UNARMED skill; higher disarm chance on humans(+5% per level); slight increase in punch damage.
+#define SKILL_UNARMED "unarmed"
+
+#define SKILL_UNARMED_WEAK -1
+#define SKILL_UNARMED_DEFAULT 0
+#define SKILL_UNARMED_TRAINED 1
+#define SKILL_UNARMED_MP 2
+#define SKILL_UNARMED_MASTER 5
+
+///Unarmed damage mod from UNARMED skill
+#define UNARMED_SKILL_DAMAGE_MOD 5
+///Disarm chance mod from UNARMED skill
+#define UNARMED_SKILL_DISARM_MOD 5
 
 ///Melee skill; 15% extra damage per skill level
 #define SKILL_MELEE_WEAPONS "melee_weapons"

code/__DEFINES/traits.dm

@@ -155,7 +155,7 @@
 #define TRAIT_TIME_SHIFTED "time_shifted"
 #define TRAIT_LEASHED "leashed"
 #define TRAIT_CAN_VENTCRAWL "can_ventcrawl"
-#define TRAIT_WORKED_OUT "worked_out" //user has a cqc buff from working out
+#define TRAIT_WORKED_OUT "worked_out" //user has a unarmed buff from working out
 ///Makes no footsteps at all
 #define TRAIT_SILENT_FOOTSTEPS "silent_footsteps"
 ///quieter footsteps

code/_onclick/adjacent.dm

@@ -123,14 +123,6 @@
 			return TRUE
 	return FALSE
 
-
-/mob/living/silicon/decoy/Adjacent(atom/neighbor, atom/target, atom/movable/mover)
-	for(var/turf/myloc AS in locs)
-		if(myloc.Adjacent(neighbor, target = neighbor, mover = src))
-			return TRUE
-	return FALSE
-
-
 /obj/machinery/door/Adjacent(atom/neighbor, atom/target, atom/movable/mover)
 	if(isturf(loc) && bound_width > 32 || bound_height > 32) //locs will show loc if loc is not a turf
 		for(var/turf/myloc AS in locs)

code/_onclick/hud/screen_objects/screen_objects.dm

@@ -567,7 +567,7 @@
 
 /atom/movable/screen/SL_locator
 	name = "sl locator"
-	icon = 'icons/Marine/marine-items.dmi'
+	icon = 'icons/mob/screen/arrows.dmi'
 	icon_state = "Blue_arrow"
 	alpha = 0 //invisible
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
@@ -821,7 +821,7 @@
 #undef AMMO_HUD_ICON_EMPTY
 
 /atom/movable/screen/arrow
-	icon = 'icons/Marine/marine-items.dmi'
+	icon = 'icons/mob/screen/arrows.dmi'
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	screen_loc = ui_sl_dir
 	alpha = 128 //translucent
@@ -875,7 +875,6 @@
 	STOP_PROCESSING(SSprocessing, src)
 	return ..()
 
-
 /atom/movable/screen/arrow/leader_tracker_arrow
 	name = "hive leader tracker arrow"
 	icon_state = "Blue_arrow"

code/datums/components/harvester.dm

@@ -178,7 +178,7 @@
 /datum/component/harvester/proc/update_loaded_color(datum/source, list/overlays_list)
 	SIGNAL_HANDLER
 	var/obj/item/item_parent = parent
-	var/image/item_overlay = image('icons/obj/items/vali.dmi', item_parent, "[initial(item_parent.icon_state)]_loaded")
+	var/image/item_overlay = image('icons/obj/items/weapons/vali.dmi', item_parent, "[initial(item_parent.icon_state)]_loaded")
 	if(!loaded_reagent)
 		item_overlay.color = COLOR_GREEN
 	else

code/datums/elements/riding.dm

@@ -101,7 +101,7 @@
 
 /obj/item/riding_offhand
 	name = "offhand"
-	icon = 'icons/obj/items/weapons.dmi'
+	icon = 'icons/obj/items/weapons/misc.dmi'
 	icon_state = "offhand"
 	w_class = WEIGHT_CLASS_HUGE
 	item_flags = ITEM_ABSTRACT | DELONDROP | NOBLUDGEON

code/datums/gamemodes/campaign/perks.dm

@@ -201,7 +201,7 @@ Needed both for a purchase list and effected list (if one perk impacts multiple
 
 //skill modifying perks
 /datum/perk/skill_mod
-	var/cqc
+	var/unarmed
 	var/melee_weapons
 	var/firearms
 	var/pistols
@@ -225,28 +225,28 @@ Needed both for a purchase list and effected list (if one perk impacts multiple
 	. = ..()
 
 /datum/perk/skill_mod/apply_perk(mob/living/carbon/owner)
-	owner.set_skills(owner.skills.modifyRating(cqc, melee_weapons, firearms, pistols, shotguns, rifles, smgs, heavy_weapons, smartgun, \
+	owner.set_skills(owner.skills.modifyRating(unarmed, melee_weapons, firearms, pistols, shotguns, rifles, smgs, heavy_weapons, smartgun, \
 	engineer, construction, leadership, medical, surgery, pilot, police, powerloader, large_vehicle, stamina))
 
 /datum/perk/skill_mod/remove_perk(mob/living/carbon/owner)
-	owner.set_skills(owner.skills.modifyRating(-cqc, -melee_weapons, -firearms, -pistols, -shotguns, -rifles, -smgs, -heavy_weapons, -smartgun, \
+	owner.set_skills(owner.skills.modifyRating(-unarmed, -melee_weapons, -firearms, -pistols, -shotguns, -rifles, -smgs, -heavy_weapons, -smartgun, \
 	-engineer, -construction, -leadership, -medical, -surgery, -pilot, -police, -powerloader, -large_vehicle, -stamina))
 
-/datum/perk/skill_mod/cqc
+/datum/perk/skill_mod/unarmed
 	name = "Hand to hand expertise"
 	desc = "Advanced hand to hand combat training gives you an edge when you need to punch someone in the face. Improved unarmed damage and stun chance."
 	ui_icon = "cqc_1"
-	cqc = 1
+	unarmed = 1
 	all_jobs = TRUE
 	unlock_cost = 250
 
-/datum/perk/skill_mod/cqc/two
+/datum/perk/skill_mod/unarmed/two
 	name = "Hand to hand specialisation"
 	desc = "Muscle augments combined with specialised hand to hand combat training turn your body into a lethal weapon. Greatly improved unarmed damage and stun chance."
 	req_desc = "Requires Hand to hand expertise."
 	ui_icon = "cqc_2"
 	unlock_cost = 350
-	prereq_perks = list(/datum/perk/skill_mod/cqc)
+	prereq_perks = list(/datum/perk/skill_mod/unarmed)
 
 /datum/perk/skill_mod/melee
 	name = "Melee expertise"