Skip to content

Commit

Permalink
Remasters Bombed Airbase (#3973)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Remaps Bombed Airbase to be closer to modern mapping standards. It was
old and crusty.

![StrongDMM-2025-01-07 17 27
47](https://github.com/user-attachments/assets/89039c3a-c6d6-4988-869e-5c4e177dad44)
![StrongDMM-2025-01-07 17 27
49](https://github.com/user-attachments/assets/504194ac-e1fe-45b5-936b-f9f49557ef5a)

![image](https://github.com/user-attachments/assets/0c4604a5-a7fe-4767-8230-35298ae889f7)


## Why It's Good For The Game

This ruin is old and crusty and should be way better (it is now)

## Changelog

:cl:
add: Bombed Airbase has been remapped.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Erikafox authored Feb 7, 2025
1 parent 7f3cec6 commit 2cf2af9
Show file tree
Hide file tree
Showing 9 changed files with 18,074 additions and 12,851 deletions.
30,755 changes: 17,926 additions & 12,829 deletions _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions code/datums/ruins/jungle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE, RUIN_TAG_HAZARDOUS)

/datum/map_template/ruin/jungle/airbase
name = "Bombed Airbase"
name = "Abandoned Airbase"
id = "airbase"
description = "A bombed out airbase from the ICW, taken back over by nature"
description = "An abandoned airbase dating back to the ICW, partially scuttled, and moved right back into by the Ramzi Clique."
suffix = "jungle_bombed_starport.dmm"
ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MAJOR_LOOT, RUIN_TAG_HAZARDOUS, RUIN_TAG_LIVEABLE)
ruin_tags = list(RUIN_TAG_HARD_COMBAT, RUIN_TAG_MAJOR_LOOT, RUIN_TAG_HAZARDOUS, RUIN_TAG_LIVEABLE)

/datum/map_template/ruin/jungle/medtech
name = "MedTech facility"
Expand Down
44 changes: 37 additions & 7 deletions code/game/area/areas/ruins/jungle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,49 @@
name = "cargo dump"
icon_state = "dk_yellow"

// Bombed Syndicate Starport
/area/ruin/jungle/starport
name = "Bombed Air Base"
// Abandoned Airbase

/area/ruin/jungle/airbase
name = "Abandoned Airbase"
icon_state = "green"

/area/ruin/jungle/starport/tower
name = "Air Base Control Tower"
/area/ruin/jungle/airbase/tower
name = "Airbase Command Tower"
icon_state = "bridge"

/area/ruin/jungle/starport/plasma
name = "Air Base Fuel Stores"
/area/ruin/jungle/airbase/cargo
name = "Airbase Warehouse"
icon_state = "supply"

/area/ruin/jungle/airbase/hangar
name = "Airbase Hangar"
icon_state = "hangar"

/area/ruin/jungle/airbase/engineering
name = "Airbase Engineering"
icon_state = "dk_yellow"

/area/ruin/jungle/airbase/med
name = "Airbase Medical"
icon_state = "med_office"

/area/ruin/jungle/airbase/dorms
name = "Airbase Living Space"
icon_state = "crew_quarters"

/area/ruin/jungle/airbase/armory
name = "Airbase Armory"
icon_state = "red"

/area/ruin/jungle/airbase/shed
name = "Airbase Shed"
icon_state = "storage"

/area/ruin/jungle/airbase/turrets
name = "Abandoned Airbase Guns"
icon_state = "green"
requires_power = FALSE

// Syndicate fort

/area/ruin/jungle/syndifort
Expand Down
4 changes: 4 additions & 0 deletions code/game/machinery/porta_turret/portable_turret_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@
lethal_projectile = /obj/projectile/beam/weak/penetrator
icon_state = "syndie_off"
base_icon_state = "syndie"
scan_range = 7
shot_delay = 5

/obj/machinery/porta_turret/ship/syndicate/heavy
name = "Heavy Laser Turret"
Expand All @@ -143,6 +145,8 @@
stun_projectile_sound = 'sound/weapons/taser.ogg'
lethal_projectile = /obj/projectile/beam/laser/heavylaser
lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
scan_range = 12
shot_delay = 20
max_integrity = 300

/* New Gorlex Republic Turrets */
Expand Down
5 changes: 0 additions & 5 deletions code/game/turfs/closed/wall/reinf_walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,6 @@
base_icon_state = "plastitanium_wall"
smoothing_flags = SMOOTH_BITMASK

/turf/closed/wall/r_wall/syndicate/nosmooth
icon = 'icons/turf/shuttle.dmi'
icon_state = "wall"
smoothing_flags = NONE

/turf/closed/wall/r_wall/syndicate/overspace
icon_state = "map-overspace"
smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
Expand Down
67 changes: 67 additions & 0 deletions code/game/turfs/open/floor/plating/jungle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,70 @@
light_range = 2
light_power = 0.8
light_color = LIGHT_COLOR_BLUEGREEN

//ruinturfs

/turf/open/floor/plating/jungleplanet
planetary_atmos = TRUE
light_color = COLOR_JUNGLEPLANET_LIGHT
initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS

/turf/open/floor/plating/jungleplanet/lit
light_range = 2
light_power = 1

/turf/open/floor/plasteel/dark/jungleplanet
planetary_atmos = TRUE
light_color = COLOR_JUNGLEPLANET_LIGHT
initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS

/turf/open/floor/plasteel/dark/jungleplanet/lit
light_range = 2
light_power = 1

/turf/open/floor/plasteel/white/jungleplanet
planetary_atmos = TRUE
light_color = COLOR_JUNGLEPLANET_LIGHT
initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS

/turf/open/floor/plasteel/white/jungleplanet/lit
light_range = 2
light_power = 1

/turf/open/floor/plasteel/mono/dark/jungleplanet
planetary_atmos = TRUE
light_color = COLOR_JUNGLEPLANET_LIGHT
initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS

/turf/open/floor/plasteel/mono/dark/jungleplanet/lit
light_range = 2
light_power = 1

//cementcrete

/turf/open/floor/concrete/jungleplanet
planetary_atmos = TRUE
light_color = COLOR_JUNGLEPLANET_LIGHT
initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS

/turf/open/floor/concrete/jungleplanet/lit
light_range = 2
light_power = 1

/turf/open/floor/concrete/slab_1/jungleplanet
planetary_atmos = TRUE
light_color = COLOR_JUNGLEPLANET_LIGHT
initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS

/turf/open/floor/concrete/slab_1/jungleplanet/lit
light_range = 2
light_power = 1

/turf/open/floor/concrete/reinforced/jungleplanet
planetary_atmos = TRUE
light_color = COLOR_JUNGLEPLANET_LIGHT
initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS

/turf/open/floor/concrete/reinforced/jungleplanet/lit
light_range = 2
light_power = 1
7 changes: 0 additions & 7 deletions code/modules/mob/living/simple_animal/hostile/giant_spider.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
unique_name = 1
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
footstep_type = FOOTSTEP_MOB_CLAW
mob_size = MOB_SIZE_LARGE
Expand Down Expand Up @@ -82,12 +81,6 @@
if(mind)
mind.store_memory("<span class='spider'><b>[directive]</b></span>")

/mob/living/simple_animal/hostile/poison/giant_spider/attack_ghost(mob/user)
. = ..()
if(.)
return
humanize_spider(user)

/mob/living/simple_animal/hostile/poison/giant_spider/proc/humanize_spider(mob/user)
if(key || !playable_spider || stat)//Someone is in it, it's dead, or the fun police are shutting it down
return 0
Expand Down
36 changes: 36 additions & 0 deletions code/modules/ruins/jungleplanet_ruin_code/airbase.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/obj/structure/salvageable/airbase
name = "starport ruin structure"
icon = 'icons/mecha/mecha_equipment.dmi'
density = 0

/obj/structure/salvageable/airbase/missile_launcher
name = "\improper starfighter missile rack"
desc = "A devastating strike weapon used by daring Gorlex pilots during the ICW. The firing mechanisms, while sturdy, seem to be ruined by the passage of time."
icon_state = "mecha_missilerack"
salvageable_parts = list(
/obj/item/stack/cable_coil/cut = 80,
/obj/item/stack/ore/salvage/scraptitanium/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
/obj/effect/spawner/random/salvage_manipulator = 30,
/obj/item/stack/sheet/metal/five = 10,
/obj/item/stack/sheet/plasteel/five = 30,
/obj/item/gun/ballistic/rocketlauncher = 10
)

/obj/structure/salvageable/airbase/cannon
name = "\improper starfighter cannon assembly"
desc = "A high powered rotary cannon used by daring Gorlex pilots during the ICW. The mechanisms seem to be ruined by the passage of time."
icon_state = "mecha_scatter"
salvageable_parts = list(
/obj/item/stack/cable_coil/cut = 80,
/obj/item/stack/ore/salvage/scraptitanium/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
/obj/effect/spawner/random/salvage_manipulator = 30,
/obj/effect/spawner/random/salvage_manipulator = 30,
/obj/item/stack/sheet/metal/five = 10,
/obj/item/stack/sheet/plasteel/five = 30,
)

/obj/machinery/porta_turret/ship/syndicate/heavy/starport
faction = list(FACTION_SYNDICATE, "turret")
turret_flags = TURRET_FLAG_HOSTILE
1 change: 1 addition & 0 deletions shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3323,6 +3323,7 @@
#include "code\modules\ruins\icemoonruin_code\library.dm"
#include "code\modules\ruins\icemoonruin_code\tesla_lab.dm"
#include "code\modules\ruins\icemoonruin_code\wrath.dm"
#include "code\modules\ruins\jungleplanet_ruin_code\airbase.dm"
#include "code\modules\ruins\lavalandruin_code\biodome_winter.dm"
#include "code\modules\ruins\lavalandruin_code\puzzle.dm"
#include "code\modules\ruins\lavalandruin_code\surface.dm"
Expand Down

0 comments on commit 2cf2af9

Please sign in to comment.