FOR IMMEDIATE DISTRIBUTION
+
SUBJECT:
+ "}
+
+/obj/item/paper/fluff/ship/bolide/one
+ name = "Official Briefing"
+ default_raw_text = {"
+
+
+
+
+
+
+
+
+ | logo here (one day) |
+
+ Pan Gezenan Federation Navy
Office of Naval Deployment
+ |
+ XX - XX - 506 |
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+
SUBJECT: Briefing Crew of Vessel
+
+
+
1. The Office of Naval Deployment has seen fit to deploy you in command of an Elated Bolide class Frigate Assault Lander (Bolide-Class). Congratulations on your assignment. You are expected to coordinate with the Marine Lieutenant assigned to the vessel for the duration of this deployment.
+
2. A Bolide-class Lander's mission profile is traditionally; landing in occupied regions, planetary assault in contested systems, construction of Navy Infrastructure, assistance of CLIP colonists, and aiding in conducting Federation Readiness Drills.
+
3. The assignment issued to your vessel is as follows: Identify locations of interest, construct infrastructure, avoid non-decisive confrontations, conduct readiness drills if possible. Deviation from these goals is accepted and expected. Failure to meet any of them will result in an investigatory effort on your command.
+
4. The Office Of Naval Deployment directs that it is supplied with the following: Reports on construction projects, reports on conflict in area, reports on crew readiness. Failure to supply pertinent reports in a timely fashion will lead to termination of your command.
+
5. The Office Of Naval Deployment directs that you coordinate with the Marine Lieutenant to ensure a chain of command is followed aboard at all times. The Office recommends assigning 'buddies' to risk-prone marines, assigning 'Team Leaders' to watch over any group of more than 3, and ensuring radio contact at all times.
+
6. The Office recommends that all other documents in this folder are read, and distributed to the crew as necessary.
+
+
+
+
+
+ Eutei-Tar
+ Eutei-Tar
+ Vice Admiral, PGF Navy
+ Assistant Director Of the Office Of Navy Deployment
+
+ "}
+
+/obj/item/paper/fluff/ship/bolide/two
+ name = "Explosive Materials Handling"
+ default_raw_text = {"
+
+
+
+
+
+
+
+
+ | logo here (one day) |
+
+ Pan Gezenan Federation Navy
Office Of Requisitions
+ |
+ XX - XX - 506 |
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+
SUBJECT: Safe storage of explosive materials
+
+
+
1. The Office of Requisition has seen fit to deploy your command with a complement of explosive compounds. These compounds include - Composition C-4, Composition X-4.
+
2. Composition C-4 is an dense explosive package composed of; RDX, Plastic binders, plasticizer. Composition C-4 is a stable, malleable explosive meant for demolition usage. It is resistant to detonation from gunshots and jostling. The C-4 charges you have been issued include a detonator in their assembly, and should not be tinkered with by untrained hands.
+
3. Ensure that any usage of Composition C-4 is monitored and controlled. Do not issue Composition c-4 to your vessel without a cause for such.
+
4. Composition X-4 is a high powered explosive package composed of an RDX filling mixed with a teslium based detonator, allowing for a far more focused explosion. Unless the casing has degraded, it is safe to handle in the same manner as Composition C-4.
+
5. Take care in assigning usage of Composition X-4 due to it's increased potency. While focused, an injury resulting from being caught in a blast would likely prove fatal.
+
6. The Office recommends assigning a trained expert to monitor field usage of explosives.
+
+
+
+ "}
+
+/obj/item/paper/fluff/ship/bolide/three
+ name = "Marine Relationships"
+ default_raw_text = {"
+
+
+
+
+
+
+
+
+ | logo here (one day) |
+
+ Pan Gezenan Federation Navy
Office Of Personnel
+ |
+ XX - XX - 506 |
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+
SUBJECT: Prevention of Inappropriate Relationships.
+
+
+
The Office of Personnel recommends that the captain of any PGFN vessel keep an active eye out for inappropriate relationships in the ranks.
+
Inappropriate relationships are a relationship that fulfills one of the following criteria; Compromises the integrity of supervisory authority, causes unfairness, involves improper use of rank or position for personal gain, gives the perception that it is exploitive or coercive in nature, can create an adverse effect on good order and discipline or mission accomplishment.
+
As an officer, behaviors to avoid including enlisted in are; business matters, gambling, dating, sharing living accomodations.
+
Actual or percieved, these activities are prohibited. If it looks wrong, it's probably wrong.
+
+
+
+ "}
+
+/obj/item/paper/fluff/ship/bolide/four
+ name = "Chain Of Command"
+ default_raw_text = {"
+
+
+
+
+
+
+
+
+ | logo here (one day) |
+
+ Pan Gezenan Federation Navy
Office Of Personnel
+ |
+ XX - XX - 506 |
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+
SUBJECT: Chain of Command aboard vessel.
+
+
+
The Office of Personnel recommends that the Captain of a PGFN vessel in deployment establish a chain of command that encompasses all crew aboard the vessel.
+
The ranks of all serving members aboard a vessel creates a natural chain of command for the Captain and any other officers to base any further Chain Of Command alterations upon. It should be stressed that a Captain should avoid issuing field promotions to fulfill an artifical chain of command.
+
A Captain should discuss any change in chain of command with any other officers aboard before putting it into action. This allows multiple opinions to be fed into the process, thus creating a stronger product.
+
Aboard a Bolide-Class Lander, the Office of Personnel recommends that the captain designate one 'team leader' per three marines aboard. These team leaders should report directly to the Marine Lieutenant, They should be reported to by the two marines in their team. It is not suggested to work the naval engineers into this program, as they are not expected to deploy in combat.
+
Marines should be made aware that being declared team leader carries no authority unless delegated. In the event of a conflicted chain of command, or contested order, the figure with rank should be obeyed.
+
This Office recommends monitoring marines for behavioral patterns before assigning a team leader. The ideal marine team leader is cool-headed, rational, and able to make tough choices.
+
+
+
+ "}
+
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index 5d89f33549d3..c99729526e87 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -1011,7 +1011,7 @@ DEFINE_BITFIELD(turret_flags, list(
/obj/machinery/porta_turret/ship/pgf/heavy
name = "Etherbor Point-Defense System"
desc = "A high-powered defensive turret manufactured by Etherbor. The EPDS contains heavy energy weapons linked in tandem."
- scan_range = 10
+ scan_range = 12
stun_projectile = /obj/projectile/beam/hitscan/disabler/heavy
stun_projectile_sound = 'sound/weapons/gun/energy/kalixpistol.ogg'
lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf/sniper //fwoom
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 29d2cd22dbbd..31314b3d74ba 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -102,6 +102,14 @@
for(var/i in 1 to 7)
new /obj/item/disk/data(src)
+/obj/item/storage/box/holodisc
+ name = "holodisc box"
+ illustration = "disk_kit"
+
+/obj/item/storage/box/holodisc/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/disk/holodisk(src)
+
//guys why are my tests failing
/obj/item/storage/box/disks_plantgene
name = "plant data disks box"
@@ -743,6 +751,15 @@
for(var/i in 1 to 7)
new /obj/item/clothing/accessory/armband/deputy(src)
+/obj/item/storage/box/smokebombs
+ name = "box of smoke grenades"
+ desc = "Used for rapidly laying cover."
+ illustration = "grenade"
+
+/obj/item/storage/box/smokebombs/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/grenade/smokebomb(src)
+
/obj/item/storage/box/metalfoam
name = "box of metal foam grenades"
desc = "To be used to rapidly seal hull breaches."
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 6a47c8544bb9..9b17eae3b197 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -17,12 +17,13 @@
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
material_flags = MATERIAL_COLOR
- var/latches = "single_latch"
+ var/latches = null
var/has_latches = TRUE
/obj/item/storage/toolbox/Initialize()
. = ..()
- if(has_latches)
+ if(has_latches && !latches)
+ latches = "single_latch"
if(prob(10))
latches = "double_latch"
if(prob(1))
@@ -71,12 +72,10 @@
material_flags = NONE
/obj/item/storage/toolbox/mechanical/PopulateContents()
- //WS Edit - Better Tool sprites
if(prob(50))
new /obj/item/wrench(src)
else
new /obj/item/wrench/crescent(src)
- //WS End
new /obj/item/screwdriver(src)
new /obj/item/weldingtool(src)
new /obj/item/crowbar(src)
diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm
index df7a5145e47f..e3dd80457305 100644
--- a/code/modules/clothing/outfits/factions/gezena.dm
+++ b/code/modules/clothing/outfits/factions/gezena.dm
@@ -71,6 +71,15 @@
courierbag = /obj/item/storage/backpack/messenger/sec
box = /obj/item/storage/box/survival/security
+/datum/outfit/job/gezena/security/sapper
+ name = "PGF - Marine Pioneer"
+ id_assignment = "Marine Pioneer"
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
/datum/outfit/job/gezena/hos
name = "PGF - Marine Sergeant"
id_assignment = "Sergeant"
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index ad18b2bcd0b4..71112e012f77 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -12,7 +12,9 @@
var/static/list/folder_insertables = typecacheof(list(
/obj/item/paper,
/obj/item/photo,
- /obj/item/documents
+ /obj/item/documents,
+ /obj/item/disk,
+ /obj/item/tape,
))
/obj/item/folder/Initialize()
diff --git a/code/modules/paperwork/folders_premade.dm b/code/modules/paperwork/folders_premade.dm
index 5237358e34b1..e8f092f77161 100644
--- a/code/modules/paperwork/folders_premade.dm
+++ b/code/modules/paperwork/folders_premade.dm
@@ -81,3 +81,15 @@
/obj/item/folder/suns/red
icon_state = "folder_sunsred" // i'm not sure why SUNS would need secret documents
+
+//pgf folders
+
+/obj/item/folder/pgf
+ desc = "A green folder with Pan Gezenan Federation iconography."
+ icon_state = "folder_pgf"
+
+/obj/item/folder/pgf/red
+ icon_state = "folder_pgfred"
+
+/obj/item/folder/pgf/blue
+ icon_state = "folder_pgfblue"
diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi
index ec6900432306..28ace37f4170 100644
Binary files a/icons/mob/pets.dmi and b/icons/mob/pets.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index ab9af894d43e..f1f583593bc6 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 5353677357cf..f5f101c276af 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index 1a0fa7effb95..42edb2ddda31 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -1030,6 +1030,7 @@
#include "code\game\MapData\shuttles\misc.dm"
#include "code\game\MapData\shuttles\nanotrasen_mimir.dm"
#include "code\game\MapData\shuttles\nanotrasen_ranger.dm"
+#include "code\game\MapData\shuttles\pgf_bolide.dm"
#include "code\game\MapData\shuttles\pgf_crying_sun.dm"
#include "code\game\MapData\shuttles\srm_elder.dm"
#include "code\game\mecha\mech_bay.dm"