diff --git a/dat/ship.xml b/dat/ship.xml
index 2da878a..3750075 100644
--- a/dat/ship.xml
+++ b/dat/ship.xml
@@ -70,6 +70,44 @@ The star product of Aerosys, the Hyena quickly has become a favorite of pirates
 <outfit quantity='2'>Laser</outfit>
 </outfits>
 </ship>
+<ship name="Pacifier">
+<GFX>pacifier</GFX>
+<GUI>minimal</GUI>
+<sound>engine</sound>
+<class>2</class>
+<price>1200000</price>
+<fabricator>Nexus</fabricator>
+<tech>8</tech>
+<description>
+The Pacifier is one of the older and trustier designs of the Nexus Corporation.  Was constructed mainly to patrol border systems.  They are very heavy fighters designed to be able to take a pounding and dish out damage, but the cost has been maneuverability.  No reason to run though if you're in one of these.
+</description>
+<movement>
+<thrust>260</thrust>
+<turn>115</turn>
+<speed>280</speed>
+</movement>
+<health>
+<shield>300</shield>
+<armour>180</armour>
+<energy>420</energy>
+<shield_regen>240</shield_regen>
+<armour_regen>90</armour_regen>
+<energy_regen>1380</energy_regen>
+</health>
+<characteristics>
+<crew>17</crew>
+<mass>230</mass>
+<fuel>500</fuel>
+<cap_weapon>130</cap_weapon>
+<cap_cargo>30</cap_cargo>
+</characteristics>
+<outfits>
+<outfit quantity='2'>Laser</outfit>
+<outfit quantity='1'>Laser Turret</outfit>
+<outfit quantity='2'>Headhunter Launcher</outfit>
+<outfit quantity='40'>Headhunter</outfit>
+</outfits>
+</ship>
 <ship name="Hawking">
 <GFX>hawking</GFX>
 <GUI>minimal</GUI>
@@ -84,7 +122,7 @@ A heavy frigate designed for heavy combat.  Used widely by the empire to establi
 <movement>
 <thrust>200</thrust>
 <turn>90</turn>
-<speed>260</speed>
+<speed>240</speed>
 </movement>
 <health>
 <shield>600</shield>
@@ -98,7 +136,7 @@ A heavy frigate designed for heavy combat.  Used widely by the empire to establi
 <crew>35</crew>
 <mass>500</mass>
 <fuel>300</fuel>
-<cap_weapon>180</cap_weapon>
+<cap_weapon>200</cap_weapon>
 <cap_cargo>70</cap_cargo>
 </characteristics>
 <outfits>
@@ -117,7 +155,7 @@ A heavy frigate designed for heavy combat.  Used widely by the empire to establi
 <tech>7</tech>
 <description>
 One of the Nexus' prize heavy fighters.  Was originally a secret design for the Empire military, but then disclosed.  Now a modified version is available for civilians, although it doesn't meet up to the original specifications.
-Used by security agencies all over the universe for it's reliability and availability. Proudly enforcing your security since STARDATE.
+Used by security agencies all over the universe for it's reliability and availability. Proudly enforcing your security since UST 1132.
 </description>
 <movement>
 <thrust>280</thrust>
diff --git a/gfx/ship/pacifier.png b/gfx/ship/pacifier.png
new file mode 100644
index 0000000..9744ae5
Binary files /dev/null and b/gfx/ship/pacifier.png differ
diff --git a/gfx/ship/pacifier_target.png b/gfx/ship/pacifier_target.png
new file mode 100644
index 0000000..3404256
Binary files /dev/null and b/gfx/ship/pacifier_target.png differ
diff --git a/src/opengl.h b/src/opengl.h
index cb3ca41..334f232 100644
--- a/src/opengl.h
+++ b/src/opengl.h
@@ -37,11 +37,11 @@ typedef struct glInfo_ {
 } glInfo;
 extern glInfo gl_screen; /* Local structure set with gl_init etc. */
 
-#define SCREEN_W  gl_screen.w
-#define SCREEN_H  gl_screen.h
+#define SCREEN_W      gl_screen.w
+#define SCREEN_H      gl_screen.h
 
-#define COLOUR(x)   glColor4d((x).r, (x).g, (x).b, (x).a)
-#define ACOLOUR(x,a) glColor4d((x).r, (x).g, (x).b, a)
+#define COLOUR(x)     glColor4d((x).r, (x).g, (x).b, (x).a)
+#define ACOLOUR(x,a)  glColor4d((x).r, (x).g, (x).b, a)
 
 /* Spritesheet info. */
 typedef struct glTexture_ {