Engine Culling (#104)

* Move groups.yml to content.

* Add unpowered light prototype from engine.

* Move prototypes and textures over.

* Update submodule

Resources/Groups/groups.yml

@@ -0,0 +1,34 @@
+- Index: 1
+  Name: Player
+  Commands:
+  - login
+  - joingame
+  - help
+  - list
+  - say
+  - whisper
+  - me
+  - ooc
+
+- Index: 50
+  Name: Moderator
+  Commands:
+  - login
+  - joingame
+  - help
+  - list
+  - say
+  - whisper
+  - me
+  - ooc
+
+- Index: 100
+  Name: Administrator
+  Commands:
+  - joingame
+  - help
+  - list
+  - say
+  - whisper
+  - me
+  - ooc

Resources/Maps/stationstation.yml

@@ -228,7 +228,7 @@ entities:
     pos: 4.5,-0.5
     rot: -1.570796
     type: Transform
-- type: __engine_worktop
+- type: table
   components:
   - grid: 0
     pos: -2.5,4.5
@@ -270,13 +270,13 @@ entities:
     pos: 3,4
     rot: -1.570796
     type: Transform
-- type: __engine_worktop
+- type: table
   components:
   - grid: 0
     pos: -0.5,4.5
     rot: -1.570796
     type: Transform
-- type: __engine_worktop
+- type: table
   components:
   - grid: 0
     pos: 1.5,4.5
@@ -360,7 +360,7 @@ entities:
     pos: 1.546875,4.484375
     rot: -1.570796
     type: Transform
-- type: __engine_worktop
+- type: table
   components:
   - grid: 0
     pos: 1.5,7.5
@@ -516,13 +516,13 @@ entities:
     pos: 6,-7
     rot: -1.570796
     type: Transform
-- type: __engine_worktop
+- type: table
   components:
   - grid: 0
     pos: -2.5,7.5
     rot: -1.570796
     type: Transform
-- type: __engine_worktop
+- type: table
   components:
   - grid: 0
     pos: -0.5,7.5

Resources/Prototypes/1_Temperature.yml

@@ -4,10 +4,10 @@
   components:
   - type: Clickable
   - type: Sprite
-    texture: Items/shoes.png
+    texture: Objects/shoes.png
 
   - type: Icon
-    texture: Items/shoes.png
+    texture: Objects/shoes.png
 
   - type: Damageable
     resistanceset: Standard

Resources/Prototypes/Construction/structures.yml

@@ -5,7 +5,7 @@
   description: Keeps the air in and the greytide out.
   icon: Tiles/wall_texture.png
   objecttype: Structure
-  result: __engine_wall
+  result: wall
   placementmode: SnapgridBorder
   steps:
   - material: Metal
@@ -24,7 +24,7 @@
   id: table
   category: Structures
   icon: Objects/worktop_single.png
-  result: __engine_worktop
+  result: table
   placementmode: SnapgridCenter
   steps:
   - material: Metal

Resources/Prototypes/Entities/Clothing.yml

@@ -13,10 +13,10 @@
   description: Don't take them off at your office Christmas party
   components:
   - type: Sprite
-    texture: Items/shoes.png
+    texture: Objects/shoes.png
 
   - type: Icon
-    texture: Items/shoes.png
+    texture: Objects/shoes.png
 
   - type: Clothing
     Slots:
@@ -29,10 +29,10 @@
   description: The jumpsuit for the poor sop with a mop
   components:
   - type: Sprite
-    texture: Items/janitorsuit.png
+    texture: Objects/janitorsuit.png
 
   - type: Icon
-    texture: Items/janitorsuit.png
+    texture: Objects/janitorsuit.png
 
   - type: Clothing
     Slots:

Resources/Prototypes/Entities/Items.yml

@@ -18,9 +18,9 @@
   description: A shiny red and robust container
   components:
   - type: Sprite
-    texture: Items/toolbox_r.png
+    texture: Objects/toolbox_r.png
   - type: Icon
-    texture: Items/toolbox_r.png
+    texture: Objects/toolbox_r.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -33,9 +33,9 @@
   description: A blue box, not the kind you're thinking of
   components:
   - type: Sprite
-    texture: Items/Toolbox_b.png
+    texture: Objects/Toolbox_b.png
   - type: Icon
-    texture: Items/Toolbox_b.png
+    texture: Objects/Toolbox_b.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -48,9 +48,9 @@
   description: A toolbox typically stocked with electrical gear
   components:
   - type: Sprite
-    texture: Items/Toolbox_y.png
+    texture: Objects/Toolbox_y.png
   - type: Icon
-    texture: Items/Toolbox_y.png
+    texture: Objects/Toolbox_y.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -63,9 +63,9 @@
   description: A mop that cant be stopped, viscera cleanup detail awaits
   components:
   - type: Sprite
-    texture: Items/mop.png
+    texture: Objects/mop.png
   - type: Icon
-    texture: Items/mop.png
+    texture: Objects/mop.png
   - type: Item
     Size: 10
 
@@ -77,7 +77,7 @@
   description: They light the way to freedom
   components:
   - type: Sprite
-    texture: Items/Flashlight.png
+    texture: Objects/Flashlight.png
   - type: Icon
-    texture: Items/Flashlight.png
+    texture: Objects/Flashlight.png
   - type: PointLight

Resources/Prototypes/Entities/Lights.yml

@@ -0,0 +1,46 @@
+- type: entity
+  id: wall_light
+  name: "Unpowered Light"
+  components:
+  - type: Clickable
+  # So we can click on it for deletion.
+  - type: BoundingBox
+  - type: Sprite
+    sprite: Objects/lighting.rsi
+    state: on
+
+  - type: Icon
+    sprite: Objects/lighting.rsi
+    state: on
+
+  - type: PointLight
+    radius: 8
+    energy: 1.2
+    offset: "0, -16"
+    color: "#DCDCC6"
+
+  placement:
+    snap:
+    - Wallmount
+
+- type: entity
+  name: Light
+  id: poweredlight
+  parent: wall_light
+  components:
+  - type: Sprite
+    sprite: Objects/lighting.rsi
+    state: off
+
+  - type: Icon
+    sprite: Objects/lighting.rsi
+    state: off
+
+  - type: PointLight
+    state: Off
+
+  - type: PowerDevice
+    load: 50
+    priority: Low
+
+  - type: PoweredLight

Resources/Prototypes/Entities/Mobs.yml

@@ -2,7 +2,6 @@
   save: false
   name: Urist McHands
   id: HumanMob_Content
-  parent: __engine_human
   description: A miserable pile of secrets
   components:
   - type: Hands
@@ -11,6 +10,28 @@
     - right
   - type: Inventory
   - type: Constructor
+  - type: Clickable
+  - type: Sprite
+    sprite: Mob/greyshirt.rsi
+    state: greyshirt
+    scale: 2, 2
+    drawdepth: Mobs
+
+  - type: Icon
+    sprite: Mob/greyshirt.rsi
+    state: greyshirt
+
+  - type: BoundingBox
+    aabb: "0.15,-0.45,1.05,0.45"
+
+  - type: Physics
+    mass: 5
+
+  - type: Collidable
+    DebugColor: "#0000FF"
+
+  - type: Input
+    context: "human"
 
 - type: entity
   id: MobObserver

Resources/Prototypes/Entities/PoweredLighting.yml

@@ -1,27 +0,0 @@
-- type: entity
-  name: Light
-  id: poweredlight
-  components:
-  - type: Clickable
-  # So we can click on it for deletion.
-  - type: BoundingBox
-  - type: Sprite
-    sprite: Objects/lighting.rsi
-    state: off
-
-  - type: Icon
-    sprite: Objects/lighting.rsi
-    state: off
-
-  - type: PointLight
-    state: Off
-    radius: 8
-    energy: 1.2
-    offset: "0, -16"
-    color: "#DCDCC6"
-
-  - type: PowerDevice
-    load: 50
-    priority: Low
-
-  - type: PoweredLight

Resources/Prototypes/Entities/prototype_test.yml

@@ -4,8 +4,8 @@
   components:
   - type: Clickable
   - type: Sprite
-    texture: Items/medkit_r.png
+    texture: Objects/medkit_r.png
 
   - type: Icon
-    texture: Items/medkit_r.png
+    texture: Objects/medkit_r.png
 

Resources/Prototypes/Entities/table.yml

@@ -0,0 +1,16 @@
+- type: entity
+  id: table
+  name: "[engine] worktop"
+  components:
+  - type: Clickable
+  - type: Sprite
+    texture: Objects/worktop_single.png
+
+  - type: Icon
+    texture: Objects/worktop_single.png
+
+  - type: BoundingBox
+    aabb: "-0.45,-1,0.95,1"
+    DebugColor: "#0000FF"
+
+  - type: Collidable

Resources/Prototypes/Entities/walls.yml

@@ -10,7 +10,8 @@
     sprite: Buildings/wall.rsi
 
   - type: Icon
-    texture: Tiles/wall_texture.png
+    sprite: Buildings/wall.rsi
+    state: full
 
   - type: BoundingBox
   - type: Collidable

Resources/Prototypes/Tiles/floors.yml

@@ -0,0 +1,4 @@
+- type: tile
+  name: Floor
+  texture: "floor_steel"
+  id: 1

Resources/Prototypes/Tiles/space.yml

@@ -0,0 +1,4 @@
+- type: tile
+  name: Space
+  texture: ""
+  id: 0

Resources/Textures/Buildings/wall.rsi/meta.json

@@ -1 +1 @@
-{"version":1,"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.","size":{"x":32,"y":32},"states":[{"name":"solid0","select":[],"flags":{},"directions":4},{"name":"solid1","select":[],"flags":{},"directions":4},{"name":"solid2","select":[],"flags":{},"directions":4},{"name":"solid3","select":[],"flags":{},"directions":4},{"name":"solid4","select":[],"flags":{},"directions":4},{"name":"solid5","select":[],"flags":{},"directions":4},{"name":"solid6","select":[],"flags":{},"directions":4},{"name":"solid7","select":[],"flags":{},"directions":4}]}
+{"version":1,"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.","size":{"x":32,"y":32},"states":[{"name":"full","select":[],"flags":{},"directions":1},{"name":"solid0","select":[],"flags":{},"directions":4},{"name":"solid1","select":[],"flags":{},"directions":4},{"name":"solid2","select":[],"flags":{},"directions":4},{"name":"solid3","select":[],"flags":{},"directions":4},{"name":"solid4","select":[],"flags":{},"directions":4},{"name":"solid5","select":[],"flags":{},"directions":4},{"name":"solid6","select":[],"flags":{},"directions":4},{"name":"solid7","select":[],"flags":{},"directions":4}]}

Resources/Textures/Mob/greyshirt.rsi/meta.json

@@ -0,0 +1,15 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "greyshirt",
+            "directions": 4,
+            "select": [],
+            "flags": {}
+        }
+    ]
+}

Resources/Textures/Tiles/copyright.txt

@@ -0,0 +1,3 @@
+Alright because tiles don't use RSIs (yet) I gotta write this out.
+
+floor_steel.png taken from CEV-Eris commit 28e589f0ff72a009adf17db767e90be39054f0f2