Fire colony#80

Merged

Zenith00000 merged 203 commits into

Zenith00000:Fire_Colonyfrom

BOBAMAx:Fire_Colony

May 8, 2026

Commits on Jan 21, 2024

hybrisa alpha test

Zenith
authored and
Zenith
committed

Commits on Jan 23, 2024

Merge branch 'cmss13-devs:master' into Hybrisa
Zenith00000
authored
Hybrisa alpha 1.01

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed

Commits on Jan 26, 2024

Hybrisa Alpha 1.02

Zenith
authored and
Zenith
committed

Commits on Jan 27, 2024

Hybrisa 1.03

Zenith
authored and
Zenith
committed

Commits on Jan 31, 2024

rollerbed stuff
Birdtalon
committed

Commits on Feb 4, 2024

more roller bed stuff
Birdtalon
committed
qdel
Birdtalon
committed
Revert "rollerbed stuff"
Birdtalon
committed
Hybrisa Alpha 1.04

Zenith
authored and
Zenith
committed

Commits on Feb 5, 2024

Commits on Feb 7, 2024

Hybrisa Alpha 1.05

Zenith
authored and
Zenith
committed
Hybrisa 1.06

Zenith
authored and
Zenith
committed

Commits on Feb 9, 2024

Hybrisa 1.07

Zenith
authored and
Zenith
committed

Commits on Feb 10, 2024

1.08

Zenith
authored and
Zenith
committed

Commits on Feb 11, 2024

Hybrisa Alpha 1.09

Zenith
authored and
Zenith
committed

Commits on Feb 12, 2024

Hybrisa Alpha 1.10

Zenith
authored and
Zenith
committed

Commits on Feb 15, 2024

Hybrisa Alpha 1.11

Zenith
authored and
Zenith
committed

Commits on Feb 18, 2024

Hybrisa 1.12

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.13

Zenith
authored and
Zenith
committed

Commits on Feb 21, 2024

Hybrisa Alpha 0.14

Zenith
authored and
Zenith
committed

Commits on Feb 22, 2024

Hybrisa Alpha 0.15

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.16

Zenith
authored and
Zenith
committed

Commits on Feb 24, 2024

Hybrisa Alpha 0.17

Zenith
authored and
Zenith
committed

Commits on Feb 25, 2024

Hybrisa Alpha 0.18

Zenith
authored and
Zenith
committed

Commits on Feb 26, 2024

Hybrisa Alpha 0.19

Zenith
authored and
Zenith
committed

Commits on Feb 27, 2024

Commits on Feb 28, 2024

Merge pull request #6 from Nanu308/nanu/hybrisa-lights-tweaks
Zenith00000
authored
Hybrisa Alpha 0.20

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.21

Zenith
authored and
Zenith
committed

Commits on Mar 5, 2024

Hybrisa Alpha 0.22

Zenith
authored and
Zenith
committed

Commits on Mar 7, 2024

Hybrisa Alpha 0.23

Zenith
authored and
Zenith
committed
Revert "Voteable + minor tweaks and compile fixes."
Zenith00000
authored
Merge pull request #7 from Zenith00000/revert-6-nanu/hybrisa-lights-tweaks
Zenith00000
authored
Revert "Revert "Voteable + minor tweaks and compile fixes.""
Zenith00000
authored
Merge pull request #8 from Zenith00000/revert-7-revert-6-nanu/hybrisa-lights-tweaks
Zenith00000
authored
Hybrisa Alpha 0.24

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.23 (Car_Factory)

Zenith
authored and
Zenith
committed

Commits on Mar 9, 2024

Hybrisa Alpha 0.24

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.24

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed

Commits on Mar 10, 2024

Add files via upload
Zenith00000
authored

Commits on Mar 13, 2024

Hybrisa Alpha 0.25

Zenith
authored and
Zenith
committed

Commits on Mar 15, 2024

Hybrisa Alpha 0.26

Zenith
authored and
Zenith
committed

Commits on Mar 17, 2024

Hybrisa Alpha 0.27

Zenith
authored and
Zenith
committed

Commits on Mar 19, 2024

Hybrisa Alpha 0.28

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.29

Zenith
authored and
Zenith
committed

Commits on Mar 21, 2024

Hybrisa Alpha 0.30

Zenith
authored and
Zenith
committed

Commits on Mar 24, 2024

Hybrisa Alpha 0.31

Zenith
authored and
Zenith
committed

Commits on Mar 28, 2024

Hybrisa Alpha 0.32

Zenith
authored and
Zenith
committed

Commits on Apr 1, 2024

Hybrisa Alpha 0.33

Zenith
authored and
Zenith
committed

Commits on Apr 2, 2024

Hybrisa Alpha 0.34

Zenith
authored and
Zenith
committed

Commits on Apr 3, 2024

Hybrisa Alpha 0.35

Zenith
authored and
Zenith
committed

Commits on Apr 6, 2024

Hybrisa Alpha 0.36

Zenith
authored and
Zenith
committed

Commits on Apr 7, 2024

Hybrisa Alpha 0.37

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.38

Zenith
authored and
Zenith
committed

Commits on Apr 9, 2024

Hybrisa Alpha 0.39

Zenith
authored and
Zenith
committed

Commits on Apr 13, 2024

Hybrisa 0.40

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.41

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.42

Zenith
authored and
Zenith
committed

Commits on Apr 15, 2024

Hybrisa Alpha 0.43

Zenith
authored and
Zenith
committed

Commits on Apr 17, 2024

Hybrisa Alpha 0.44

Zenith
authored and
Zenith
committed

Commits on Apr 20, 2024

Hybrisa Alpha 0.45

Zenith
authored and
Zenith
committed

Commits on Apr 21, 2024

Hybrisa Alpha 0.45

Zenith
authored and
Zenith
committed
electrified fences baseground
uuuuhuuuu
committed
Merge pull request #11 from cuberound/electrified-fences
Zenith00000
authored
Hybrisa Alpha 0.46

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed
humans get zapped, insualted gloves work, they do not ling with normal fances
uuuuhuuuu
committed
eh
uuuuhuuuu
committed
failing destroy changes
uuuuhuuuu
committed

Commits on Apr 22, 2024

Merge pull request #12 from cuberound/electrified-fences
Zenith00000
authored
Hybrisa Alpha 0.47

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.48

Zenith
authored and
Zenith
committed
fixed crusher charge, now only cuts it down
uuuuhuuuu
committed
crusher handeled and sparks too
uuuuhuuuu
committed

Commits on Apr 23, 2024

Merge pull request #13 from cuberound/electrified-fences
Zenith00000
authored
Hybrisa Alpha 0.49

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed

Commits on Apr 24, 2024

Hybrisa Alpha 0.50

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.51

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.51

Zenith
authored and
Zenith
committed

Commits on Apr 26, 2024

charger and explosion resistance
uuuuhuuuu
committed
Merge pull request #14 from cuberound/electrified-fences
Zenith00000
authored
Hybrisa Alpha 0.52

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed

Commits on Apr 27, 2024

Hybrisa Alpha 0.53

Zenith
authored and
Zenith
committed

Commits on Apr 28, 2024

Hybrisa Alpha 0.54

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.55

Zenith
authored and
Zenith
committed

Commits on Apr 29, 2024

update_icon for vehicled
uuuuhuuuu
committed
m
uuuuhuuuu
committed
Merge pull request #15 from cuberound/updateiconforvehicled
Zenith00000
authored
Hybrisa Alpha 0.56

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed

Commits on Apr 30, 2024

slashing
uuuuhuuuu
committed
Merge pull request #16 from cuberound/car-slashing
Zenith00000
authored
Hybrisa Alpha 0.57

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.58

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.59

Zenith
authored and
Zenith
committed
icon update
uuuuhuuuu
committed
Merge pull request #17 from cuberound/electricity-electrified
Zenith00000
authored
Hybrisa Alpha 0.60

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed

Commits on May 1, 2024

Hybrisa Alpha 0.61

Zenith
authored and
Zenith
committed

Commits on May 2, 2024

Hybrisa Alpha 0.62

Zenith
authored and
Zenith
committed
handrails on hybrisa do not drop objects
uuuuhuuuu
committed
it goes BOOM lets goooooo
uuuuhuuuu
committed
Merge pull request #19 from cuberound/mining-explosives
Zenith00000
authored
Merge pull request #18 from cuberound/rodeblockchanges
Zenith00000
authored
Hybrisa Alpha 0.63

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed

Commits on May 3, 2024

minor fence cleanup and trafic lights, please test I am not able right now
uuuuhuuuu
committed
Hybrisa Alpha 0.64

Zenith
authored and
Zenith
committed
Merge pull request #20 from cuberound/traficLights
Zenith00000
authored
Hybrisa Alpha 0.65

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.66

Zenith
authored and
Zenith
committed

Commits on May 4, 2024

Hybrisa Alpha 0.67

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.68

Zenith
authored and
Zenith
committed

Commits on May 5, 2024

lights shining
uuuuhuuuu
committed
colours and stuff
uuuuhuuuu
committed
Hybrisa Alpha 0.69

Zenith
authored and
Zenith
committed
Merge pull request #21 from cuberound/lights-in-crashed-ship
Zenith00000
authored
Hybrisa Alpha 0.70

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into Hybrisa

Zenith
authored and
Zenith
committed
Merge branch 'Hybrisa' into lights-in-crashed-ship
Zenith00000
authored
Merge pull request #22 from cuberound/lights-in-crashed-ship
Zenith00000
authored
Hybrisa Alpha 0.71

Zenith
authored and
Zenith
committed
Hybrisa Alpha 0.72

Zenith
authored and
Zenith
committed

Commits on May 6, 2024

Commits on May 8, 2024

Commits on May 10, 2024

Commits on May 12, 2024

Commits on May 15, 2024

Commits on Jun 17, 2024

Merge branch 'cmss13-devs:master' into Zenith-master
Zenith00000
authored

Commits on May 5, 2026

Commits on May 6, 2026

Merge branch 'Fire_Colony' of https://github.com/Zenith00000/cmss13 into Fire_Colony
BOBAMAx
committed