diff --git a/data/dodge.config.json b/data/dodge.config.json
index e87cee742..a2af87edd 100644
--- a/data/dodge.config.json
+++ b/data/dodge.config.json
@@ -14,7 +14,7 @@
   "_graphics_num_shadow_casters": "NumShadowCasters20",
   "_graphics_shadow_rendering": "GeoObjShads",
   "_graphics_shadow_size": "Typical",
-  "_graphics_world_resolution": "QuarterRes",
+  "_graphics_world_resolution": "FullRes",
   "_volume_master": 1,
   "_volume_music": 0,
   "_volume_sound": 1,
diff --git a/src/Dodge/Item/Draw/SPic.hs b/src/Dodge/Item/Draw/SPic.hs
index 4cab89134..c627e7fa9 100644
--- a/src/Dodge/Item/Draw/SPic.hs
+++ b/src/Dodge/Item/Draw/SPic.hs
@@ -44,22 +44,28 @@ itemSPic it = case it ^. itType of
 craftItemSPic :: CraftType -> Shape
 craftItemSPic = \case
     PIPE -> colorSH green $ xCylinderST 3 10
---    TUBE
---    HARDWARE
---    SPRING
---    HOSE
---    TAPE
---    CAN
---    TIN
---    STEELDRUM
---    PLANK
---    GLASSSHARD
---    SCRAPMETAL
---    PUMP
---    MOTOR
---    TRANSFORMER
---    PRISM
---    LIGHTER
+    TUBE -> colorSH cyan $ xCylinderST 5 20
+    HARDWARE -> colorSH orange $ upperPrismPolyST 3 $ square 4
+    SPRING -> colorSH green $ xCylinderST 1 5
+    HOSE -> colorSH green $ xCylinderST 1 10
+    TAPE -> colorSH (greyN 0.5) 
+        . translateSH (V3 4 0 0) . upperCylinder Small Typical 1 $ polyCirc 3 5
+    CAN -> colorSH green
+        . translateSH (V3 4 0 0) . upperCylinder Small Typical 1 $ polyCirc 3 4
+    TIN -> colorSH green . upperPrismPolyST 3 $ rectXH 2 2
+    STEELDRUM -> colorSH green
+        . translateSH (V3 4 0 0) . upperCylinder Small Typical 1 $ polyCirc 4 8
+    PLANK -> colorSH orange $ upperPrismPolyST 3 $ rectXH 8 2
+    GLASSSHARD -> colorSH azure $ upperPrismPolyST 1 $ [V2 0 (-1), V2 4 (-0.5), V2 0 1]
+    SCRAPMETAL -> colorSH (greyN 0.3) $ upperPrismPolyST 3 $ square 4
+    PUMP -> colorSH yellow . translateSH (V3 4 0 0) $ 
+        (upperCylinder Small Typical 1 $ polyCirc 3 4)
+        <> upperPrismPolyST 1 (rectNSWE (-2) (-4) 4 0)
+        <> upperPrismPolyST 1 (rectNSWE 4 2 0 (-4))
+    MOTOR -> colorSH orange $ xCylinderST 5 3 <> xCylinderST 3 5
+    TRANSFORMER -> colorSH blue $ upperPrismPolyST 3 $ square 4
+    PRISM -> colorSH azure $ upperPrismPolyST 1 $ [V2 0 (-3), V2 4 0, V2 0 3]
+    LIGHTER -> colorSH yellow . upperPrismPolyST 3 $ rectXH 2 2
 --    MAGNET
 --    ANTIMATTER
 --    PLATE
@@ -143,18 +149,11 @@ backpackShape = upperPrismPolyMT 10 $ rectNSWE 5 (-5) (-4) 4
 
 --ammoPosition :: Item -> HeldItemType -> AmmoPosition
 --ammoPosition itm hit = case hit of
---    FLATSHIELD -> NoAmmoPosition
---    FORCEFIELDGUN -> NoAmmoPosition
---    TORCH -> NoAmmoPosition
 --    BANGSTICK i -> bangStickAmmoPos i itm
 --    PISTOL -> Magazine (V3 5 2 0) lhs
 --    MACHINEPISTOL -> Magazine (V3 5 2 0) lhs
 --    AUTOPISTOL -> Magazine (V3 5 2 0) lhs
 --    SMG -> Magazine (V3 7 (-2) 0) rhs
---    BANGCONE -> NoAmmoPosition
---    BLUNDERBUSS -> NoAmmoPosition
---    GRAPECANNON _ -> NoAmmoPosition
---    MINIGUNX _ -> NoAmmoPosition
 --    VOLLEYGUN i -> volleygunAmmoPos i
 --    MULTIGUN i -> multigunAmmoPos i
 --    RIFLE -> Bullets [(V3 5 0 3, Q.axisAngle (V3 1 0 0) 0)]
@@ -167,27 +166,7 @@ backpackShape = upperPrismPolyMT 10 $ rectNSWE 5 (-5) (-4) 4
 --    AUTOAMR -> Magazine (V3 10 (-2) 0) rhs
 --    SNIPERRIFLE -> Bullets [(V3 5 0 3, Q.axisAngle (V3 1 0 0) 0)]
 --    MACHINEGUN -> Magazine (V3 10 (-2) 0) rhs
---    FLAMESPITTER -> NoAmmoPosition
---    FLAMETHROWER -> NoAmmoPosition
---    FLAMETORRENT -> NoAmmoPosition
---    FLAMEWALL -> NoAmmoPosition
---    BLOWTORCH -> NoAmmoPosition
---    SPARKGUN -> NoAmmoPosition
---    TESLAGUN -> NoAmmoPosition
---    LASGUN -> NoAmmoPosition
---    LASCIRCLE -> NoAmmoPosition
---    DUALBEAM -> NoAmmoPosition
---    LASWIDE _ -> NoAmmoPosition
 --    --SONICGUN        -> noPic baseSonicShape
---    TRACTORGUN -> NoAmmoPosition
---    LAUNCHER -> NoAmmoPosition
---    LAUNCHERX _ -> NoAmmoPosition
---    REMOTELAUNCHER -> NoAmmoPosition
---    POISONSPRAYER -> NoAmmoPosition
---    DRONELAUNCHER -> NoAmmoPosition
---    SHATTERGUN -> NoAmmoPosition
---    HELDDETECTOR _ -> NoAmmoPosition
---    KEYCARD _ -> NoAmmoPosition
 --  where
 --    lhs = Q.axisAngle (V3 1 0 0) pi
 --    rhs = Q.axisAngle (V3 1 0 0) 0
diff --git a/src/Shape.hs b/src/Shape.hs
index b0266ea75..0f143bc22 100644
--- a/src/Shape.hs
+++ b/src/Shape.hs
@@ -136,6 +136,7 @@ xCylinderST = xCylinder Small Typical
 xCylinder :: Size -> Importance -> Float -> Float -> Shape
 xCylinder size shad r x =
     translateSHz r . rotateSHq (V3 0 1 0) (pi / 2) . upperCylinder size shad x $
+    -- why didn't I make this a simple circle?
         [ V2 r r
         , V2 (- r / 2) (r / 2)
         , V2 (- r / 2) (negate $ r / 2)
diff --git a/tags b/tags
index bfa855922..f6ae8ab6f 100644
--- a/tags
+++ b/tags
@@ -16,7 +16,7 @@
 <$>	src/Dodge/Data/ActionPlan.hs	203;"	o
 <$>	src/Dodge/Data/CWorld.hs	49;"	o
 <$>	src/Dodge/Data/Camera.hs	39;"	o
-<$>	src/Dodge/Data/Creature.hs	100;"	o
+<$>	src/Dodge/Data/Creature.hs	90;"	o
 <$>	src/Dodge/Data/LWorld.hs	158;"	o
 <$>	src/Dodge/Data/Terminal.hs	131;"	o
 AIUNIT	src/Dodge/Data/Item/Combine.hs	51;"	C
@@ -419,14 +419,13 @@ Creature	src/Dodge/Data/Creature.hs	7;"	m
 Creature	src/Dodge/Default/Creature.hs	1;"	m
 Creature	src/Dodge/Placement/Instance/Creature.hs	1;"	m
 Creature	src/Dodge/Zoning/Creature.hs	1;"	m
-CreatureCorpse	src/Dodge/Data/Creature.hs	83;"	t
+CreatureCorpse	src/Dodge/Data/Creature.hs	74;"	t
 CreatureDropType	src/Dodge/Data/Creature/State.hs	23;"	t
 CreatureEffect	src/Dodge/CreatureEffect.hs	1;"	m
 CreatureEffect	src/Dodge/Data/CreatureEffect.hs	6;"	m
 CreaturePart	src/Dodge/Data/Wall.hs	53;"	C
 CreatureState	src/Dodge/Data/Creature/State.hs	16;"	t
 CreatureStatistics	src/Dodge/Data/Creature/Misc.hs	20;"	t
-CreatureTargeting	src/Dodge/Data/Creature.hs	76;"	t
 CreatureType	src/Dodge/Data/Creature/Misc.hs	69;"	t
 CryostatisSS	src/Dodge/Data/Scenario.hs	91;"	C
 Crystal	src/Dodge/Data/Material.hs	11;"	C
@@ -902,7 +901,7 @@ IntAnno	src/Dodge/Annotation/Data.hs	17;"	C
 IntID	src/Dodge/Data/Universe.hs	110;"	t
 IntImp	src/Dodge/Data/CreatureEffect.hs	20;"	t
 IntMapHelp	src/IntMapHelp.hs	8;"	m
-Intention	src/Dodge/Data/Creature.hs	87;"	t
+Intention	src/Dodge/Data/Creature.hs	78;"	t
 Intention	src/Dodge/Creature/Intention.hs	1;"	m
 Intersect	src/Geometry/Intersect.hs	5;"	m
 IntersectingRoomClipBoundaries	src/Dodge/Data/Config.hs	105;"	C
@@ -1108,7 +1107,7 @@ MagnetUpdate	src/Dodge/Data/Magnet.hs	13;"	t
 MagnetUpdateTimer	src/Dodge/Data/Magnet.hs	13;"	C
 Main	appDodge/Main.hs	1;"	m
 Make	src/Dodge/Corpse/Make.hs	1;"	m
-MakeDefaultCorpse	src/Dodge/Data/Creature.hs	83;"	C
+MakeDefaultCorpse	src/Dodge/Data/Creature.hs	74;"	C
 MakeSound	src/Dodge/Data/ActionPlan.hs	43;"	C
 MakeStartCloudAt	src/Dodge/Data/WorldEffect.hs	30;"	C
 MakeTempLight	src/Dodge/Data/WorldEffect.hs	34;"	C
@@ -2369,10 +2368,6 @@ _csDropsOnDeath	src/Dodge/Data/Creature/State.hs	19;"	f
 _csLinks	src/Dodge/Data/RoomCluster.hs	11;"	f
 _csName	src/Dodge/Data/RoomCluster.hs	10;"	f
 _csSpState	src/Dodge/Data/Creature/State.hs	18;"	f
-_ctActive	src/Dodge/Data/Creature.hs	80;"	f
-_ctID	src/Dodge/Data/Creature.hs	79;"	f
-_ctPos	src/Dodge/Data/Creature.hs	77;"	f
-_ctType	src/Dodge/Data/Creature.hs	78;"	f
 _currentArc	src/Dodge/Data/Item/Params.hs	22;"	f
 _currentFoot	src/Dodge/Data/Creature/Stance.hs	23;"	f
 _cursSides	src/Dodge/Data/SelectionList.hs	20;"	f
@@ -2747,7 +2742,7 @@ _musicData	src/Data/Preload.hs	13;"	f
 _muzVel	src/Dodge/Data/Item/Use.hs	92;"	f
 _mvAimSpeed	src/Dodge/Data/Creature/Misc.hs	44;"	f
 _mvSpeed	src/Dodge/Data/Creature/Misc.hs	39;"	f
-_mvToPoint	src/Dodge/Data/Creature.hs	89;"	f
+_mvToPoint	src/Dodge/Data/Creature.hs	80;"	f
 _mvTurnJit	src/Dodge/Data/Creature/Misc.hs	43;"	f
 _mvTurnRad	src/Dodge/Data/Creature/Misc.hs	42;"	f
 _mzAmmoPerShot	src/Dodge/Data/Item/Use.hs	166;"	f
@@ -3074,7 +3069,7 @@ _taArcSteps	src/Dodge/Data/TeslaArc.hs	18;"	f
 _taColor	src/Dodge/Data/TeslaArc.hs	19;"	f
 _taPoints	src/Dodge/Data/TeslaArc.hs	16;"	f
 _taTimer	src/Dodge/Data/TeslaArc.hs	17;"	f
-_targetCr	src/Dodge/Data/Creature.hs	88;"	f
+_targetCr	src/Dodge/Data/Creature.hs	79;"	f
 _targetID	src/Dodge/Data/ActionPlan.hs	85;"	f
 _targetSeenAt	src/Dodge/Data/ActionPlan.hs	86;"	f
 _tbPos	src/Dodge/Data/TractorBeam.hs	14;"	f
@@ -3199,7 +3194,7 @@ _vcWarnings	src/Dodge/Data/Creature/Misc.hs	31;"	f
 _vertices	src/Polyhedra/Data.hs	22;"	f
 _viDist	src/Dodge/Data/Creature/Perception.hs	43;"	f
 _viFOV	src/Dodge/Data/Creature/Perception.hs	42;"	f
-_viewPoint	src/Dodge/Data/Creature.hs	90;"	f
+_viewPoint	src/Dodge/Data/Creature.hs	81;"	f
 _volume_master	src/Dodge/Data/Config.hs	39;"	f
 _volume_music	src/Dodge/Data/Config.hs	41;"	f
 _volume_sound	src/Dodge/Data/Config.hs	40;"	f
@@ -3413,25 +3408,25 @@ backpackCombinations	src/Dodge/Combine/Combinations.hs	26;"	f
 backpackShape	src/Dodge/Item/Draw/SPic.hs	141;"	f
 backspaceInputted	src/Dodge/Update/Input/Text.hs	25;"	f
 bangCone	src/Dodge/Item/Held/Cone.hs	11;"	f
-bangConeShape	src/Dodge/Item/Draw/SPic.hs	280;"	f
+bangConeShape	src/Dodge/Item/Draw/SPic.hs	253;"	f
 bangEchoS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	382;"	f
 bangRod	src/Dodge/Item/Held/Rod.hs	18;"	f
 bangS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	496;"	f
 bangStick	src/Dodge/Item/Held/Stick.hs	17;"	f
 barPP	src/Dodge/Room/Foreground.hs	236;"	f
 barrel	src/Dodge/Creature/Inanimate.hs	17;"	f
-baseAMRShape	src/Dodge/Item/Draw/SPic.hs	390;"	f
+baseAMRShape	src/Dodge/Item/Draw/SPic.hs	363;"	f
 baseBlockPane	src/Dodge/Placement/Instance/Wall.hs	86;"	f
-baseCaneShape	src/Dodge/Item/Draw/SPic.hs	300;"	f
+baseCaneShape	src/Dodge/Item/Draw/SPic.hs	273;"	f
 baseDebris	src/Dodge/Block/Debris.hs	122;"	f
 baseFloorTileSize	src/Tile.hs	45;"	f
 basePCI	src/Dodge/Item/Grammar.hs	110;"	f
-baseRifleShape	src/Dodge/Item/Draw/SPic.hs	303;"	f
-baseRodShape	src/Dodge/Item/Draw/SPic.hs	387;"	f
-baseSMGShape	src/Dodge/Item/Draw/SPic.hs	370;"	f
+baseRifleShape	src/Dodge/Item/Draw/SPic.hs	276;"	f
+baseRodShape	src/Dodge/Item/Draw/SPic.hs	360;"	f
+baseSMGShape	src/Dodge/Item/Draw/SPic.hs	343;"	f
 baseShoulder	src/Dodge/Creature/Picture.hs	131;"	f
-baseStickShape	src/Dodge/Item/Draw/SPic.hs	277;"	f
-baseStickShapeX	src/Dodge/Item/Draw/SPic.hs	272;"	f
+baseStickShape	src/Dodge/Item/Draw/SPic.hs	250;"	f
+baseStickShapeX	src/Dodge/Item/Draw/SPic.hs	245;"	f
 baseStickSpread	src/Dodge/Item/Held/Stick.hs	28;"	f
 basicAttentionUpdate	src/Dodge/Creature/Perception.hs	127;"	f
 basicAwarenessUpdate	src/Dodge/Creature/Perception.hs	37;"	f
@@ -3816,13 +3811,13 @@ dededumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	462;"	f
 dedumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	328;"	f
 defDamageMaterial	src/Dodge/Material/Damage.hs	17;"	f
 defLSPic	src/Dodge/LightSource/Draw.hs	10;"	f
-defSPic	src/Dodge/Item/Draw/SPic.hs	286;"	f
-defaultAimMvType	src/Dodge/Default/Creature.hs	121;"	f
+defSPic	src/Dodge/Item/Draw/SPic.hs	259;"	f
+defaultAimMvType	src/Dodge/Default/Creature.hs	116;"	f
 defaultAimParams	src/Dodge/Default/Item/Use/AimParams.hs	9;"	f
-defaultAimingCrit	src/Dodge/Default/Creature.hs	130;"	f
+defaultAimingCrit	src/Dodge/Default/Creature.hs	125;"	f
 defaultApplyDamage	src/Dodge/Creature/Damage.hs	20;"	f
 defaultArcStep	src/Dodge/Tesla/Arc/Default.hs	15;"	f
-defaultAudition	src/Dodge/Default/Creature.hs	98;"	f
+defaultAudition	src/Dodge/Default/Creature.hs	93;"	f
 defaultAutoWall	src/Dodge/Default/Door.hs	15;"	f
 defaultBangCane	src/Dodge/Item/Held/Cane.hs	19;"	f
 defaultBlock	src/Dodge/Default/Block.hs	5;"	f
@@ -3833,15 +3828,14 @@ defaultButton	src/Dodge/Default.hs	50;"	f
 defaultCWCam	src/Dodge/Default/World.hs	67;"	f
 defaultCWGen	src/Dodge/Default/World.hs	57;"	f
 defaultCWorld	src/Dodge/Default/World.hs	82;"	f
-defaultChaseMvType	src/Dodge/Default/Creature.hs	112;"	f
+defaultChaseMvType	src/Dodge/Default/Creature.hs	107;"	f
 defaultClusterStatus	src/Dodge/Default/Room.hs	38;"	f
 defaultConfig	src/Dodge/Data/Config.hs	125;"	f
 defaultCorpse	src/Dodge/Corpse/Make.hs	29;"	f
 defaultCraftItem	src/Dodge/Default/Item.hs	35;"	f
 defaultCreature	src/Dodge/Default/Creature.hs	12;"	f
-defaultCreatureMemory	src/Dodge/Default/Creature.hs	71;"	f
-defaultCreatureSkin	src/Dodge/Default/Creature.hs	65;"	f
-defaultCreatureTargeting	src/Dodge/Default/Creature.hs	62;"	f
+defaultCreatureMemory	src/Dodge/Default/Creature.hs	66;"	f
+defaultCreatureSkin	src/Dodge/Default/Creature.hs	60;"	f
 defaultCrystalWall	src/Dodge/Default/Wall.hs	40;"	f
 defaultDirtBlock	src/Dodge/Default/Block.hs	19;"	f
 defaultDirtWall	src/Dodge/Default/Wall.hs	61;"	f
@@ -3858,10 +3852,10 @@ defaultHUD	src/Dodge/Default/World.hs	155;"	f
 defaultHeldItem	src/Dodge/Default/Item.hs	16;"	f
 defaultHeldUse	src/Dodge/Default/Item/Use.hs	26;"	f
 defaultImpulsive	src/Dodge/Humanoid.hs	190;"	f
-defaultInanimate	src/Dodge/Default/Creature.hs	68;"	f
+defaultInanimate	src/Dodge/Default/Creature.hs	63;"	f
 defaultInput	src/Dodge/Default/World.hs	14;"	f
-defaultIntention	src/Dodge/Default/Creature.hs	104;"	f
-defaultInvSize	src/Dodge/Default/Creature.hs	78;"	f
+defaultIntention	src/Dodge/Default/Creature.hs	99;"	f
+defaultInvSize	src/Dodge/Default/Creature.hs	73;"	f
 defaultItEffect	src/Dodge/Default/Item.hs	48;"	f
 defaultItZoom	src/Dodge/Default/Item/Use/AimParams.hs	32;"	f
 defaultLS	src/Dodge/Default/LightSource.hs	8;"	f
@@ -3871,16 +3865,16 @@ defaultListDisplayParams	src/Dodge/ListDisplayParams.hs	18;"	f
 defaultMachine	src/Dodge/Default.hs	32;"	f
 defaultMachineWall	src/Dodge/Default/Wall.hs	48;"	f
 defaultPP	src/Dodge/Default.hs	65;"	f
-defaultPerceptionState	src/Dodge/Default/Creature.hs	81;"	f
+defaultPerceptionState	src/Dodge/Default/Creature.hs	76;"	f
 defaultProp	src/Dodge/Default/Prop.hs	6;"	f
 defaultProximitySensor	src/Dodge/Default.hs	79;"	f
 defaultRoom	src/Dodge/Default/Room.hs	9;"	f
 defaultSensorWall	src/Dodge/Default/Wall.hs	58;"	f
-defaultState	src/Dodge/Default/Creature.hs	139;"	f
+defaultState	src/Dodge/Default/Creature.hs	134;"	f
 defaultSwitchWall	src/Dodge/Default/Door.hs	22;"	f
 defaultTerminal	src/Dodge/Default/Terminal.hs	9;"	f
 defaultTerminalInput	src/Dodge/Default/Terminal.hs	32;"	f
-defaultVision	src/Dodge/Default/Creature.hs	91;"	f
+defaultVision	src/Dodge/Default/Creature.hs	86;"	f
 defaultWall	src/Dodge/Default/Wall.hs	10;"	f
 defaultWindow	src/Dodge/Default/Wall.hs	74;"	f
 defaultWorld	src/Dodge/Default/World.hs	34;"	f
@@ -3905,7 +3899,7 @@ destroyMounts	src/Dodge/Block.hs	101;"	f
 destroyProjectile	src/Dodge/Projectile/Update.hs	63;"	f
 detV	src/Geometry/Vector.hs	93;"	f
 detector	src/Dodge/Item/Held/Utility.hs	41;"	f
-detectorColor	src/Dodge/Item/Draw/SPic.hs	436;"	f
+detectorColor	src/Dodge/Item/Draw/SPic.hs	409;"	f
 detectorEffect	src/Dodge/Item/Weapon/Radar.hs	20;"	f
 detectorInfo	src/Dodge/Item/Info.hs	178;"	f
 determineProjectileTracking	src/Dodge/HeldUse.hs	552;"	f
@@ -4186,7 +4180,7 @@ eqSiteToPositions	src/Dodge/Inventory/RBList.hs	76;"	f
 equipAllocString	src/Dodge/Render/HUD.hs	295;"	f
 equipInfo	src/Dodge/Item/Info.hs	96;"	f
 equipItemSPic	src/Dodge/Item/Draw/SPic.hs	112;"	f
-equipPosition	src/Dodge/Item/Draw.hs	30;"	f
+equipPosition	src/Dodge/Item/Draw.hs	28;"	f
 equipSiteInfo	src/Dodge/Item/Info.hs	207;"	f
 equipSpeed	src/Dodge/Creature/Impulse/Movement.hs	99;"	f
 equipmentStrValue	src/Dodge/Creature/Statistics.hs	20;"	f
@@ -4250,12 +4244,12 @@ flameSpitter	src/Dodge/Item/Held/SprayGuns.hs	29;"	f
 flameThrower	src/Dodge/Item/Held/SprayGuns.hs	72;"	f
 flameTorrent	src/Dodge/Item/Held/SprayGuns.hs	40;"	f
 flameWall	src/Dodge/Item/Held/SprayGuns.hs	56;"	f
-flamerPic	src/Dodge/Item/Draw/SPic.hs	373;"	f
+flamerPic	src/Dodge/Item/Draw/SPic.hs	346;"	f
 flareCircleAt	src/Dodge/HeldUse.hs	238;"	f
 flatItemCombinations	src/Dodge/Combine/Combinations.hs	50;"	f
 flatLookupItems	src/Dodge/Combine.hs	38;"	f
 flatShield	src/Dodge/Item/Held/Utility.hs	20;"	f
-flatShieldEquipSPic	src/Dodge/Item/Draw/SPic.hs	423;"	f
+flatShieldEquipSPic	src/Dodge/Item/Draw/SPic.hs	396;"	f
 fleeFrom	src/Dodge/CreatureEffect.hs	120;"	f
 fleeFromTarget	src/Dodge/CreatureEffect.hs	66;"	f
 flickerMod	src/Dodge/Placement/Instance/LightSource/Flicker.hs	10;"	f
@@ -4426,7 +4420,7 @@ hasLOSIndirect	src/Dodge/Base/Collide.hs	215;"	f
 hat	src/Dodge/Item/Equipment.hs	133;"	f
 head	src/DoubleStack.hs	14;"	f
 headLamp	src/Dodge/Item/Equipment.hs	139;"	f
-headLampShape	src/Dodge/Item/Draw/SPic.hs	426;"	f
+headLampShape	src/Dodge/Item/Draw/SPic.hs	399;"	f
 headMap	src/Dodge/DoubleTree.hs	170;"	f
 heal	src/Dodge/Item/Consumable.hs	17;"	f
 heal25	src/Dodge/Item/Consumable.hs	14;"	f
@@ -4441,7 +4435,7 @@ heldInfo	src/Dodge/Item/Info.hs	47;"	f
 heldItemOffset	src/Dodge/Item/HeldOffset.hs	78;"	f
 heldItemOrient2D	src/Dodge/Item/HeldOffset.hs	26;"	f
 heldItemRelativeOrient	src/Dodge/Item/HeldOffset.hs	31;"	f
-heldItemSPic	src/Dodge/Item/Draw/SPic.hs	215;"	f
+heldItemSPic	src/Dodge/Item/Draw/SPic.hs	188;"	f
 heldPositionInfo	src/Dodge/Item/Info.hs	194;"	f
 helpCommand	src/Dodge/Terminal.hs	66;"	f
 helpPoly3D	src/Polyhedra.hs	125;"	f
@@ -4589,7 +4583,7 @@ itemCombinationsEdges	src/Dodge/Combine/Graph.hs	60;"	f
 itemDetectorEffect	src/Dodge/HeldUse.hs	295;"	f
 itemDisplay	src/Dodge/Item/Display.hs	16;"	f
 itemDisplayPad	src/Dodge/Item/Display.hs	29;"	f
-itemEquipPict	src/Dodge/Item/Draw.hs	17;"	f
+itemEquipPict	src/Dodge/Item/Draw.hs	16;"	f
 itemFromAmmoMag	src/Dodge/Item.hs	28;"	f
 itemFromAttachType	src/Dodge/Item.hs	37;"	f
 itemFromBase	src/Dodge/Item.hs	17;"	f
@@ -4628,7 +4622,7 @@ keyCard	src/Dodge/Item/Held/Utility.hs	30;"	f
 keyCardAnalyserByDoor	src/Dodge/Room/LasTurret.hs	68;"	f
 keyCardRoomRunPast	src/Dodge/Room/LasTurret.hs	56;"	f
 keyCardRunPastRand	src/Dodge/LockAndKey.hs	36;"	f
-keyPic	src/Dodge/Item/Draw/SPic.hs	442;"	f
+keyPic	src/Dodge/Item/Draw/SPic.hs	415;"	f
 keyholeCorridor	src/Dodge/Room/Corridor.hs	39;"	f
 knifeS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	470;"	f
 lConnect	src/Dodge/Render/Connectors.hs	42;"	f
@@ -4640,7 +4634,7 @@ lampCoverWhen	src/Dodge/Placement/Instance/LightSource/Cover.hs	19;"	f
 lampCrSPic	src/Dodge/Render/ShapePicture.hs	58;"	f
 lasCenSensEdge	src/Dodge/Room/LasTurret.hs	111;"	f
 lasDronesPic	src/Dodge/Item/Weapon/Drone.hs	22;"	f
-lasGunPic	src/Dodge/Item/Draw/SPic.hs	396;"	f
+lasGunPic	src/Dodge/Item/Draw/SPic.hs	369;"	f
 lasRayAt	src/Dodge/HeldUse.hs	366;"	f
 lasSensorTurretTest	src/Dodge/Room/LasTurret.hs	104;"	f
 lasTunnel	src/Dodge/Room/LasTurret.hs	123;"	f
@@ -4651,7 +4645,7 @@ laserLinkTest	src/Dodge/Item/Grammar.hs	119;"	f
 lastMap	src/Dodge/DoubleTree.hs	174;"	f
 launcher	src/Dodge/Item/Held/Launcher.hs	12;"	f
 launcherCrit	src/Dodge/Creature/LauncherCrit.hs	12;"	f
-launcherPic	src/Dodge/Item/Draw/SPic.hs	376;"	f
+launcherPic	src/Dodge/Item/Draw/SPic.hs	349;"	f
 launcherX	src/Dodge/Item/Held/Launcher.hs	29;"	f
 layoutLevelFromSeed	src/Dodge/LevelGen.hs	47;"	f
 ldpVerticalSelection	src/Dodge/Update/Input/ScreenLayer.hs	72;"	f
@@ -4668,7 +4662,7 @@ left	src/DoubleStack.hs	16;"	f
 leftIsParentCombine	src/Dodge/Item/Grammar.hs	146;"	f
 leftPad	src/Padding.hs	14;"	f
 leftRightCombine	src/Dodge/Item/Grammar.hs	160;"	f
-legsSPic	src/Dodge/Item/Draw/SPic.hs	460;"	f
+legsSPic	src/Dodge/Item/Draw/SPic.hs	433;"	f
 liShape	src/Dodge/Placement/Instance/LightSource.hs	98;"	f
 light	src/Color.hs	104;"	f
 lightSensByDoor	src/Dodge/Room/LasTurret.hs	43;"	f
@@ -4883,8 +4877,8 @@ minOn	src/FoldableHelp.hs	35;"	f
 mini1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	334;"	f
 miniGunCrit	src/Dodge/Creature.hs	62;"	f
 miniGunX	src/Dodge/Item/Held/Cane.hs	88;"	f
-miniGunXPict	src/Dodge/Item/Draw/SPic.hs	351;"	f
-miniGunXPictItem	src/Dodge/Item/Draw/SPic.hs	346;"	f
+miniGunXPict	src/Dodge/Item/Draw/SPic.hs	324;"	f
+miniGunXPictItem	src/Dodge/Item/Draw/SPic.hs	319;"	f
 miniS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	528;"	f
 miniTree2	src/Dodge/Room/Room.hs	106;"	f
 minimumOn	src/FoldlHelp.hs	12;"	f
@@ -5589,7 +5583,7 @@ shapeVerxAttributes	src/Shape/Parameters.hs	13;"	f
 shapeVerxSize	src/Shape/Parameters.hs	10;"	f
 shardShape	src/Dodge/Block/Debris.hs	181;"	f
 shatterGun	src/Dodge/Item/Held/Weapons.hs	8;"	f
-shatterGunSPic	src/Dodge/Item/Draw/SPic.hs	289;"	f
+shatterGunSPic	src/Dodge/Item/Draw/SPic.hs	262;"	f
 shatterWall	src/Dodge/Item/Weapon/Shatter.hs	26;"	f
 shellCollisionCheck	src/Dodge/Projectile/Update.hs	52;"	f
 shellCollisionEffect	src/Dodge/Projectile/Update.hs	48;"	f
@@ -5834,7 +5828,7 @@ terminalScreenGlow	src/Dodge/Machine/Update.hs	34;"	f
 terminalShape	src/Dodge/Machine/Draw.hs	32;"	f
 terminalWheelEvent	src/Dodge/Update/Scroll.hs	78;"	f
 teslaGun	src/Dodge/Item/Held/BatteryGuns.hs	21;"	f
-teslaGunPic	src/Dodge/Item/Draw/SPic.hs	393;"	f
+teslaGunPic	src/Dodge/Item/Draw/SPic.hs	366;"	f
 teslaParams	src/Dodge/Tesla/ItemParams.hs	6;"	f
 testCrossWalls	src/Dodge/Room/Path.hs	47;"	f
 testEvent	src/Dodge/Event/Test.hs	10;"	f
@@ -5905,14 +5899,14 @@ topPrismEdgeIndices	src/Shader/Poke.hs	327;"	f
 topPrismIndices	src/Shader/Poke.hs	402;"	f
 topTestPart	src/Dodge/TestString.hs	69;"	f
 torch	src/Dodge/Item/Held/Utility.hs	33;"	f
-torchShape	src/Dodge/Item/Draw/SPic.hs	258;"	f
+torchShape	src/Dodge/Item/Draw/SPic.hs	231;"	f
 torqueCr	src/Dodge/WorldEffect.hs	63;"	f
 torso	src/Dodge/Creature/Picture.hs	105;"	f
 tractCr	src/Dodge/TractorBeam/Update.hs	28;"	f
 tractFlIt	src/Dodge/TractorBeam/Update.hs	23;"	f
 tractorBeamAt	src/Dodge/HeldUse.hs	335;"	f
 tractorGun	src/Dodge/Item/Held/BatteryGuns.hs	60;"	f
-tractorGunPic	src/Dodge/Item/Draw/SPic.hs	420;"	f
+tractorGunPic	src/Dodge/Item/Draw/SPic.hs	393;"	f
 tractorPullPos	src/Dodge/TractorBeam/Update.hs	33;"	f
 tractorSPic	src/Dodge/TractorBeam/Draw.hs	10;"	f
 tranRot	src/Picture/Base.hs	124;"	f
@@ -6199,7 +6193,7 @@ visibleWalls	src/Dodge/Base/Collide.hs	123;"	f
 visionCheck	src/Dodge/Creature/Perception.hs	152;"	f
 vocalizationTest	src/Dodge/Creature/Vocalization.hs	8;"	f
 volleyGun	src/Dodge/Item/Held/Cane.hs	30;"	f
-volleyGunShape	src/Dodge/Item/Draw/SPic.hs	334;"	f
+volleyGunShape	src/Dodge/Item/Draw/SPic.hs	307;"	f
 waistSP	src/Dodge/Creature/HandPos.hs	173;"	f
 walkNozzle	src/Dodge/HeldUse.hs	303;"	f
 walkableNodeNear	src/Dodge/Path.hs	48;"	f
@@ -6278,8 +6272,8 @@ you	src/Dodge/Base/You.hs	18;"	f
 youDropItem	src/Dodge/Creature/Action.hs	190;"	f
 yourAugmentedItem	src/Dodge/Render/HUD.hs	223;"	f
 yourControl	src/Dodge/Creature/YourControl.hs	25;"	f
-yourDefaultSpeed	src/Dodge/Default/Creature.hs	133;"	f
-yourDefaultStrideLength	src/Dodge/Default/Creature.hs	136;"	f
+yourDefaultSpeed	src/Dodge/Default/Creature.hs	128;"	f
+yourDefaultStrideLength	src/Dodge/Default/Creature.hs	131;"	f
 yourInfo	src/Dodge/Creature/Info.hs	8;"	f
 yourInv	src/Dodge/Base/You.hs	45;"	f
 yourRootItem	src/Dodge/Base/You.hs	26;"	f