forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master220' into multiz-nanomap
- Loading branch information
Showing
28 changed files
with
697 additions
and
214 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| /obj/item/stack/tile | ||
| icon = 'modular_ss220/aesthetics/floors/icons/tiles.dmi' | ||
|
|
||
| /// Automatically generates all subtypes for a wooden floor with tiles. | ||
| #define WOODEN_FLOOR_HELPER(path, tile)\ | ||
| ##path/oak {\ | ||
| color = "#644526";\ | ||
| floor_tile = ##tile/oak;\ | ||
| }\ | ||
| ##tile/oak {\ | ||
| name = "oak wood floor tiles";\ | ||
| singular_name = "oak wood floor tile";\ | ||
| color = "#644526";\ | ||
| turf_type = ##path/oak;\ | ||
| merge_type = ##tile/oak;\ | ||
| }\ | ||
| ##path/birch {\ | ||
| color = "#FFECB3";\ | ||
| floor_tile = ##tile/birch;\ | ||
| }\ | ||
| ##tile/birch {\ | ||
| name = "birch wood floor tiles";\ | ||
| singular_name = "birch wood floor tile";\ | ||
| color = "#FFECB3";\ | ||
| turf_type = ##path/birch;\ | ||
| merge_type = ##tile/birch;\ | ||
| }\ | ||
| ##path/cherry {\ | ||
| color = "#643412";\ | ||
| floor_tile = ##tile/cherry;\ | ||
| }\ | ||
| ##tile/cherry {\ | ||
| name = "cherry wood floor tiles";\ | ||
| singular_name = "cherry wood floor tile";\ | ||
| color = "#643412";\ | ||
| turf_type = ##path/cherry;\ | ||
| merge_type = ##tile/cherry;\ | ||
| }\ | ||
|
|
||
| // Wood | ||
| /obj/item/stack/tile/wood | ||
| color = "#864A2D" | ||
|
|
||
| /turf/simulated/floor/wood | ||
| icon = 'modular_ss220/aesthetics/floors/icons/wooden.dmi' | ||
| icon_state = "wood" | ||
| color = "#864A2D" | ||
|
|
||
| /turf/simulated/floor/wood/get_broken_states() | ||
| return list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7") | ||
|
|
||
| WOODEN_FLOOR_HELPER(/turf/simulated/floor/wood, /obj/item/stack/tile/wood) | ||
|
|
||
| // Fancy Wood | ||
| /obj/item/stack/tile/wood/fancy | ||
| name = "fancy light oak wood floor tiles" | ||
| singular_name = "fancy wood floor tile" | ||
| icon_state = "tile-wood-fancy" | ||
| color = "#864A2D" | ||
| turf_type = /turf/simulated/floor/wood/fancy | ||
| merge_type = /obj/item/stack/tile/wood/fancy | ||
|
|
||
| /turf/simulated/floor/wood/fancy | ||
| icon_state = "wood_fancy" | ||
| color = "#864A2D" | ||
| floor_tile = /obj/item/stack/tile/wood/fancy | ||
|
|
||
| /turf/simulated/floor/wood/fancy/get_broken_states() | ||
| return list("wood_fancy-broken", "wood_fancy-broken2", "wood_fancy-broken3") | ||
|
|
||
| WOODEN_FLOOR_HELPER(/turf/simulated/floor/wood/fancy, /obj/item/stack/tile/wood/fancy) | ||
|
|
||
| // Parquet | ||
| /obj/item/stack/tile/wood/parquet | ||
| name = "parquet wood floor tiles" | ||
| singular_name = "wood parquet floor tile" | ||
| icon_state = "tile-wood-parquet" | ||
| color = "#864A2D" | ||
| turf_type = /turf/simulated/floor/wood/parquet | ||
| merge_type = /obj/item/stack/tile/wood/parquet | ||
|
|
||
| /turf/simulated/floor/wood/parquet | ||
| icon_state = "wood_parquet" | ||
| color = "#864A2D" | ||
| floor_tile = /obj/item/stack/tile/wood/parquet | ||
|
|
||
| /turf/simulated/floor/wood/parquet/get_broken_states() | ||
| return list("wood_parquet-broken", "wood_parquet-broken2", "wood_parquet-broken3", "wood_parquet-broken4", "wood_parquet-broken5", "wood_parquet-broken6", "wood_parquet-broken7") | ||
|
|
||
| WOODEN_FLOOR_HELPER(/turf/simulated/floor/wood/parquet, /obj/item/stack/tile/wood/parquet) | ||
|
|
||
| // Tiled Parquet | ||
| /obj/item/stack/tile/wood/parquet/tile | ||
| name = "tiled parquet wood floor tiles" | ||
| singular_name = "wood tiled parquet floor tile" | ||
| icon_state = "tile-wood-tile" | ||
| color = "#864A2D" | ||
| turf_type = /turf/simulated/floor/wood/parquet/tile | ||
| merge_type = /obj/item/stack/tile/wood/parquet/tile | ||
|
|
||
| /turf/simulated/floor/wood/parquet/tile | ||
| icon_state = "wood_tile" | ||
| color = "#864A2D" | ||
| floor_tile = /obj/item/stack/tile/wood/parquet/tile | ||
|
|
||
| /turf/simulated/floor/wood/parquet/tile/get_broken_states() | ||
| return list("wood_tile-broken", "wood_tile-broken2", "wood_tile-broken3") | ||
|
|
||
| WOODEN_FLOOR_HELPER(/turf/simulated/floor/wood/parquet/tile, /obj/item/stack/tile/wood/parquet/tile) | ||
|
|
||
| #undef WOODEN_FLOOR_HELPER |
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| /datum/modpack/robolimbs | ||
| name = "Новые протезы" | ||
| desc = "Новые протезы и головы." | ||
| author = "sirstaniya" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| #include "_robolimbs.dm" | ||
|
|
||
| #include "code/robolimbs.dm" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| /datum/robolimb/etaminindustry | ||
| company = "Etamin Industry Gold On Black" | ||
| desc = "Модель протезированной конечности от Этамин Индастрис." | ||
| icon = 'modular_ss220/robolimbs/icons/etaminindustry_main.dmi' | ||
| has_subtypes = 1 | ||
|
|
||
| /datum/robolimb/etaminindustry/etaminindustry_alt1 | ||
| company = "Etamin Industry Elite Series" | ||
| icon = 'modular_ss220/robolimbs/icons/etaminindustry_alt1.dmi' | ||
| parts = list("head") | ||
| selectable = 0 | ||
| has_subtypes = null | ||
|
|
||
| /datum/robolimb/etaminindustry/etaminindustry_alt2 | ||
| company = "Etamin Industry SharpShooter Series" | ||
| icon = 'modular_ss220/robolimbs/icons/etaminindustry_alt2.dmi' | ||
| parts = list("head") | ||
| selectable = 0 | ||
| has_subtypes = null |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # Изменения в изначальном коде | ||
|
|
||
| `code/game/objects/items/stacks/stack.dm` - `del`:`proc "Destroy"` | ||
| `tgui/packages/tgui/components/Collapsible.js` - `add`:`prop "contentStyle"` | ||
| `tgui/packages/tgui/styles/components/ImageButton.scss` - `add`:`style "user-select"` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| /datum/modpack/stack_craft_tgui | ||
| name = "Stack Craft TGUI" | ||
| desc = "Красивый, удобный интерфейс для меню крафта материалов." | ||
| author = "Aylong, Gaxeer" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #include "_stack_craft_tgui.dm" | ||
|
|
||
| #include "code/stack.dm" | ||
| #include "code/stack_ui.dm" | ||
| #include "code/stack_recipe.dm" |
Oops, something went wrong.