Merge branch 'Railgun' of https://github.com/musicmanvr/Delta-V into …

…Railgun

Resources/Locale/en-US/deltav/roboisseur/roboisseur.ftl

@@ -4,17 +4,17 @@ roboisseur-request-3 = There may be an exorbitantly affluent personage in this s
 roboisseur-request-4 = My more... Adventurous Clients require {INDEFINITE($item)} {$item}.
 roboisseur-request-5 = {$item}. It's rare. It's valuable. You can make it, yes?
 roboisseur-request-6 = Local changes in this quadrant's stock exchange decteted. Seeking {INDEFINITE($item)} {$item}.
-roboisseur-request-impatient-1 = There is no time left! Bring me {THE($item)}, immediately!
-roboisseur-request-impatient-2 = My market opportunity is dwindling! Quickly, you fools, {THE($item)}!
+roboisseur-request-impatient-1 = There is no time left! Bring me {INDEFINITE($item)} {$item}, immediately!
+roboisseur-request-impatient-2 = My market opportunity is dwindling! Quickly, you fools, {INDEFINITE($item)} {$item}!
 roboisseur-request-impatient-3 = Damn you all! Deliver me {INDEFINITE($item)} {$item} already!
 roboisseur-request-second-1 = I humbly request one {$item} for one of my snowbound clients.
 roboisseur-request-second-2 = The frozen planet in this sector requests {INDEFINITE($item)} {$item}!
 roboisseur-request-second-3 = A local ice cream vendor is looking to trade for {INDEFINITE($item)} {$item}.
-roboisseur-thanks-1 = Mmm, I'm sure my client will be most pleased. 
-roboisseur-thanks-2 = I cannot believe you were able to source it, but I suppose you are the best. 
+roboisseur-thanks-1 = Mmm, I'm sure my client will be most pleased.
+roboisseur-thanks-2 = I cannot believe you were able to source it, but I suppose you are the best.
 roboisseur-thanks-3 = When I first heard there were such skilled creatives on this station, I was shocked. My thanks.
 roboisseur-thanks-4 = Unlike... most of your coworkers, my clients can afford these delicacies!
-roboisseur-thanks-5 = You have my word, my nominal fees are... more than reasonable. 
+roboisseur-thanks-5 = You have my word, my nominal fees are... more than reasonable.
 roboisseur-thanks-second-1 = You shared your hopsitality, now they share their frozen delights.
 roboisseur-thanks-second-2 = A cold, sweet treat should be reward enough, but have some cold, hard cash too.
 roboisseur-thanks-second-3 = While the iced delicacy alone is currency to them, they understand your needs.

Resources/Maps/hammurabi.yml

@@ -86758,27 +86758,6 @@ entities:
       pos: 36.47866,-34.43493
       parent: 1
       type: Transform
-- proto: ClothingOuterHardsuitAtmos
-  entities:
-  - uid: 29233
-    components:
-    - pos: -30.966703,-22.620975
-      parent: 1
-      type: Transform
-- proto: ClothingOuterHardsuitEngineering
-  entities:
-  - uid: 42054
-    components:
-    - pos: -30.300037,-22.6314
-      parent: 1
-      type: Transform
-- proto: ClothingOuterHardsuitEngineeringWhite
-  entities:
-  - uid: 42053
-    components:
-    - pos: -31.643787,-22.641825
-      parent: 1
-      type: Transform
 - proto: ClothingOuterHoodieBlack
   entities:
   - uid: 30361
@@ -107479,8 +107458,6 @@ entities:
     - pos: -42.5,-59.5
       parent: 1
       type: Transform
-    - storageUsed: 15
-      type: Storage
     - containers:
         storagebase: !type:Container
           showEnts: False
@@ -203139,10 +203116,29 @@ entities:
       type: Transform
   - uid: 42000
     components:
-    - pos: -100.50548,0.6769848
+    - pos: -100.50558,0.7054387
       parent: 1
       type: Transform
-    - content: 'Captain:'
+    - content: >-
+        Captain:
+
+
+        A few notes:
+
+
+        1. As Hammurabi Station is a designated prison facility, all ore is to be diverted to prison workshop for processing. Materials produced by the prisoners will be sent back to Logistics for distribution throughout the station as needed.
+
+        Please coordinate with the warden and logistics officer to ensure the production chain is maintained efficiently.
+
+
+        2. The prison is on its own power grid and thus, the AME NE of the prison needs to be fueled.
+
+        Please make certain the engineering team is aware of this.
+
+
+        Regards, 
+
+        Central Command
       type: Paper
 - proto: PaperBin10
   entities:
@@ -270229,9 +270225,9 @@ entities:
     - pos: 47.5,-59.5
       parent: 1
       type: Transform
-    - text: Prison Wvac
+    - text: Prison Evac
       type: NavMapBeacon
-    - location: Prison Wvac
+    - location: Prison Evac
       type: WarpPoint
 - proto: WarpPointBeaconService
   entities:

Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml

@@ -28,7 +28,7 @@
   id: ParamedicGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitParamedic
-    back: ClothingBackpackParamedicFilled # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/backpack.yml
+    back: ClothingBackpackParamedicFilledDV # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/backpack.yml
     shoes: ClothingShoesColorBlue
     id: ParamedicPDA
     ears: ClothingHeadsetMedical

Resources/clientCommandPerms.yml

@@ -28,7 +28,6 @@
     - resetent
     - resetallents
     - cvar
-    - fuckrules
     - midipanic
     - replay_recording_start
     - replay_recording_stop
@@ -72,6 +71,7 @@
     - detachent
     - localdelete
     - fullstatereset
+    - fuckrules
 
 - Flags: MAPPING
   Commands: