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.

Sign up for GitHub

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

Jump to bottom

Ports Hybrissa to Neroids/Xenosurge PvE codebase #4

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Ports Hybrissa to Neroids/Xenosurge PvE codebase #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a856551
initial (jesus christ)
silencer-pl Sep 17, 2024
abed812
icons
silencer-pl Sep 17, 2024
0e16cdf
more fixes
silencer-pl Sep 17, 2024
a5ea949
restores pve icons
silencer-pl Sep 17, 2024
17d6b0f
map and icon fixes
silencer-pl Sep 17, 2024
8a8a163
buckling_x fix
silencer-pl Sep 17, 2024
682d8a8
icons
silencer-pl Sep 17, 2024
c732c55
more linter fixes
silencer-pl Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions code/__DEFINES/__game.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#define MAP_ICE_COLONY_V1 "Ice Colony Classic"
#define MAP_ICE_COLONY_V2 "Ice Colony v2"
#define MAP_ICE_COLONY_V3 "Shivas Snowball" //Ice Rework, low pop enabled.
#define MAP_LV759_HYBRISA_PROSPERA "LV-759 Hybrisa Prospera" //
#define MAP_RUNTIME "USS Runtime"
#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
Expand Down
5 changes: 5 additions & 0 deletions code/__DEFINES/dcs/signals/atom/mob/living/signals_living.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,8 @@
#define COMSIG_LIVING_SET_BUCKLED "living_set_buckled"
///from base of mob/living/set_body_position()
#define COMSIG_LIVING_SET_BODY_POSITION "living_set_body_position"

/// from /datum/component/shimmy_around/proc/on_mob_move to determine if layer should be reset
#define COMSIG_LIVING_SHIMMY_LAYER "structure_shimmy_layer"
/// Sent when a shimmy component is currently overriding the layer
#define COMSIG_LIVING_SHIMMY_LAYER_CANCEL (1<<0)
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals/atom/signals_obj.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@
#define COMSIG_DROPSHIP_ADD_EQUIPMENT "dropship_add_equipment"
#define COMSIG_DROPSHIP_REMOVE_EQUIPMENT "dropship_remove_equipment"
#define COMSIG_STRUCTURE_CRATE_SQUAD_LAUNCHED "structure_crate_squad_launched"
/// from /obj/structure/Collided() if not overriden for /datum/component/shimmy_around
#define COMSIG_STRUCTURE_COLLIDED "structure_collided"
2 changes: 2 additions & 0 deletions code/__DEFINES/layers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@
#define ABOVE_XENO_LAYER 4.12
/// For facehuggers
#define FACEHUGGER_LAYER 4.13
/// For Signs above everything but below weather
#define BILLBOARD_LAYER 4.13
/// For WEATHER
#define WEATHER_LAYER 4.14

Expand Down
13 changes: 13 additions & 0 deletions code/__DEFINES/minimap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,16 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))

#define TACMAP_BASE_OCCLUDED "Occluded"
#define TACMAP_BASE_OPEN "Open"
// Hybrisa
#define MINIMAP_AREA_COLONY_STREETS "#4e6d67ae"
#define MINIMAP_AREA_COLONY_SPACE_PORT "#a54b01ee"
#define MINIMAP_AREA_COLONY_HOSPITAL "#029982e7"
#define MINIMAP_AREA_COLONY_ENGINEERING "#888404e7"
#define MINIMAP_AREA_COLONY_MARSHALLS "#880404e7"
#define MINIMAP_AREA_COLONY_RESANDCOM "#91bdcfe7"
#define MINIMAP_AREA_MINING "#5c280fe7"
#define MINIMAP_AREA_HYBRISACAVES "#390192ee"
#define MINIMAP_AREA_HYBRISARESEARCH "#856600ee"
#define MINIMAP_AREA_DERELICT "#920190ee"
#define MINIMAP_AREA_OOB "#3a3a3a"
#define MINIMAP_AREA_COMMS "#00b3ffe7"
19 changes: 19 additions & 0 deletions code/__DEFINES/sounds.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,22 @@
#define SCAPE_PL_ENG list('sound/soundscape/engamb1.ogg', 'sound/soundscape/engamb2.ogg', 'sound/soundscape/engamb3.ogg', 'sound/soundscape/engamb4.ogg', 'sound/soundscape/engamb5.ogg', 'sound/soundscape/engamb6.ogg', 'sound/soundscape/engamb7.ogg', )
#define SCAPE_PL_HANGAR list('sound/soundscape/hangaramb1.ogg', 'sound/soundscape/hangaramb2.ogg', 'sound/soundscape/hangaramb3.ogg', 'sound/soundscape/hangaramb4.ogg', 'sound/soundscape/hangaramb5.ogg', 'sound/soundscape/hangaramb6.ogg', 'sound/soundscape/hangaramb7.ogg', 'sound/soundscape/hangaramb8.ogg', 'sound/soundscape/hangaramb9.ogg', 'sound/soundscape/hangaramb10.ogg', )
#define SCAPE_PL_ARES list('sound/soundscape/mother.ogg')

// Hybrisa Soundscapes

#define AMBIENCE_CITY 'sound/ambience/city_on_fire.ogg'
#define AMBIENCE_DERELICT 'sound/ambience/derelict_ambience.ogg'
#define AMBIENCE_LAB 'sound/ambience/lab_ambience.ogg'
#define AMBIENCE_LAB_2 'sound/ambience/lab_ambience_2.ogg'
#define AMBIENCE_LAB_HALLWAY 'sound/ambience/lab_ambience_hallway.ogg'
#define AMBIENCE_WEYMART 'sound/ambience/weymart.ogg'
#define AMBIENCE_HYBRISA_INTERIOR 'sound/ambience/hybrisa_interior.ogg'
#define AMBIENCE_HYBRISA_CAVES 'sound/ambience/caves_ambience.ogg'
#define AMBIENCE_HYBRISA_CAVES_ALARM 'sound/ambience/caves_ambience_alarm.ogg'

#define SCAPE_PL_LV759_OUTDOORS list('sound/soundscape/lv759/outdoors/wind4.ogg','sound/soundscape/lv759/outdoors/wind5.ogg','sound/soundscape/lv759/outdoors/wind6.ogg','sound/soundscape/lv759/outdoors/wind7.ogg','sound/soundscape/lv759/outdoors/wind8.ogg','sound/soundscape/lv759/outdoors/wind9.ogg','sound/soundscape/lv759/outdoors/wind10.ogg','sound/soundscape/lv759/outdoors/wind11.ogg','sound/soundscape/lv759/outdoors/wind12.ogg','sound/soundscape/lv759/outdoors/wind13.ogg','sound/soundscape/lv759/outdoors/wind14.ogg','sound/soundscape/lv759/outdoors/wind15.ogg','sound/soundscape/lv759/outdoors/wind16.ogg','sound/soundscape/lv759/outdoors/wind17.ogg','sound/soundscape/lv759/outdoors/wind18.ogg','sound/soundscape/lv759/outdoors/wind19.ogg','sound/soundscape/lv759/outdoors/wind20.ogg','sound/soundscape/lv759/outdoors/wind21.ogg','sound/soundscape/lv759/outdoors/wind22.ogg','sound/soundscape/lv759/outdoors/wind23.ogg','sound/soundscape/lv759/outdoors/wind24.ogg','sound/soundscape/lv759/outdoors/wind25.ogg','sound/soundscape/lv759/outdoors/wind26.ogg','sound/soundscape/lv759/outdoors/wind27.ogg','sound/soundscape/lv759/outdoors/wind28.ogg',)
#define SCAPE_PL_LV759_INDOORS list('sound/soundscape/lv522/indoors/indoor_wind.ogg','sound/soundscape/lv522/indoors/indoor_wind2.ogg','sound/soundscape/lv759/indoors/vent_1.ogg','sound/soundscape/lv759/indoors/vent_2.ogg','sound/soundscape/lv759/indoors/vent_3.ogg','sound/soundscape/lv759/indoors/vent_4.ogg','sound/soundscape/lv759/indoors/vent_5.ogg','sound/soundscape/lv759/indoors/vent_6.ogg','sound/soundscape/lv759/indoors/vent_7.ogg','sound/soundscape/lv759/indoors/vent_6.ogg','sound/soundscape/lv759/indoors/distant_sounds_1.ogg','sound/soundscape/lv759/indoors/distant_sounds_2.ogg','sound/soundscape/lv759/indoors/distant_sounds_3.ogg','sound/soundscape/lv759/indoors/distant_sounds_4.ogg','sound/soundscape/lv759/indoors/distant_sounds_5.ogg','sound/soundscape/lv759/indoors/distant_sounds_6.ogg','sound/soundscape/lv759/indoors/distant_sounds_7.ogg','sound/soundscape/lv759/indoors/distant_sounds_8.ogg','sound/soundscape/lv759/indoors/distant_sounds_9.ogg','sound/soundscape/lv759/indoors/distant_sounds_10.ogg','sound/soundscape/engamb1.ogg','sound/soundscape/engamb2.ogg','sound/soundscape/engamb3.ogg','sound/soundscape/engamb4.ogg','sound/soundscape/engamb5.ogg','sound/soundscape/engamb6.ogg','sound/soundscape/engamb7.ogg',)
#define SCAPE_PL_LV759_DERELICTSHIP list('sound/soundscape/lv759/indoors/derelict1.ogg','sound/soundscape/lv759/indoors/derelict2.ogg','sound/soundscape/lv759/indoors/derelict3.ogg','sound/soundscape/lv759/indoors/derelict4.ogg','sound/soundscape/lv759/indoors/derelict5.ogg','sound/soundscape/lv759/indoors/derelict6.ogg','sound/soundscape/lv759/indoors/derelict7.ogg','sound/soundscape/lv759/indoors/derelict8.ogg')
#define SCAPE_PL_LV759_DEEPCAVES list('sound/soundscape/lv759/outdoors/deepcave1.ogg','sound/soundscape/lv759/outdoors/deepcave2.ogg')
#define SCAPE_PL_LV759_CAVES list('sound/soundscape/lv759/outdoors/windy_caverns_1.ogg','sound/soundscape/lv759/outdoors/windy_caverns_2.ogg','sound/soundscape/lv759/outdoors/windy_caverns_3.ogg',)
#define SCAPE_PL_LV759_PLATEAU_OUTDOORS list('sound/soundscape/lv759/outdoors/derelict_plateau_1.ogg','sound/soundscape/lv759/outdoors/derelict_plateau_2.ogg',)
1 change: 1 addition & 0 deletions code/__DEFINES/weather.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
#define WEATHER_MESSAGE_PROB 10

#define WEATHER_WARNING_PERIOD 250
#define PROB_WEATHER_LV759 100
18 changes: 12 additions & 6 deletions code/__HELPERS/lists.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,18 @@
return list[index]
return

//Checks for specific types in a list
/proc/is_type_in_list(atom/A, list/L)
for(var/type in L)
if(istype(A, type))
return 1
return 0
/proc/is_type_in_list(atom/needle, list/type_list)
for(var/type in type_list)
if(istype(needle, type))
return TRUE
return FALSE

///Checks if the needle path derives from any in the path_list
/proc/is_path_in_list(needle, list/path_list)
for(var/path in path_list)
if(ispath(needle, path))
return TRUE
return FALSE

//Removes any null entries from the list
/proc/listclearnulls(list/list)
Expand Down
3 changes: 2 additions & 1 deletion code/datums/_atmos_setup.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
#define PIPE_COLOR_GREEN "#00ff00"
#define PIPE_COLOR_YELLOW "#ffcc00"
#define PIPE_COLOR_PURPLE "#5c1ec0"
#define PIPE_COLOR_DARKGREY "#a6aeab"

var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE)
var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE, "darkgrey" = PIPE_COLOR_DARKGREY)

/proc/pipe_color_lookup(color)
for(var/C in pipe_colors)
Expand Down
20 changes: 20 additions & 0 deletions code/datums/ammo/bullet/smg.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,23 @@
penetration = ARMOR_PENETRATION_TIER_4
damage_falloff = DAMAGE_FALLOFF_TIER_6
scatter = SCATTER_AMOUNT_TIER_6

/datum/ammo/bullet/smg/p90
name = "submachinegun bullet"

damage = 20
accurate_range = 5
effective_range_max = 8
penetration = ARMOR_PENETRATION_TIER_4
damage_falloff = DAMAGE_FALLOFF_TIER_6
scatter = SCATTER_AMOUNT_TIER_6

/datum/ammo/bullet/smg/p90/p90_twe_ap
name = "armor-piercing submachinegun bullet"

damage = 26
accurate_range = 5
effective_range_max = 8
penetration = ARMOR_PENETRATION_TIER_6
damage_falloff = DAMAGE_FALLOFF_TIER_6
scatter = SCATTER_AMOUNT_TIER_6
Loading
Loading