Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Do not merge] Lavaland event #1208

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,909 changes: 2,427 additions & 482 deletions _maps/map_files220/generic/Lavaland.dmm

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions modular_ss220/food/code/food/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1066,3 +1066,21 @@
/obj/item/food/snacks/grown/berries,
)
result = /obj/item/food/snacks/plov

/obj/item/food/snacks/mre
icon = 'modular_ss220/food/icons/food.dmi'

/obj/item/food/snacks/mre/steak
name = "упаковка стейка"
desc = "наивкуснейший стейк прямиком из НТ!"
trash = /obj/item/trash/mre
bitesize = 1
icon_state = "mre_steak"
filling_color = "#246557"
list_reagents = list("nutriment" = 2, "vitamin" = 3)
tastes = list("говядина" = 1, "пюре" =1)

/obj/item/trash/mre
name = "упаковка из под сухпайка"
icon = 'modular_ss220/food/icons/trash.dmi'
icon_state = "mre_trash"
Binary file modified modular_ss220/food/icons/food.dmi
Binary file not shown.
Binary file modified modular_ss220/food/icons/trash.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions modular_ss220/maps220/_maps220.dme
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@
#include "code/admin.dm"
#include "code/layers.dm"
#include "code/flora.dm"
#include "code/Station/mining_areas.dm"
38 changes: 38 additions & 0 deletions modular_ss220/maps220/code/Station/mining_areas.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/area/mine/outpost/entrance
name = "Оверлорд - вход"

/area/mine/outpost/charging_station
name = "Оверлорд - станция зарядки"

/area/mine/outpost/hallway
name = "Оверлорд - коридор"

/area/mine/outpost/medical
name = "Оверлорд - медбей"

/area/mine/outpost/surgery
name = "Оверлорд - хирургия"

/area/mine/outpost/break_room
name = "Оверлорд - комната отдыха"

/area/mine/outpost/closet
name = "Оверлорд - подсобка"

/area/mine/outpost/smes
name = "Оверлорд - генераторная"

/area/mine/outpost/armory
name = "Оверлорд - оружейная"

/area/mine/outpost/barracks
name = "Оверлорд - баррак"

/area/mine/outpost/science
name = "Оверлорд - НИО"

/area/mine/outpost/command
name = "Оверлорд - командование"

/area/mine/outpost/vehicle
name = "Оверлорд - гараж"
1 change: 1 addition & 0 deletions modular_ss220/objects/_objects.dme
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@
#include "code/flashlight.dm"
#include "code/electrostaff.dm"
#include "code/material_pouch.dm"
#include "code/mre.dm"

12 changes: 12 additions & 0 deletions modular_ss220/objects/code/mre.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/obj/item/storage/box/mre
name = "сухпаёк"
desc = "Коробка с сухпайком внутри, объеденье!"
icon = 'modular_ss220/objects/icons/mre.dmi'
icon_state = "mre_box"

/obj/item/storage/box/mre/populate_contents()
. = ..()
new /obj/item/food/snacks/mre/steak(src)
new /obj/item/food/snacks/mre/steak(src)


Binary file added modular_ss220/objects/icons/mre.dmi
Binary file not shown.
Loading