diff --git a/Resources/Prototypes/DeltaV/Guidebook/species.yml b/Resources/Prototypes/DeltaV/Guidebook/species.yml
index f790970bcc8..8487ec32dd2 100644
--- a/Resources/Prototypes/DeltaV/Guidebook/species.yml
+++ b/Resources/Prototypes/DeltaV/Guidebook/species.yml
@@ -18,7 +18,7 @@
   name: species-name-oni
   text: "/ServerInfo/Guidebook/Mobs/DeltaV/Oni.xml"
 
-- type: guideEntry
-  id: Rodentia
-  name: species-name-rodentia
-  text: "/ServerInfo/Guidebook/Mobs/DeltaV/Rodentia.xml"
+# - type: guideEntry
+  # id: Rodentia
+  # name: species-name-rodentia
+  # text: "/ServerInfo/Guidebook/Mobs/DeltaV/Rodentia.xml"
diff --git a/Resources/Prototypes/DeltaV/Species/rodentia.yml b/Resources/Prototypes/DeltaV/Species/rodentia.yml
index 4916af1fe7d..3e463c5aaa7 100644
--- a/Resources/Prototypes/DeltaV/Species/rodentia.yml
+++ b/Resources/Prototypes/DeltaV/Species/rodentia.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Rodentia
   name: species-name-rodentia
-  roundStart: true
+  roundStart: false # Frontier - off
   prototype: MobRodentia
   sprites: MobRodentiaSprites
   defaultSkinTone: "#747474"
diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml
index 81f0a65993f..230dbe98725 100644
--- a/Resources/Prototypes/Guidebook/species.yml
+++ b/Resources/Prototypes/Guidebook/species.yml
@@ -16,7 +16,7 @@
     - Harpy # DeltaV
     - Felinid # DeltaV
     - Oni # DeltaV
-    - Rodentia # DeltaV
+#    - Rodentia # DeltaV
 
 - type: guideEntry
   id: Arachnid
diff --git a/Resources/Prototypes/Species/species_weights.yml b/Resources/Prototypes/Species/species_weights.yml
index b19f0eefe4f..f021d6a8ec2 100644
--- a/Resources/Prototypes/Species/species_weights.yml
+++ b/Resources/Prototypes/Species/species_weights.yml
@@ -12,6 +12,6 @@
     Oni: 2 # Frontier
     Dwarf: 2
     Diona: 2
-    Rodentia: 2 # DeltaV - Rodentia, see Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml
+#    Rodentia: 2 # DeltaV - Rodentia, see Prototypes/DeltaV/Entities/Mobs/Species/rodentia.yml
     Goblin: 2 # Frontier
     Harpy: 1 # Frontier
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
index e65a9e6b0d5..1ecff17d73e 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
@@ -105,6 +105,8 @@
       - !type:Emote
         emote: Scream
         probability: 0.2
+  - type: Rummager # DeltaV Code
+  - type: AlwaysTriggerMousetrap # DeltaV Code
 
 - type: entity
   save: false
diff --git a/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Rodentia.xml b/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Rodentia.xml
index 7c1f8bde141..b0aef744966 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Rodentia.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Rodentia.xml
@@ -20,7 +20,7 @@
 
   ## Special
 
-  - Can Rummage in disposal chutes, which can sometimes dig up food.
+  - Can Rummage in disposal chutes, which can dig up trash.
   - Can store small items in their cheeks. Having items in their mouth makes their speech unintelligible, and they will drop all items in their mouth if attacked, stunned, or shoved.
   - Can "sneak" underneath tables, but not doors.
 
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml
index 8eb44abe310..5274409fcbf 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml
@@ -26,7 +26,7 @@
   <GuideEntityEmbed Entity="MobFelinid" Caption="Felinid"/>
   <GuideEntityEmbed Entity="MobHarpy" Caption="Harpy"/>
   <GuideEntityEmbed Entity="MobOni" Caption="Oni"/>
-  <GuideEntityEmbed Entity="MobRodentia" Caption="Rodentia"/>
+  <!-- <GuideEntityEmbed Entity="MobRodentia" Caption="Rodentia"/> -->
   </Box>
 
 </Document>
diff --git a/Resources/ServerInfo/_NF/Guidebook/Mobs/Goblin.xml b/Resources/ServerInfo/_NF/Guidebook/Mobs/Goblin.xml
index c7236cddbd5..02d8e7fe497 100644
--- a/Resources/ServerInfo/_NF/Guidebook/Mobs/Goblin.xml
+++ b/Resources/ServerInfo/_NF/Guidebook/Mobs/Goblin.xml
@@ -5,10 +5,25 @@
     <GuideEntityEmbed Entity="MobGoblin" Caption=""/>
   </Box>
 
-  Their small stature allows goblins to dive into toilets and mailing units. They don't like to be sprayed with water or space cleaner.
+  Goblins are a race of humanoid beings, small, very loud and fragile.
   
-  When unarmed, their claws deal [color=red]Slash[/color] damage instead of Blunt.
+  ## Benefits
 
-  Due to their unusual dietary choices goblins take [color=lime]20% less Toxin damage[/color], but because of their small size they take [color=#ffa500]10% more Brute (Blunt/Slash/Piercing) damage[/color].
+  - Due to their unusual dietary choices goblins take [color=lime]25% less Toxin damage[/color], 
+  - When unarmed, their claws deal [color=red]Slash[/color] damage instead of Blunt.
+  - Smaller than humans.
+  - Can fit in duffelbags.
+
+  ## Special
+
+  - Can Rummage in disposal chutes, which can dig up trash.
+  - Their small stature allows goblins to dive into toilets and mailing units.
+  - Uniqe chants and goblin speak.
+
+  ## Drawbacks
+
+  - Because of their small size they take [color=#ffa500]20% more Brute (Blunt/Slash/Piercing) damage[/color].
+  - Always triggers mousetraps, regardless of whether or not they are wearing shoes.
+  - They don't like to be sprayed with water or space cleaner.
 
 </Document>