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

Electricity electrified #6219

Closed
wants to merge 106 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
157005c
hybrisa alpha test
Jan 21, 2024
c923182
Merge branch 'cmss13-devs:master' into Hybrisa
Zenith00000 Jan 23, 2024
9afaf9a
Hybrisa alpha 1.01
Jan 23, 2024
4ade7d4
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Jan 23, 2024
3b922f7
Hybrisa Alpha 1.02
Jan 26, 2024
a70f270
Hybrisa 1.03
Jan 27, 2024
c2c7960
rollerbed stuff
Birdtalon Jan 31, 2024
7a89742
more roller bed stuff
Birdtalon Feb 4, 2024
90c4638
qdel
Birdtalon Feb 4, 2024
bfc1584
Revert "rollerbed stuff"
Birdtalon Feb 4, 2024
fbc4dd5
Hybrisa Alpha 1.04
Feb 4, 2024
3dd790c
Hospital and Fixes
Nanu308 Feb 5, 2024
fd4c8a4
Merge pull request #3 from Birdtalon/Hybrisa
Zenith00000 Feb 5, 2024
f045ddd
Merge pull request #5 from Nanu308/nanu/hybrisa_medical_n_fixes
Zenith00000 Feb 5, 2024
81171ac
Hybrisa Alpha 1.05
Feb 7, 2024
b62605f
Hybrisa 1.06
Feb 7, 2024
9ec14ba
Hybrisa 1.07
Feb 9, 2024
fbd3c9c
1.08
Feb 10, 2024
e3fc74f
Hybrisa Alpha 1.09
Feb 11, 2024
92277cd
Hybrisa Alpha 1.10
Feb 12, 2024
58758de
Hybrisa Alpha 1.11
Feb 15, 2024
0d6e5d0
Hybrisa 1.12
Feb 18, 2024
0d9ac5a
Hybrisa Alpha 0.13
Feb 18, 2024
1610d40
Hybrisa Alpha 0.14
Feb 21, 2024
a151613
Hybrisa Alpha 0.15
Feb 22, 2024
c718cf5
Hybrisa Alpha 0.16
Feb 22, 2024
e53174f
Hybrisa Alpha 0.17
Feb 24, 2024
962de5f
Hybrisa Alpha 0.18
Feb 25, 2024
e716629
Hybrisa Alpha 0.19
Feb 26, 2024
21173e2
Hybrisa voting cryege
Nanu308 Feb 27, 2024
1afad65
Make map voteable
Nanu308 Feb 27, 2024
7ffd4ba
Merge pull request #6 from Nanu308/nanu/hybrisa-lights-tweaks
Zenith00000 Feb 28, 2024
dce7813
Hybrisa Alpha 0.20
Feb 28, 2024
e46b304
Hybrisa Alpha 0.21
Feb 28, 2024
a845002
Hybrisa Alpha 0.22
Mar 5, 2024
6b5af47
Hybrisa Alpha 0.23
Mar 7, 2024
0090d75
Revert "Voteable + minor tweaks and compile fixes."
Zenith00000 Mar 7, 2024
438f046
Merge pull request #7 from Zenith00000/revert-6-nanu/hybrisa-lights-t…
Zenith00000 Mar 7, 2024
93d67ad
Revert "Revert "Voteable + minor tweaks and compile fixes.""
Zenith00000 Mar 7, 2024
02011c9
Merge pull request #8 from Zenith00000/revert-7-revert-6-nanu/hybrisa…
Zenith00000 Mar 7, 2024
3b18be9
Hybrisa Alpha 0.24
Mar 7, 2024
a7e796a
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Mar 7, 2024
9dc3837
Hybrisa Alpha 0.23 (Car_Factory)
Mar 7, 2024
703ef80
Hybrisa Alpha 0.24
Mar 9, 2024
1770595
Hybrisa Alpha 0.24
Mar 9, 2024
6b7c77c
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Mar 9, 2024
c911177
Add files via upload
Zenith00000 Mar 10, 2024
70b423e
Hybrisa Alpha 0.25
Mar 13, 2024
4a27f62
Hybrisa Alpha 0.26
Mar 15, 2024
5be7b28
Hybrisa Alpha 0.27
Mar 17, 2024
cce3c4e
Hybrisa Alpha 0.28
Mar 19, 2024
e4dcaa3
Hybrisa Alpha 0.29
Mar 19, 2024
b74e532
Hybrisa Alpha 0.30
Mar 21, 2024
86641c9
Hybrisa Alpha 0.31
Mar 24, 2024
5004417
Hybrisa Alpha 0.32
Mar 28, 2024
3513dfa
Hybrisa Alpha 0.33
Apr 1, 2024
a7e0762
Hybrisa Alpha 0.34
Apr 2, 2024
d993665
Hybrisa Alpha 0.35
Apr 3, 2024
68be08d
Hybrisa Alpha 0.36
Apr 6, 2024
f9e060f
Hybrisa Alpha 0.37
Apr 7, 2024
5b347d6
Hybrisa Alpha 0.38
Apr 7, 2024
d0cc1ac
Hybrisa Alpha 0.39
Apr 9, 2024
733dde5
Hybrisa 0.40
Apr 13, 2024
75bd847
Hybrisa Alpha 0.41
Apr 13, 2024
362d9ba
Hybrisa Alpha 0.42
Apr 13, 2024
daf8849
Hybrisa Alpha 0.43
Apr 15, 2024
6992007
Hybrisa Alpha 0.44
Apr 17, 2024
64385c7
Hybrisa Alpha 0.45
Apr 20, 2024
5e66270
Hybrisa Alpha 0.45
Apr 21, 2024
6ec2976
electrified fences baseground
uuuuhuuuu Apr 21, 2024
10a35fc
Merge pull request #11 from cuberound/electrified-fences
Zenith00000 Apr 21, 2024
95b99fc
Hybrisa Alpha 0.46
Apr 21, 2024
47dc548
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Apr 21, 2024
9769168
humans get zapped, insualted gloves work, they do not ling with norma…
uuuuhuuuu Apr 21, 2024
ba57b5e
eh
uuuuhuuuu Apr 21, 2024
45b0e30
failing destroy changes
uuuuhuuuu Apr 21, 2024
4320af3
Merge pull request #12 from cuberound/electrified-fences
Zenith00000 Apr 22, 2024
21536f8
Hybrisa Alpha 0.47
Apr 22, 2024
13b94fd
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Apr 22, 2024
ee06c66
Hybrisa Alpha 0.48
Apr 22, 2024
36bd756
fixed crusher charge, now only cuts it down
uuuuhuuuu Apr 22, 2024
bea6962
crusher handeled and sparks too
uuuuhuuuu Apr 22, 2024
4c7c049
Merge pull request #13 from cuberound/electrified-fences
Zenith00000 Apr 23, 2024
3d2b434
Hybrisa Alpha 0.49
Apr 23, 2024
01d8692
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Apr 23, 2024
74f4810
Hybrisa Alpha 0.50
Apr 24, 2024
b13348e
Hybrisa Alpha 0.51
Apr 24, 2024
0430a8b
Hybrisa Alpha 0.51
Apr 24, 2024
3cae1d1
charger and explosion resistance
uuuuhuuuu Apr 26, 2024
a8bdd15
Merge pull request #14 from cuberound/electrified-fences
Zenith00000 Apr 26, 2024
37e760b
Hybrisa Alpha 0.52
Apr 26, 2024
8a471a4
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Apr 26, 2024
0497701
Hybrisa Alpha 0.53
Apr 27, 2024
4d2b0ca
Hybrisa Alpha 0.54
Apr 28, 2024
7c4c58c
Hybrisa Alpha 0.55
Apr 28, 2024
9da1bb9
update_icon for vehicled
uuuuhuuuu Apr 29, 2024
49062ec
m
uuuuhuuuu Apr 29, 2024
7b212ff
Merge pull request #15 from cuberound/updateiconforvehicled
Zenith00000 Apr 29, 2024
0649b37
Hybrisa Alpha 0.56
Apr 29, 2024
3e7fffa
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Apr 29, 2024
a85161d
slashing
uuuuhuuuu Apr 30, 2024
963837b
Merge pull request #16 from cuberound/car-slashing
Zenith00000 Apr 30, 2024
7ab985a
Hybrisa Alpha 0.57
Apr 30, 2024
b3ebb2e
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Apr 30, 2024
271e299
Hybrisa Alpha 0.58
Apr 30, 2024
cd74a52
icon update
uuuuhuuuu Apr 30, 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 @@ -38,6 +38,7 @@ block( \
#define MAP_ICE_COLONY_V3 "Shivas Snowball" //Ice Rework, low pop enabled.
#define MAP_RUNTIME "USS Runtime"
#define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only
#define MAP_LV759_HYBRISA_PROSPERA "LV-759 Hybrisa Prospera" // Highpop Only
#define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
#define MAP_CHINOOK "Chinook 91 GSO" //admin level

Expand Down
8 changes: 8 additions & 0 deletions code/__DEFINES/sounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,11 @@
#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 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')
#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_CAVES list('sound/soundscape/lv759/outdoors/deepcave1.ogg','sound/soundscape/lv759/outdoors/deepcave2.ogg')
#define SCAPE_PL_LV759_WEYMART list('sound/soundscape/lv759/indoors/weymart1.ogg','sound/soundscape/lv759/indoors/weymart2.ogg','sound/soundscape/lv759/indoors/weymart3.ogg','sound/soundscape/lv759/indoors/weymart4.ogg')
1 change: 1 addition & 0 deletions code/__DEFINES/weather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,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
3 changes: 3 additions & 0 deletions code/controllers/subsystem/weather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,6 @@ 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
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