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

Commits on Jan 21, 2024

  1. hybrisa alpha test

    Zenith authored and Zenith committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    157005c View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Configuration menu
    Copy the full SHA
    c923182 View commit details
    Browse the repository at this point in the history
  2. Hybrisa alpha 1.01

    Zenith authored and Zenith committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    9afaf9a View commit details
    Browse the repository at this point in the history
  3. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …

    …Hybrisa
    Zenith authored and Zenith committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    4ade7d4 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Hybrisa Alpha 1.02

    Zenith authored and Zenith committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    3b922f7 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2024

  1. Hybrisa 1.03

    Zenith authored and Zenith committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    a70f270 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. rollerbed stuff

    Birdtalon committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    c2c7960 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. more roller bed stuff

    Birdtalon committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    7a89742 View commit details
    Browse the repository at this point in the history
  2. qdel

    Birdtalon committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    90c4638 View commit details
    Browse the repository at this point in the history
  3. Revert "rollerbed stuff"

    This reverts commit c2c7960.
    Birdtalon committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    bfc1584 View commit details
    Browse the repository at this point in the history
  4. Hybrisa Alpha 1.04

    Zenith authored and Zenith committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    fbc4dd5 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Hospital and Fixes

    Hospital and Fixes
    Nanu308 committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    3dd790c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #3 from Birdtalon/Hybrisa

    Roller Beds V1
    Zenith00000 committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    fd4c8a4 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #5 from Nanu308/nanu/hybrisa_medical_n_fixes

    Hospital and Fixes
    Zenith00000 committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    f045ddd View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Hybrisa Alpha 1.05

    Zenith authored and Zenith committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    81171ac View commit details
    Browse the repository at this point in the history
  2. Hybrisa 1.06

    Zenith authored and Zenith committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    b62605f View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. Hybrisa 1.07

    Zenith authored and Zenith committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    9ec14ba View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2024

  1. 1.08

    Zenith authored and Zenith committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    fbd3c9c View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2024

  1. Hybrisa Alpha 1.09

    Zenith authored and Zenith committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    e3fc74f View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. Hybrisa Alpha 1.10

    Zenith authored and Zenith committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    92277cd View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Hybrisa Alpha 1.11

    Zenith authored and Zenith committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    58758de View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. Hybrisa 1.12

    Zenith authored and Zenith committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    0d6e5d0 View commit details
    Browse the repository at this point in the history
  2. Hybrisa Alpha 0.13

    Zenith authored and Zenith committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    0d9ac5a View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Hybrisa Alpha 0.14

    Zenith authored and Zenith committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    1610d40 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Hybrisa Alpha 0.15

    Zenith authored and Zenith committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    a151613 View commit details
    Browse the repository at this point in the history
  2. Hybrisa Alpha 0.16

    Zenith authored and Zenith committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    c718cf5 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Hybrisa Alpha 0.17

    Zenith authored and Zenith committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e53174f View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. Hybrisa Alpha 0.18

    Zenith authored and Zenith committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    962de5f View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Hybrisa Alpha 0.19

    Zenith authored and Zenith committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    e716629 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Hybrisa voting cryege

    Hybrisa voting cryege
    Nanu308 committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    21173e2 View commit details
    Browse the repository at this point in the history
  2. Make map voteable

    Make map voteable
    Nanu308 committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    1afad65 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Merge pull request #6 from Nanu308/nanu/hybrisa-lights-tweaks

    Voteable + minor tweaks and compile fixes.
    Zenith00000 committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    7ffd4ba View commit details
    Browse the repository at this point in the history
  2. Hybrisa Alpha 0.20

    Zenith authored and Zenith committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    dce7813 View commit details
    Browse the repository at this point in the history
  3. Hybrisa Alpha 0.21

    Zenith authored and Zenith committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    e46b304 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Hybrisa Alpha 0.22

    Zenith authored and Zenith committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    a845002 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Hybrisa Alpha 0.23

    Zenith authored and Zenith committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    6b5af47 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0090d75 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #7 from Zenith00000/revert-6-nanu/hybrisa-lights-t…

    …weaks
    
    Revert "Voteable + minor tweaks and compile fixes."
    Zenith00000 committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    438f046 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    93d67ad View commit details
    Browse the repository at this point in the history
  5. Merge pull request #8 from Zenith00000/revert-7-revert-6-nanu/hybrisa…

    …-lights-tweaks
    
    Revert "Revert "Voteable + minor tweaks and compile fixes.""
    Zenith00000 committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    02011c9 View commit details
    Browse the repository at this point in the history
  6. Hybrisa Alpha 0.24

    Zenith authored and Zenith committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    3b18be9 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …

    …Hybrisa
    Zenith authored and Zenith committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    a7e796a View commit details
    Browse the repository at this point in the history
  8. Hybrisa Alpha 0.23 (Car_Factory)

    Zenith authored and Zenith committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    9dc3837 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. Hybrisa Alpha 0.24

    Zenith authored and Zenith committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    703ef80 View commit details
    Browse the repository at this point in the history
  2. Hybrisa Alpha 0.24

    Zenith authored and Zenith committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    1770595 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …

    …Hybrisa
    Zenith authored and Zenith committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    6b7c77c View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2024

  1. Add files via upload

    Can't upload via VSC for some reason
    Zenith00000 committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    c911177 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Hybrisa Alpha 0.25

    Zenith authored and Zenith committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    70b423e View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Hybrisa Alpha 0.26

    Zenith authored and Zenith committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    4a27f62 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. Hybrisa Alpha 0.27

    Zenith authored and Zenith committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    5be7b28 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Hybrisa Alpha 0.28

    Zenith authored and Zenith committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    cce3c4e View commit details
    Browse the repository at this point in the history
  2. Hybrisa Alpha 0.29

    Zenith authored and Zenith committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    e4dcaa3 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Hybrisa Alpha 0.30

    Zenith authored and Zenith committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    b74e532 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2024

  1. Hybrisa Alpha 0.31

    Zenith authored and Zenith committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    86641c9 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Hybrisa Alpha 0.32

    Zenith authored and Zenith committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    5004417 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Hybrisa Alpha 0.33

    Zenith authored and Zenith committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    3513dfa View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Hybrisa Alpha 0.34

    Zenith authored and Zenith committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    a7e0762 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Hybrisa Alpha 0.35

    Zenith authored and Zenith committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    d993665 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. Hybrisa Alpha 0.36

    Zenith authored and Zenith committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    68be08d View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2024

  1. Hybrisa Alpha 0.37

    Zenith authored and Zenith committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    f9e060f View commit details
    Browse the repository at this point in the history
  2. Hybrisa Alpha 0.38

    Zenith authored and Zenith committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    5b347d6 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Hybrisa Alpha 0.39

    Zenith authored and Zenith committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    d0cc1ac View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2024

  1. Hybrisa 0.40

    Zenith authored and Zenith committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    733dde5 View commit details
    Browse the repository at this point in the history
  2. Hybrisa Alpha 0.41

    Zenith authored and Zenith committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    75bd847 View commit details
    Browse the repository at this point in the history
  3. Hybrisa Alpha 0.42

    Zenith authored and Zenith committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    362d9ba View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Hybrisa Alpha 0.43

    Zenith authored and Zenith committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    daf8849 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Hybrisa Alpha 0.44

    Zenith authored and Zenith committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    6992007 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. Hybrisa Alpha 0.45

    Zenith authored and Zenith committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    64385c7 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2024

  1. Hybrisa Alpha 0.45

    Zenith authored and Zenith committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    5e66270 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6ec2976 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #11 from cuberound/electrified-fences

    electrified fences baseground
    Zenith00000 committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    10a35fc View commit details
    Browse the repository at this point in the history
  4. Hybrisa Alpha 0.46

    Zenith authored and Zenith committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    95b99fc View commit details
    Browse the repository at this point in the history
  5. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …

    …Hybrisa
    Zenith authored and Zenith committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    47dc548 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9769168 View commit details
    Browse the repository at this point in the history
  7. eh

    uuuuhuuuu committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    ba57b5e View commit details
    Browse the repository at this point in the history
  8. failing destroy changes

    uuuuhuuuu committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    45b0e30 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Merge pull request #12 from cuberound/electrified-fences

    humans get zapped, insualted gloves work, they do not ling with normal you can shoot thrue
    Zenith00000 committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    4320af3 View commit details
    Browse the repository at this point in the history
  2. Hybrisa Alpha 0.47

    Zenith authored and Zenith committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    21536f8 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …

    …Hybrisa
    Zenith authored and Zenith committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    13b94fd View commit details
    Browse the repository at this point in the history
  4. Hybrisa Alpha 0.48

    Zenith authored and Zenith committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    ee06c66 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    36bd756 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bea6962 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Merge pull request #13 from cuberound/electrified-fences

    Electrified fences
    Zenith00000 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    4c7c049 View commit details
    Browse the repository at this point in the history
  2. Hybrisa Alpha 0.49

    Zenith authored and Zenith committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    3d2b434 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …

    …Hybrisa
    Zenith authored and Zenith committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    01d8692 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Hybrisa Alpha 0.50

    Zenith authored and Zenith committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    74f4810 View commit details
    Browse the repository at this point in the history
  2. Hybrisa Alpha 0.51

    Zenith authored and Zenith committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    b13348e View commit details
    Browse the repository at this point in the history
  3. Hybrisa Alpha 0.51

    Zenith authored and Zenith committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    0430a8b View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Configuration menu
    Copy the full SHA
    3cae1d1 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #14 from cuberound/electrified-fences

    charger and explosion resistance
    Zenith00000 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    a8bdd15 View commit details
    Browse the repository at this point in the history
  3. Hybrisa Alpha 0.52

    Zenith authored and Zenith committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    37e760b View commit details
    Browse the repository at this point in the history
  4. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …

    …Hybrisa
    Zenith authored and Zenith committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    8a471a4 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. Hybrisa Alpha 0.53

    Zenith authored and Zenith committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    0497701 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2024

  1. Hybrisa Alpha 0.54

    Zenith authored and Zenith committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    4d2b0ca View commit details
    Browse the repository at this point in the history
  2. Hybrisa Alpha 0.55

    Zenith authored and Zenith committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    7c4c58c View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. update_icon for vehicled

    uuuuhuuuu committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    9da1bb9 View commit details
    Browse the repository at this point in the history
  2. m

    uuuuhuuuu committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    49062ec View commit details
    Browse the repository at this point in the history
  3. Merge pull request cmss13-devs#15 from cuberound/updateiconforvehicled

    Update_icon for vehicles
    Zenith00000 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    7b212ff View commit details
    Browse the repository at this point in the history
  4. Hybrisa Alpha 0.56

    Zenith authored and Zenith committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    0649b37 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …

    …Hybrisa
    Zenith authored and Zenith committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    3e7fffa View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. slashing

    uuuuhuuuu committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    a85161d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    963837b View commit details
    Browse the repository at this point in the history
  3. Hybrisa Alpha 0.57

    Zenith authored and Zenith committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    7ab985a View commit details
    Browse the repository at this point in the history
  4. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …

    …Hybrisa
    Zenith authored and Zenith committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    b3ebb2e View commit details
    Browse the repository at this point in the history
  5. Hybrisa Alpha 0.58

    Zenith authored and Zenith committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    271e299 View commit details
    Browse the repository at this point in the history
  6. icon update

    uuuuhuuuu committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    cd74a52 View commit details
    Browse the repository at this point in the history