Merge pull request #129 from Mirag1993/Мердж-с-оффами

PGF Content Part One (shiptest-ss13#2287)

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"

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

@@ -32,3 +32,9 @@
 
 /obj/effect/projectile/muzzle/wormhole
 	icon_state = "wormhole_g"
+
+/obj/effect/projectile/muzzle/pgf
+	icon_state = "muzzle_pgf"
+
+/obj/effect/projectile/muzzle/kalix
+	icon_state = "muzzle_kalix"

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

@@ -70,3 +70,9 @@
 
 /obj/effect/projectile/tracer/wormhole
 	icon_state = "wormhole_g"
+
+/obj/effect/projectile/tracer/pgf
+	icon_state = "beam_pgf"
+
+/obj/effect/projectile/tracer/kalix
+	icon_state = "beam_kalix"

code/game/objects/items.dm

@@ -32,7 +32,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	///Icon file for mob worn overlays.
 	var/icon/mob_overlay_icon
 	///icon state for mob worn overlays, if null the normal icon_state will be used.
-	var/mob_overlay_state //WS EDIT - Mob Overlay State
+	var/mob_overlay_state
 	///Forced mob worn layer instead of the standard preferred ssize.
 	var/alternate_worn_layer
 

code/modules/clothing/factions/gezena.dm

@@ -0,0 +1,276 @@
+//Jumpsuits
+//thgvr TODO: Make more stuff (backpacks, headsets, doodads, part 2?)
+/obj/item/clothing/under/gezena
+	name = "gezenan navywear"
+	desc = "Made of a slick synthetic material that is both breathable, and resistant to scale and thorn alike."
+	icon = 'icons/obj/clothing/faction/gezena/uniforms.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/uniforms.dmi'
+	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
+	icon_state = "naval"
+	item_state = "bluejump"
+	supports_variations = DIGITIGRADE_VARIATION
+	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
+
+/obj/item/clothing/under/gezena/captain
+	name = "gezenan captain's navywear"
+	desc = "A refined variation of the basic navywear, sporting sleek silver trim."
+	icon_state = "captain"
+	item_state = "bluejump"
+
+/obj/item/clothing/under/gezena/marine
+	name = "gezenan marine fatigue"
+	desc = "Rough inside and out, these fatigues have seen their fair share."
+	icon_state = "marine"
+	item_state = "marinejump"
+
+//Unarmored suit
+
+/obj/item/clothing/suit/toggle/gezena
+	name = "silkenweave jacket"
+	desc = "Refined and sturdy, emblazoned below the neck with the Federation's symbol."
+	icon = 'icons/obj/clothing/faction/gezena/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/suits.dmi'
+	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
+	icon_state = "lightcoat"
+	item_state = "bluecloth"
+	blood_overlay_type = "coat"
+	togglename = "zipper"
+	body_parts_covered = CHEST|ARMS
+	pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo
+	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+	armor = list("melee" = 20, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
+
+//Armored suit
+
+/obj/item/clothing/suit/armor/gezena
+	name = "navywear coat"
+	desc = "Formal navywear, emblazoned across the back with the Gezenan sigil."
+	icon = 'icons/obj/clothing/faction/gezena/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/suits.dmi'
+	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
+	icon_state = "coat"
+	item_state = "bluecloth"
+	blood_overlay_type = "coat"
+	body_parts_covered = CHEST|ARMS|GROIN|LEGS
+	pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo
+	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+	armor = list("melee" = 35, "bullet" = 35, "laser" = 20, "energy" = 40, "bomb" = 20, "bio" = 20, "rad" = 0, "fire" = 50, "acid" = 50)
+	allowed = list(
+					/obj/item/flashlight,
+					/obj/item/tank/internals/emergency_oxygen,
+					/obj/item/tank/internals/plasmaman,
+					/obj/item/toy,
+					/obj/item/storage/fancy/cigarettes,
+					/obj/item/lighter,
+					/obj/item/radio,
+					/obj/item/gun/energy/kalix,
+					)
+
+/obj/item/clothing/suit/armor/gezena/engi
+	name = "engineer navywear coat"
+	desc = "Oil and stain resistant, with orange trim signifiying the wearer doesn't mind getting their hands dirty."
+	icon_state = "engicoat"
+	item_state = "bluecloth"
+
+/obj/item/clothing/suit/armor/gezena/captain
+	name = "captain's navywear coat"
+	desc = "Blood resistant, with silver trim to denote status. Lined with softer material."
+	icon_state = "captaincoat"
+	item_state = "captaincoat"
+
+/obj/item/clothing/suit/armor/gezena/marine
+	name = "\improper Raksha-plating vest"
+	desc = "Raksha - a Kalixcian word for 'protection of the heart'. Sturdy and reliable."
+	icon_state = "marinevest"
+	item_state = "marinevest"
+
+/obj/item/clothing/suit/armor/gezena/marinecoat
+	name = "coated Raksha-plating"
+	desc = "Less practical with the coat than without."
+	icon_state = "marinecoat"
+	item_state = "bluecloth"
+
+//Spacesuits
+
+/obj/item/clothing/suit/space/gezena
+	name = "\improper Rakalla-suit"
+	desc = "Rakalla - a Kalixcian word for 'protection among the stars'. Sturdy, flexible, and reliable."
+	icon = 'icons/obj/clothing/faction/gezena/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/suits.dmi'
+	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
+	icon_state = "spacesuit"
+	item_state = "spacesuit"
+	armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 15, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
+	w_class = WEIGHT_CLASS_NORMAL
+	supports_variations = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/head/helmet/space/gezena
+	name = "\improper Rakalla-helm"
+	desc = "Featuring rubberized grommets fitting for any length of horn, and an internal monitor for life support."
+	icon = 'icons/obj/clothing/faction/gezena/head.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/head.dmi'
+	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
+	icon_state = "spacehelmet"
+	item_state = "spacehelm"
+	armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 15, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
+	w_class = WEIGHT_CLASS_NORMAL
+
+//Hats
+
+/obj/item/clothing/head/gezena
+	name = "navywear cap"
+	desc = "PH"
+	icon = 'icons/obj/clothing/faction/gezena/head.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/head.dmi'
+	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
+	icon_state = "navalhat"
+	item_state = "bluecloth"
+	armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+
+/obj/item/clothing/head/gezena/flap
+	name = "navywear flap-hat"
+	desc = "PH"
+	icon_state = "navalflap"
+	item_state = "bluecloth"
+
+/obj/item/clothing/head/gezena/marine
+	name = "\improper Gezenan marine cap"
+	desc = "PH"
+	icon_state = "marinehat"
+	item_state = "marinecloth"
+
+/obj/item/clothing/head/gezena/marine/flap
+	name = "\improper Gezenan marine flap-hat"
+	desc = "PH"
+	icon_state = "marineflap"
+	item_state = "marinecloth"
+
+/obj/item/clothing/head/gezena/medic
+	name = "PGF medic hat"
+	desc = "PH"
+	icon_state = "medichat"
+	item_state = "whitecloth"
+
+/obj/item/clothing/head/gezena/medic/flap
+	name = "PGF navy flap hat"
+	desc = "PH"
+	icon_state = "medicflap"
+	item_state = "whitecloth"
+
+/obj/item/clothing/head/gezena/captain // no captain flap yet(?)
+	name = "captain's navywear cap"
+	desc = "PH"
+	icon_state = "captainhat"
+	item_state = "bluecloth"
+
+/obj/item/clothing/head/helmet/gezena
+	name = "\improper Raksha-helm"
+	desc = "PH"
+	icon = 'icons/obj/clothing/faction/gezena/head.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/head.dmi'
+	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
+	icon_state = "marinehelmet"
+	item_state = "marinehelm"
+
+//Gloves
+
+/obj/item/clothing/gloves/gezena
+	name = "navywear gloves"
+	desc = "PH"
+	icon = 'icons/obj/clothing/faction/gezena/hands.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/hands.dmi'
+	icon_state = "navalgloves"
+	item_state = "navalgloves"
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+	armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+
+/obj/item/clothing/gloves/gezena/marine
+	name = "gezenan infantry gloves"
+	desc = "PH"
+	icon_state = "marinegloves"
+	item_state = "marinegloves"
+	armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 50)
+
+/obj/item/clothing/gloves/gezena/engi
+	name = "gezenan engineering gloves"
+	desc = "PH"
+	icon_state = "engigloves"
+	item_state = "engigloves"
+	siemens_coefficient = 0
+
+/obj/item/clothing/gloves/gezena/captain
+	name = "captain's navywear gloves"
+	desc = "PH"
+	icon_state = "captaingloves"
+	item_state = "captaingloves"
+	siemens_coefficient = 0
+
+//Boots
+
+/obj/item/clothing/shoes/combat/gezena
+	name = "gezenan steel-boots"
+	desc = "PH"
+	icon = 'icons/obj/clothing/faction/gezena/feet.dmi'
+	//mob_overlay_icon = 'icons/mob/clothing/faction/gezena/feet.dmi' todo: find out why digi breaks here
+	icon_state = "pgfboots"
+	item_state = "pgfboots"
+
+//Belt
+
+/obj/item/storage/belt/military/gezena
+	name = "infantry pouches"
+	desc = "PH"
+	icon = 'icons/obj/clothing/faction/gezena/belt.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/belt.dmi'
+	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
+	icon_state = "pouches"
+	item_state = "bluecloth"
+
+/obj/item/storage/belt/medical/gezena
+	name = "infantry medical pouches"
+	desc = "PH"
+	icon = 'icons/obj/clothing/faction/gezena/belt.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/belt.dmi'
+	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
+	icon_state = "medpouches"
+	item_state = "whitecloth"
+
+//Capes
+
+/obj/item/clothing/neck/cloak/gezena
+	name = "gezenan half-cape"
+	desc = "PH."
+	icon = 'icons/obj/clothing/faction/gezena/neck.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/neck.dmi'
+	lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
+	icon_state = "cape"
+	item_state = "blackcloth"
+
+/obj/item/clothing/neck/cloak/gezena/engi
+	name = "gezenan engineer's half-cape"
+	desc = "PH."
+	icon_state = "engicape"
+	item_state = "blackcloth"
+
+/obj/item/clothing/neck/cloak/gezena/med
+	name = "gezenan medic's half-cape"
+	desc = "PH."
+	icon_state = "medcape"
+	item_state = "blackcloth"
+
+/obj/item/clothing/neck/cloak/gezena/captain
+	name = "gezenan captain's half-cape"
+	desc = "PH."
+	icon_state = "captaincape"
+	item_state = "blackcloth"

code/modules/clothing/outfits/gezena.dm

@@ -0,0 +1,17 @@
+/datum/outfit/job/gezena
+
+/datum/outfit/job/gezena/post_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+	if(visualsOnly)
+		return
+	H.faction |= list("playergezena")
+
+/datum/outfit/job/gezena/assistant
+	name = "Deckhand (PGF)"
+	jobtype = /datum/job/assistant
+
+	head = /obj/item/clothing/head/gezena
+	uniform = /obj/item/clothing/under/gezena
+	suit = /obj/item/clothing/suit/toggle/gezena
+	gloves = /obj/item/clothing/gloves/gezena
+	shoes = /obj/item/clothing/shoes/combat/gezena

code/modules/clothing/suits/cloaks.dm

@@ -12,7 +12,6 @@
 	greyscale_colors = list(list(11, 15), list(12, 22), list(12, 22))
 	greyscale_icon_state = "cloak"
 
-
 /obj/item/clothing/neck/cloak/hos
 	name = "head of security's cloak"
 	desc = "Worn by Securistan, ruling their watch with an iron fist."

code/modules/power/cell.dm

@@ -412,7 +412,7 @@
 	maxcharge = 10000
 	custom_materials = list(/datum/material/glass=60)
 	chargerate = 1500
-	rating = 0 //gun batteries now incompatible with RPED WS edit
+	rating = 0 //Makes it incompatible with RPED
 
 /obj/item/stock_parts/cell/gun/empty/Initialize()
 	. = ..()
@@ -476,6 +476,19 @@
 	charge = 0
 	update_appearance()
 
+/obj/item/stock_parts/cell/gun/kalix
+	name = "PGF CELL PH"
+	desc = "PGF CELL PH"
+	icon_state = "kalix-cell"
+	maxcharge = 12750 // 15 shots at 850 energy per
+	chargerate = 1750
+
+/obj/item/stock_parts/cell/gun/pgf
+	name = "pgf CELL PH"
+	desc = "pgf CELL PH"
+	icon_state = "pgf-cell"
+	maxcharge = 20000 // 20 shots at 1000 energy per
+	chargerate = 2000
 
 #undef CELL_DRAIN_TIME
 #undef CELL_POWER_GAIN

code/modules/projectiles/ammunition/energy/laser.dm

@@ -7,7 +7,7 @@
 	e_cost = 830
 	select_name = "kill"
 
-/obj/item/ammo_casing/energy/laser/smg //WS edit: fun
+/obj/item/ammo_casing/energy/laser/smg
 	projectile_type = /obj/projectile/beam/laser/weak/negative_ap
 	e_cost = 799 //12 shots with a normal power cell, 25 with an upgraded
 	select_name = "kill"