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

ports hybrisa #310

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b32c3e3
IITS HAPPENING
AndroBetel Jun 26, 2024
a022034
Update landing_signs.dmi
AndroBetel Jun 26, 2024
37dedd3
1
AndroBetel Jun 28, 2024
c62a275
newlines
AndroBetel Jun 28, 2024
e641c9f
Merge branch 'master' into hybrisa
AndroBetel Jul 20, 2024
89cd62d
Merge branch 'master' of https://github.com/cmss13-devs/cmss13-pve in…
AndroBetel Jul 20, 2024
eff5a94
Merge branch 'hybrisa' of https://github.com/AndroBetel/PvE-CMSS13 in…
AndroBetel Jul 20, 2024
f05e5ae
Update bed.dm
AndroBetel Aug 5, 2024
6894fee
213123
AndroBetel Aug 5, 2024
0ef50a6
werqwer
AndroBetel Aug 5, 2024
21488f4
Merge branch 'master' of https://github.com/cmss13-devs/cmss13-pve in…
AndroBetel Aug 6, 2024
713f63f
Merge branch 'master' of https://github.com/cmss13-devs/cmss13-pve in…
AndroBetel Aug 13, 2024
99b95a9
Update code/game/objects/structures/stool_bed_chair_nest/bed.dm
AndroBetel Aug 13, 2024
076ba52
2
AndroBetel Aug 13, 2024
b614cee
Merge branch 'hybrisa' of https://github.com/AndroBetel/PvE-CMSS13 in…
AndroBetel Aug 13, 2024
f6bb67f
Update code/modules/vehicles/van/box_van.dm
harryob Sep 2, 2024
0980101
Merge branch 'master' of https://github.com/cmss13-devs/cmss13-pve in…
AndroBetel Sep 5, 2024
dc0296f
Update preset_hybrisa.dm
AndroBetel Sep 5, 2024
5019146
Update LV759_Hybrisa_Prospera.dmm
AndroBetel Sep 5, 2024
d3bc300
difx
AndroBetel Sep 5, 2024
1022628
?
AndroBetel Sep 5, 2024
ee258bf
errmm
AndroBetel Sep 5, 2024
3d02827
Update mode.dm
AndroBetel Sep 5, 2024
e02c343
Merge branch 'master' of https://github.com/cmss13-devs/cmss13-pve in…
AndroBetel Sep 20, 2024
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
1 change: 1 addition & 0 deletions code/__DEFINES/__game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#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_NEW_VARADERO_REPAIRED "New Varadero Repaired"
#define MAP_LV759_HYBRISA_PROSPERA "LV-759 Hybrisa Prospera" // Highpop Only
#define MAP_CHINOOK "Chinook 91 GSO" //admin level
#define MAP_DERELICT_ALMAYER "Derelict Almayer"

Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/layers.dm
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
14 changes: 14 additions & 0 deletions code/__DEFINES/minimap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,17 @@ 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"
2 changes: 1 addition & 1 deletion code/__DEFINES/mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#define IS_MODE_COMPILED(MODE) (ispath(text2path("/datum/game_mode/"+(MODE))))

#define MODE_HAS_FLAG(flag) (SSticker.mode.flags_round_type & flag)
#define MODE_HAS_TOGGLEABLE_FLAG(flag) (SSticker.mode.toggleable_flags & flag)
#define MODE_HAS_TOGGLEABLE_FLAG(flag) (SSticker.mode?.toggleable_flags & flag)

// Gamemode Flags
#define MODE_INFESTATION (1<<0)
Expand Down
19 changes: 19 additions & 0 deletions code/__DEFINES/sounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,23 @@
#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',)
#define SCAPE_PL_AICORE list('sound/soundscape/aicore/aicore_beep.ogg', 'sound/soundscape/aicore/aicore_ident.ogg', 'sound/soundscape/aicore/aicore_rumble1.ogg', 'sound/soundscape/aicore/aicore_rumble2.ogg', 'sound/soundscape/aicore/aicore_rumble3.ogg', 'sound/soundscape/aicore/aicore_rumble4.ogg', 'sound/soundscape/aicore/aicore_rumble5.ogg', 'sound/soundscape/aicore/aicore_tone1.ogg', 'sound/soundscape/aicore/aicore_tone2.ogg', 'sound/soundscape/aicore/aicore_tone3.ogg', 'sound/soundscape/aicore/aicore_tone4.ogg', 'sound/soundscape/aicore/aicore_tone5.ogg', 'sound/soundscape/aicore/aicore_tone6.ogg', 'sound/soundscape/aicore/aicore_tone7.ogg', 'sound/soundscape/aicore/aicore_tone8.ogg', 'sound/soundscape/aicore/aicore_tone9.ogg', 'sound/soundscape/aicore/aicore_tone10.ogg', 'sound/soundscape/aicore/aicore_tone11.ogg', 'sound/soundscape/aicore/aicore_tone12.ogg', 'sound/soundscape/aicore/aicore_tone13.ogg', 'sound/soundscape/aicore/aicore_tone14.ogg', 'sound/soundscape/aicore/aicore_tone15.ogg', 'sound/soundscape/aicore/aicore_tone16.ogg', 'sound/soundscape/aicore/aicore_tone17.ogg', 'sound/soundscape/aicore/aicore_tone18.ogg', )
1 change: 1 addition & 0 deletions code/__DEFINES/weather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define PROB_WEATHER_BIG_RED 30
#define PROB_WEATHER_LV624 30
#define PROB_WEATHER_NEW_VARADERO 100
#define PROB_WEATHER_LV759 100

#define WEATHER_TYPE_NO_WEATHER 0
#define WEATHER_TYPE_SNOW 1
Expand Down
11 changes: 8 additions & 3 deletions code/__HELPERS/_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,11 @@
if(!inserted_list)
return

for(var/i in 1 to length(inserted_list) - 1)
inserted_list.Swap(i, rand(i, length(inserted_list)))

for(var/i in 1 to inserted_list.len - 1)
inserted_list.Swap(i, rand(i, inserted_list.len))

/proc/is_path_in_list(needle, list/path_list)
for(var/path in path_list)
if(ispath(needle, path))
return TRUE
return FALSE
4 changes: 4 additions & 0 deletions code/controllers/subsystem/weather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,7 @@ SUBSYSTEM_DEF(weather)
/obj/effect/weather_vfx_holder/rain
icon_state = "strata_storm"
alpha = 50

/obj/effect/weather_vfx_holder/hybrisa_rain
icon_state = "hybrisa_rain"
alpha = 50
14 changes: 14 additions & 0 deletions code/datums/ammo/bullet/smg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,17 @@
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 = 22
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 = 24
penetration = ARMOR_PENETRATION_TIER_6
36 changes: 36 additions & 0 deletions code/datums/paygrades/factions/civillian/civilian.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/datum/paygrade/civilian

Check failure on line 1 in code/datums/paygrades/factions/civillian/civilian.dm

View workflow job for this annotation

GitHub Actions / Run Linters

DME Validator

File is not included
name = "Civilian Paygrade"
pay_multiplier = 0.5 // civvies are poor

/datum/paygrade/civilian/civilian
paygrade = "C"
name = "Civilian"

/datum/paygrade/civilian/nurse
paygrade = "CN"
name = "Nurse"
prefix = "Nrs."

/datum/paygrade/civilian/doctor
paygrade = "CD"
name = "Doctor"
prefix = "Dr."
pay_multiplier = 0.75

/datum/paygrade/civilian/professor
paygrade = "CCMO"
name = "Professor"
prefix = "Prof."
pay_multiplier = 1

/datum/paygrade/civillian/representative
paygrade = "CR"
name = "Representative"
prefix = "Rep."
pay_multiplier = 1

/datum/paygrade/civilian/paramedic
paygrade = "CPARA"
name = "Paramedic"
prefix = "EMT-P"
pay_multiplier = 0.6
8 changes: 7 additions & 1 deletion code/datums/paygrades/factions/wy/wy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,10 @@
prefix = "Director"
ranking = 9
pay_multiplier = 10
officer_grade = GRADE_FLAG

/datum/paygrade/wy_ranks/wycPO
paygrade = "WYPO2"
name = "Captain"
prefix = "Capt."
ranking = 1
pay_multiplier = 2
34 changes: 34 additions & 0 deletions code/datums/skills/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -224,3 +224,37 @@ CIVILIAN
SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
)

/datum/skills/civilian/survivor/wy_pilot
name = "Survivor - Weyland Yutani - Pilot"
skills = list(
SKILL_PILOT = SKILL_PILOT_EXPERT,
SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
)

/datum/skills/civilian/survivor/paramedic
name = "Survivor - Paramedic"
skills = list(
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
SKILL_SURGERY = SKILL_SURGERY_NOVICE,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
)

/datum/skills/civilian/survivor/fire_fighter
name = "Survivor - Fire Protection Specialist"
additional_skills = list(
SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
)

/datum/skills/civilian/survivor/pizza_delivery_driver
name = "Survivor - Pizza Galaxy Delivery Driver"
skills = list(
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
)
10 changes: 7 additions & 3 deletions code/datums/vehicles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
name = "Van"
interior_id = "van"

/datum/map_template/interior/arc
name = "ARC"
interior_id = "arc"
/datum/map_template/interior/box_van
name = "Box Van"
interior_id = "box_van"

/datum/map_template/interior/pizza_van
name = "Pizza-Galaxy Van"
interior_id = "pizza_van"
37 changes: 37 additions & 0 deletions code/datums/weather/weather_events/lv759_hybrisa_prospera.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/datum/weather_event/hybrisa_light_rain
name = "Hybrisa Light Rain"

display_name = "Light Rain"

length = 10 MINUTES

lightning_chance = 4

fire_smothering_strength = 2

turf_overlay_icon_state = "hybrisa_rain"
turf_overlay_alpha = 40

effect_message = null
damage_per_tick = 0

ambience = 'sound/ambience/rainandthunderlong.ogg'

/datum/weather_event/hybrisa_very_light_rain
name = "Hybrisa Very Light Rain"

display_name = "Very Light Rain"

length = 10 MINUTES

lightning_chance = 2

fire_smothering_strength = 1

turf_overlay_icon_state = "hybrisa_rain"
turf_overlay_alpha = 25

effect_message = null
damage_per_tick = 0

ambience = 'sound/ambience/rainandthunderlong.ogg'
20 changes: 20 additions & 0 deletions code/datums/weather/weather_map_holders/lv759_hybrisa_prospera.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/datum/weather_ss_map_holder/lv759_hybrisa_prospera
name = "LV-759 Map Holder"

warn_time = 1 MINUTES
min_time_between_events = 12 MINUTES
min_time_between_checks = 0
min_check_variance = 0

no_weather_turf_icon_state = "strata_clearsky"

potential_weather_events = list(
/datum/weather_event/hybrisa_light_rain,
/datum/weather_event/hybrisa_very_light_rain,
)

/datum/weather_ss_map_holder/lv759_hybrisa_prospera/should_affect_area(area/A)
return !CEILING_IS_PROTECTED(A.ceiling, CEILING_GLASS)

/datum/weather_ss_map_holder/lv759_hybrisa_prospera/should_start_event()
return prob(PROB_WEATHER_LV759)
Loading
Loading