Skip to content

Commit

Permalink
derelict almayer
Browse files Browse the repository at this point in the history
  • Loading branch information
morrowwolf committed Oct 28, 2023
1 parent ca2b45a commit 4386d17
Show file tree
Hide file tree
Showing 9 changed files with 141,668 additions and 3 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/__game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ block( \
#define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only
#define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
#define MAP_CHINOOK "Chinook 91 GSO" //admin level
#define MAP_DERELICT_ALMAYER "Derelict Almayer"

#define GAMEMODE_WHISKEY_OUTPOST "Whiskey Outpost"
#define GAMEMODE_HIVE_WARS "Hive Wars"
Expand Down
11 changes: 11 additions & 0 deletions code/game/machinery/vending/cm_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,12 @@ GLOBAL_LIST_EMPTY(vending_products)
vendor_theme = VENDOR_THEME_USCM
vend_flags = VEND_CLUTTER_PROTECTION|VEND_CATEGORY_CHECK|VEND_TO_HAND

/obj/structure/machinery/cm_vending/gear/Initialize()
. = ..()
if(length(list(z) & SSmapping.levels_by_trait(ZTRAIT_GROUND)))
malfunction()


/obj/structure/machinery/cm_vending/gear/ui_static_data(mob/user)
. = ..(user)
.["vendor_type"] = "gear"
Expand All @@ -778,6 +784,11 @@ GLOBAL_LIST_EMPTY(vending_products)
vendor_theme = VENDOR_THEME_USCM
vend_flags = VEND_CLUTTER_PROTECTION | VEND_UNIFORM_RANKS | VEND_UNIFORM_AUTOEQUIP | VEND_CATEGORY_CHECK

/obj/structure/machinery/cm_vending/clothing/Initialize()
. = ..()
if(length(list(z) & SSmapping.levels_by_trait(ZTRAIT_GROUND)))
malfunction()

/obj/structure/machinery/cm_vending/clothing/ui_static_data(mob/user)
. = ..(user)
.["vendor_type"] = "clothing"
Expand Down
15 changes: 15 additions & 0 deletions code/game/machinery/vending/vendor_types/requisitions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
vendor_theme = VENDOR_THEME_USCM
vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY | VEND_TO_HAND | VEND_LOAD_AMMO_BOXES

/obj/structure/machinery/cm_vending/sorted/cargo_guns/Initialize()
. = ..()
if(length(list(z) & SSmapping.levels_by_trait(ZTRAIT_GROUND)))
malfunction()

/obj/structure/machinery/cm_vending/sorted/cargo_guns/vend_fail()
return

Expand Down Expand Up @@ -209,6 +214,11 @@
vendor_theme = VENDOR_THEME_USCM
vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY | VEND_TO_HAND | VEND_LOAD_AMMO_BOXES

/obj/structure/machinery/cm_vending/sorted/cargo_ammo/Initialize()
. = ..()
if(length(list(z) & SSmapping.levels_by_trait(ZTRAIT_GROUND)))
malfunction()

/obj/structure/machinery/cm_vending/sorted/cargo_ammo/vend_fail()
return

Expand Down Expand Up @@ -331,6 +341,11 @@
vendor_theme = VENDOR_THEME_USCM
icon_state = "req_attach"

/obj/structure/machinery/cm_vending/sorted/attachments/Initialize()
. = ..()
if(length(list(z) & SSmapping.levels_by_trait(ZTRAIT_GROUND)))
malfunction()

/obj/structure/machinery/cm_vending/sorted/attachments/vend_fail()
return

Expand Down
15 changes: 15 additions & 0 deletions code/modules/almayer/machinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -325,3 +325,18 @@
new /obj/item/clothing/under/shorts/red(src)
new /obj/item/clothing/under/shorts/blue(src)
new /obj/item/clothing/under/shorts/green(src)

/obj/structure/machinery/prop/almayer/overwatch_console
name = "Overwatch Console"
desc = "State of the art machinery for giving orders to a squad."
density = FALSE
icon = 'icons/obj/structures/machinery/computer.dmi'
icon_state = "overwatch"

/obj/structure/machinery/prop/almayer/orbital_cannon_console
name = "\improper Orbital Cannon Console"
desc = "The console controlling the orbital cannon loading systems."
icon = 'icons/obj/structures/machinery/computer.dmi'
icon_state = "ob_console"
dir = WEST
flags_atom = ON_BORDER|CONDUCT|FPRINT
9 changes: 8 additions & 1 deletion code/modules/cm_marines/equipment/maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@
html_link = "images/9/94/New_Varadero.png"
color = "red"

/obj/item/map/almayer
name = "\improper USS Almayer map"
desc = "A labeled blueprint of the USS Almayer"
html_link = "images/5/54/USS_Almayer.png"
color = "cyan"

GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps())

/proc/setup_all_maps()
Expand All @@ -149,7 +155,8 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps())
MAP_CORSAT = new /obj/item/map/corsat(),
MAP_KUTJEVO = new /obj/item/map/kutjevo_map(),
MAP_LV522_CHANCES_CLAIM = new /obj/item/map/lv522_map(),
MAP_NEW_VARADERO = new /obj/item/map/new_varadero()
MAP_NEW_VARADERO = new /obj/item/map/new_varadero(),
MAP_DERELICT_ALMAYER = new /obj/item/map/almayer(),
)

//used by marine equipment machines to spawn the correct map.
Expand Down
11 changes: 11 additions & 0 deletions maps/derelict_almayer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"map_name": "Derelict Almayer",
"map_path": "map_files/derelict_almayer",
"map_file": "derelict_almayer.dmm",
"webmap_url": "Almayer",
"map_item_type": "/obj/item/map/almayer",
"announce_text": "An automated distress signal has been received from the \"USS Almayer\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.",
"traits": [{ "Ground": true }],
"nightmare_path": "maps/Nightmare/maps/derelict_almayer/",
"camouflage": "classic"
}
Loading

0 comments on commit 4386d17

Please sign in to comment.