diff --git a/Resources/Groups/groups.yml b/Resources/Groups/groups.yml new file mode 100644 index 0000000000..0ec624676b --- /dev/null +++ b/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 diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index 3a0e1273ff..c4dfcd136e 100644 --- a/Resources/Maps/stationstation.yml +++ b/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 diff --git a/Resources/Prototypes/1_Temperature.yml b/Resources/Prototypes/1_Temperature.yml index fb61693eb1..8e60b57706 100644 --- a/Resources/Prototypes/1_Temperature.yml +++ b/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 diff --git a/Resources/Prototypes/Construction/structures.yml b/Resources/Prototypes/Construction/structures.yml index a6a70bb8f1..e16ff1b716 100644 --- a/Resources/Prototypes/Construction/structures.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Clothing.yml b/Resources/Prototypes/Entities/Clothing.yml index ccc745fcac..cef7bf3a2c 100644 --- a/Resources/Prototypes/Entities/Clothing.yml +++ b/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: diff --git a/Resources/Prototypes/Entities/Items.yml b/Resources/Prototypes/Entities/Items.yml index bf8b861033..578cea7125 100644 --- a/Resources/Prototypes/Entities/Items.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Lights.yml b/Resources/Prototypes/Entities/Lights.yml new file mode 100644 index 0000000000..c316d86bce --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Entities/Mobs.yml b/Resources/Prototypes/Entities/Mobs.yml index 2d8efa40d2..8eab5f9abb 100644 --- a/Resources/Prototypes/Entities/Mobs.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/PoweredLighting.yml b/Resources/Prototypes/Entities/PoweredLighting.yml index 5093dca3be..e69de29bb2 100644 --- a/Resources/Prototypes/Entities/PoweredLighting.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/prototype_test.yml b/Resources/Prototypes/Entities/prototype_test.yml index 11481768ed..cd7255b39a 100644 --- a/Resources/Prototypes/Entities/prototype_test.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/table.yml b/Resources/Prototypes/Entities/table.yml new file mode 100644 index 0000000000..2885b7119f --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Entities/walls.yml b/Resources/Prototypes/Entities/walls.yml index a03248a390..2af7923347 100644 --- a/Resources/Prototypes/Entities/walls.yml +++ b/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 diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml new file mode 100644 index 0000000000..3c3ef553f6 --- /dev/null +++ b/Resources/Prototypes/Tiles/floors.yml @@ -0,0 +1,4 @@ +- type: tile + name: Floor + texture: "floor_steel" + id: 1 diff --git a/Resources/Prototypes/Tiles/space.yml b/Resources/Prototypes/Tiles/space.yml new file mode 100644 index 0000000000..533f4bcb4a --- /dev/null +++ b/Resources/Prototypes/Tiles/space.yml @@ -0,0 +1,4 @@ +- type: tile + name: Space + texture: "" + id: 0 diff --git a/Resources/Textures/Buildings/wall.rsi/full.png b/Resources/Textures/Buildings/wall.rsi/full.png new file mode 100644 index 0000000000..21a102bb3a Binary files /dev/null and b/Resources/Textures/Buildings/wall.rsi/full.png differ diff --git a/Resources/Textures/Buildings/wall.rsi/meta.json b/Resources/Textures/Buildings/wall.rsi/meta.json index c6a0575630..e9a4e8c52a 100644 --- a/Resources/Textures/Buildings/wall.rsi/meta.json +++ b/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}]} \ No newline at end of file +{"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}]} diff --git a/Resources/Textures/Mob/greyshirt.rsi/greyshirt.png b/Resources/Textures/Mob/greyshirt.rsi/greyshirt.png new file mode 100644 index 0000000000..fcac399bc2 Binary files /dev/null and b/Resources/Textures/Mob/greyshirt.rsi/greyshirt.png differ diff --git a/Resources/Textures/Mob/greyshirt.rsi/meta.json b/Resources/Textures/Mob/greyshirt.rsi/meta.json new file mode 100644 index 0000000000..e05ed51049 --- /dev/null +++ b/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": {} + } + ] +} diff --git a/Resources/Textures/Objects/Flashlight.png b/Resources/Textures/Objects/Flashlight.png new file mode 100644 index 0000000000..a7b3b4678d Binary files /dev/null and b/Resources/Textures/Objects/Flashlight.png differ diff --git a/Resources/Textures/Objects/Toolbox_b.png b/Resources/Textures/Objects/Toolbox_b.png new file mode 100644 index 0000000000..dadba6320c Binary files /dev/null and b/Resources/Textures/Objects/Toolbox_b.png differ diff --git a/Resources/Textures/Objects/Toolbox_y.png b/Resources/Textures/Objects/Toolbox_y.png new file mode 100644 index 0000000000..e04977356d Binary files /dev/null and b/Resources/Textures/Objects/Toolbox_y.png differ diff --git a/Resources/Textures/Objects/armour.png b/Resources/Textures/Objects/armour.png new file mode 100644 index 0000000000..1e2d2e941f Binary files /dev/null and b/Resources/Textures/Objects/armour.png differ diff --git a/Resources/Textures/Objects/backpack.png b/Resources/Textures/Objects/backpack.png new file mode 100644 index 0000000000..dc29a262af Binary files /dev/null and b/Resources/Textures/Objects/backpack.png differ diff --git a/Resources/Textures/Objects/door_ew.png b/Resources/Textures/Objects/door_ew.png new file mode 100644 index 0000000000..e05a5bffb9 Binary files /dev/null and b/Resources/Textures/Objects/door_ew.png differ diff --git a/Resources/Textures/Objects/door_ewo.png b/Resources/Textures/Objects/door_ewo.png new file mode 100644 index 0000000000..f4f0c19b57 Binary files /dev/null and b/Resources/Textures/Objects/door_ewo.png differ diff --git a/Resources/Textures/Objects/janitorsuit.png b/Resources/Textures/Objects/janitorsuit.png new file mode 100644 index 0000000000..fbc1e54741 Binary files /dev/null and b/Resources/Textures/Objects/janitorsuit.png differ diff --git a/Resources/Textures/Objects/medkit_r.png b/Resources/Textures/Objects/medkit_r.png new file mode 100644 index 0000000000..8b9b34102a Binary files /dev/null and b/Resources/Textures/Objects/medkit_r.png differ diff --git a/Resources/Textures/Objects/mop.png b/Resources/Textures/Objects/mop.png new file mode 100644 index 0000000000..90ba32607e Binary files /dev/null and b/Resources/Textures/Objects/mop.png differ diff --git a/Resources/Textures/Objects/shoes.png b/Resources/Textures/Objects/shoes.png new file mode 100644 index 0000000000..7e6879e353 Binary files /dev/null and b/Resources/Textures/Objects/shoes.png differ diff --git a/Resources/Textures/Objects/toolbox_r.png b/Resources/Textures/Objects/toolbox_r.png new file mode 100644 index 0000000000..21e8ad6e0b Binary files /dev/null and b/Resources/Textures/Objects/toolbox_r.png differ diff --git a/Resources/Textures/Objects/worktop_single.png b/Resources/Textures/Objects/worktop_single.png new file mode 100644 index 0000000000..5c486bb696 Binary files /dev/null and b/Resources/Textures/Objects/worktop_single.png differ diff --git a/Resources/Textures/Tiles/copyright.txt b/Resources/Textures/Tiles/copyright.txt new file mode 100644 index 0000000000..af5e976d6d --- /dev/null +++ b/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 diff --git a/Resources/Textures/Tiles/floor_steel.png b/Resources/Textures/Tiles/floor_steel.png new file mode 100644 index 0000000000..ebb183e5cb Binary files /dev/null and b/Resources/Textures/Tiles/floor_steel.png differ diff --git a/engine b/engine index 71121f8fef..74705b5a66 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit 71121f8fefe8f3f99b170b4fbf26f75ac30e9aa3 +Subproject commit 74705b5a6681af8290f3ee639f1632dc7001e58d