Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
201 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
0ffc2e3
Hybrisa Alpha 0.59
Apr 30, 2024
cd74a52
icon update
uuuuhuuuu Apr 30, 2024
488f8d2
Merge pull request #17 from cuberound/electricity-electrified
Zenith00000 Apr 30, 2024
ac03384
Hybrisa Alpha 0.60
Apr 30, 2024
67c246a
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Apr 30, 2024
da6c642
Hybrisa Alpha 0.61
May 1, 2024
b8991d6
Hybrisa Alpha 0.62
May 2, 2024
e681da4
handrails on hybrisa do not drop objects
uuuuhuuuu May 2, 2024
71e8ccf
it goes BOOM lets goooooo
uuuuhuuuu May 2, 2024
8cd06c6
Merge pull request #19 from cuberound/mining-explosives
Zenith00000 May 2, 2024
50f5fcd
Merge pull request #18 from cuberound/rodeblockchanges
Zenith00000 May 2, 2024
7628723
Hybrisa Alpha 0.63
May 2, 2024
efcef17
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
May 2, 2024
1c2b2b2
minor fence cleanup and trafic lights, please test I am not able righ…
uuuuhuuuu May 3, 2024
6a55fd7
Hybrisa Alpha 0.64
May 3, 2024
9bdfd79
Merge pull request #20 from cuberound/traficLights
Zenith00000 May 3, 2024
a44918a
Hybrisa Alpha 0.65
May 3, 2024
e37fbee
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
May 3, 2024
b1e842a
Hybrisa Alpha 0.66
May 3, 2024
5e36d8f
Hybrisa Alpha 0.67
May 4, 2024
c59e835
Hybrisa Alpha 0.68
May 4, 2024
8b89475
lights shining
uuuuhuuuu May 5, 2024
2527354
colours and stuff
uuuuhuuuu May 5, 2024
fa3a228
Hybrisa Alpha 0.69
May 5, 2024
4d1dd25
Merge pull request #21 from cuberound/lights-in-crashed-ship
Zenith00000 May 5, 2024
82a785d
Hybrisa Alpha 0.70
May 5, 2024
37835a6
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
May 5, 2024
c12362e
Merge branch 'Hybrisa' into lights-in-crashed-ship
Zenith00000 May 5, 2024
5de5d87
Merge pull request #22 from cuberound/lights-in-crashed-ship
Zenith00000 May 5, 2024
6d49ec1
Hybrisa Alpha 0.71
May 5, 2024
0185483
Hybrisa Alpha 0.72
May 5, 2024
336227d
Hybrisa Alpha 0.73
May 6, 2024
0e5e390
Hybrisa Merge
Zenith00000 May 6, 2024
0b26d2a
Hybrisa Merge 2
Zenith00000 May 6, 2024
2ba177a
Hybrisa Merge 3
Zenith00000 May 6, 2024
b302074
Revert "Hybrisa Merge 3"
Zenith00000 May 6, 2024
2719dc2
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Zenith00000 May 6, 2024
7579220
Hybrisa Alpha 0.73
Zenith00000 May 6, 2024
6e7ca53
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Zenith00000 May 6, 2024
f1a849c
Hybrisa Alpha 0.74
Zenith00000 May 6, 2024
a9c2c82
Hybrisa Alpha 0.75
Zenith00000 May 6, 2024
ab95b07
Hybrisa Alpha 0.76
Zenith00000 May 6, 2024
33c1b39
starts working on easy onflicts, adds pizza handrail...
uuuuhuuuu May 7, 2024
74f694e
duplicate
uuuuhuuuu May 7, 2024
a8ede74
should solve the geothermal stuff
uuuuhuuuu May 7, 2024
fcf5a21
Merge pull request #27 from cuberound/pizza-handrail
Zenith00000 May 7, 2024
1b08173
Hybrisa Alpha 0.77
Zenith00000 May 7, 2024
3ad2bd5
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Zenith00000 May 7, 2024
5dc8b17
Merge remote-tracking branch 'upstream/master' into Hybrisa
Zenith00000 May 7, 2024
9030ddb
Hybrisa Alpha 0.78
Zenith00000 May 7, 2024
1e21d13
Hybrisa Alpha 0.79
Zenith00000 May 8, 2024
971de40
Hybrisa Alpha 0.80
Zenith00000 May 8, 2024
14ba3dd
Hybrisa Alpha 0.80
Zenith00000 May 9, 2024
3274bef
Hybrisa Alpha 0.81
Zenith00000 May 9, 2024
2e9aa80
should handle the colisions
uuuuhuuuu May 9, 2024
a9f2033
fix
uuuuhuuuu May 9, 2024
2195925
Merge pull request #28 from cuberound/fence-pounce-fix
Zenith00000 May 9, 2024
8527a7a
Hybrisa Alpha 0.82
Zenith00000 May 9, 2024
2dc4026
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Zenith00000 May 9, 2024
54a9fe9
Hybrisa Alpha 0.83
Zenith00000 May 9, 2024
7ba9caa
Hybrisa Alpha 0.84
Zenith00000 May 9, 2024
d676304
Hybrisa Alpha 0.85
Zenith00000 May 10, 2024
19e61ba
Merge branch 'cmss13-devs:master' into Hybrisa
Zenith00000 May 10, 2024
857bbfc
Hybrisa Alpha 0.86
Zenith00000 May 11, 2024
362c2c2
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Zenith00000 May 11, 2024
c09f201
Merge branch 'cmss13-devs:master' into Hybrisa
Zenith00000 May 11, 2024
782c66f
Hybrisa Alpha 0.87
Zenith00000 May 11, 2024
2864d76
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Zenith00000 May 11, 2024
20febc0
Hybrisa Alpha 0.88
Zenith00000 May 12, 2024
5ec8b52
adds ocupied functionality
uuuuhuuuu May 12, 2024
3f7823f
phonebox as machinery gona need loads more work
uuuuhuuuu May 13, 2024
e1bb09d
open and close
uuuuhuuuu May 13, 2024
95f332d
minor fixes
uuuuhuuuu May 13, 2024
64ff43a
Merge pull request #29 from cuberound/phonebox-work
Zenith00000 May 13, 2024
83cb98c
Hybrisa Alpha 0.89
Zenith00000 May 13, 2024
0445a5e
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Zenith00000 May 13, 2024
191e9ca
Merge branch 'cmss13-devs:master' into Hybrisa
Zenith00000 May 13, 2024
def6905
Merge branch 'cmss13-devs:master' into Hybrisa
Zenith00000 May 15, 2024
e3933d5
Hybrisa Alpha 0.90
Zenith00000 May 15, 2024
06f2372
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Zenith00000 May 15, 2024
0b70562
Merge branch 'cmss13-devs:master' into Hybrisa
Zenith00000 May 18, 2024
acf6730
Hybrisa Alpha 0.91
Zenith00000 May 18, 2024
0b9fba3
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
Zenith00000 May 18, 2024
e21f02c
Hybrisa Alpha 0.92
Zenith00000 May 18, 2024
9c06d2c
Merge branch 'master' into Hybrisa
Nanu308 May 19, 2024
e1aac16
Fixes for CI and stuff
Nanu308 May 19, 2024
1bc6d81
Merge pull request #30 from Nanu308/nanu/hybrisa-fixes
Zenith00000 May 19, 2024
ac16d09
Revert "Nanu/hybrisa fixes"
Zenith00000 May 19, 2024
3f07e9d
Merge pull request #31 from Zenith00000/revert-30-nanu/hybrisa-fixes
Zenith00000 May 19, 2024
82d5dbf
Merge branch 'cmss13-devs:master' into Zenith-master
Zenith00000 May 19, 2024
e511b9b
Merge branch 'cmss13-devs:master' into Zenith-master
Zenith00000 Jun 17, 2024
2c6b660
Merge branch 'Zenith-master' into Fire_Colony
BOBAMAx May 5, 2026
3ec14b5
Merge branch 'Fire_Colony' of https://github.com/Zenith00000/cmss13 i…
BOBAMAx May 5, 2026
12c54e8
Merge branch 'Fire_Colony' of https://github.com/Zenith00000/cmss13 i…
BOBAMAx May 6, 2026
d1ea85e
Merge branch 'Fire_Colony' of https://github.com/Zenith00000/cmss13 i…
BOBAMAx May 8, 2026
6a32d6f
lava
BOBAMAx May 8, 2026
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
18 changes: 16 additions & 2 deletions code/datums/components/damage_over_time.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,28 @@
var/cause_path
/// Whether the damage is considered to be from an environmental source
var/enviro = FALSE
/// Whether the DOT applies fire stacks or not
var/apply_fire = FALSE
/// stuff for fire stacks
var/burn_reagent = /datum/reagent/napalm/ut
var/burn_stacks = 30

/// Parent as a living mob
var/mob/living/living_parent

/datum/component/damage_over_time/InheritComponent(cause_path, dam_amount, dam_type, target_temp, temp_delta, synth_dmg_mult, pred_dmg_mult, warning_message, enviro)
/datum/component/damage_over_time/InheritComponent(cause_path, dam_amount, dam_type, target_temp, temp_delta, synth_dmg_mult, pred_dmg_mult, warning_message, enviro, apply_fire, burn_reagent, burn_stacks)
return // Ultimately just here to suppress named arg errors

/datum/component/damage_over_time/Initialize(cause_path, dam_amount=5, dam_type=BURN, target_temp=T90C, temp_delta=5, synth_dmg_mult=0.5, pred_dmg_mult=0.5, warning_message="You feel your body start to shake as the scalding water sears your skin, heat overwhelming your senses...", enviro=FALSE)
/datum/component/damage_over_time/Initialize(cause_path, dam_amount=5, dam_type=BURN, target_temp=T90C, temp_delta=5, synth_dmg_mult=0.5, pred_dmg_mult=0.5, warning_message="You feel your body start to shake as the scalding water sears your skin, heat overwhelming your senses...", enviro=FALSE, apply_fire=FALSE, burn_reagent = /datum/reagent/napalm/ut, burn_stacks = 30)
src.dam_amount = dam_amount
src.dam_type = dam_type
src.target_temp = target_temp
src.temp_delta = temp_delta
src.cause_path = cause_path
src.enviro = enviro
src.apply_fire = apply_fire
src.burn_reagent = burn_reagent
src.burn_stacks = burn_stacks

living_parent = parent

Expand Down Expand Up @@ -78,6 +86,12 @@
living_parent.bodytemperature -= temp_delta
else
living_parent.bodytemperature = target_temp
if(apply_fire)
if(ispath(burn_reagent))
var/datum/reagent/temp = burn_reagent
burn_reagent = GLOB.chemical_reagents_list[initial(temp.id)]
living_parent.TryIgniteMob(burn_stacks, burn_reagent) //30 burn stacks, proc needs a reagent to work.


/datum/component/damage_over_time/RegisterWithParent()
START_PROCESSING(SSdcs, src)
Expand Down
33 changes: 33 additions & 0 deletions code/modules/fire_colony/lava.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/obj/effect/blocker/lava
anchored = TRUE
density = FALSE
opacity = FALSE
unacidable = 1
layer = ABOVE_FLY_LAYER //to make it visible in the map editor
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
icon = 'icons/landmarks.dmi'

icon_state = "map_blocker_hazard"

var/dam_amount = 2
var/dam_type = BURN
var/target_temp = T120C
var/temp_delta = 10
var/warning_message = "You are in lava now" //TODO: change this
var/burn_reagent = /datum/reagent/napalm/ut
var/burn_stacks = 30

/obj/effect/blocker/lava/Initialize(mapload, ...)
. = ..()
invisibility = 101

/obj/effect/blocker/lava/Crossed(mob/living/affected_mob)
if(!ismob(affected_mob))
return
if(affected_mob.stat == DEAD)
return
if(!ishuman(affected_mob))
return

affected_mob.AddComponent(/datum/component/damage_over_time, /obj/effect/blocker/lava, dam_amount = dam_amount, dam_type = dam_type, target_temp = target_temp, temp_delta = temp_delta, synth_dmg_mult=0.8, pred_dmg_mult=0.8, warning_message=warning_message, enviro=TRUE, apply_fire=TRUE, burn_reagent = burn_reagent, burn_stacks = burn_stacks)

1 change: 1 addition & 0 deletions colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1931,6 +1931,7 @@
#include "code\modules\events\destructible_terrain.dm"
#include "code\modules\events\inflation.dm"
#include "code\modules\events\nothing_happens.dm"
#include "code\modules\fire_colony\lava.dm"
#include "code\modules\fishing\bait\generic.dm"
#include "code\modules\fishing\datums\generic.dm"
#include "code\modules\fishing\datums\helpers.dm"
Expand Down
Loading