820 Commits
Author SHA1 Message Date
Mosley e286bd40f3 Merge remote-tracking branch 'upstream/master' 2024-08-27 15:43:55 -05:00
SandPoot dc08550162 push 2024-08-25 04:38:03 -03:00
Elizabeth Lavenza a639499d3a Fix invalid gun overlays 2024-04-16 02:25:20 -04:00
Elizabeth Lavenza 0b4dcfd73a Fix invalid gun overlays 2024-04-16 02:19:41 -04:00
Elizabeth Lavenza 2f683eee31 Fix string cell types 2024-04-16 01:20:59 -04:00
Elizabeth Lavenza b25da4ba53 Fix invalid gun overlays 2024-04-16 01:20:59 -04:00
Elizabeth Lavenza e74d787bf1 Fix string cell types 2024-04-16 01:14:28 -04:00
Elizabeth Lavenza 86c1a2eeaa Fix invalid gun overlays 2024-04-16 01:14:28 -04:00
Elizabeth Lavenza e37fbc72e0 Fix miniature egun overlays 2024-04-13 20:14:19 -04:00
Elizabeth Lavenza 54f584fa80 Fix instakill laser rifle overlays 2024-04-13 20:14:19 -04:00
Elizabeth Lavenza 8d7048a902 Fix scattershot rifle charge overlay 2024-04-13 20:14:19 -04:00
Elizabeth Lavenza 97b53dc6a7 Fix cyborg mounted laser icons 2024-04-13 20:14:19 -04:00
Elizabeth Lavenza 842db396c4 Fix SPLURT-specific icon runtimes 2024-04-13 20:10:50 -04:00
Elizabeth Lavenza 42eb876f61 Fix miniature egun overlays 2024-04-13 20:03:56 -04:00
Elizabeth Lavenza 1ccc16cae9 Fix instakill laser rifle overlays 2024-04-13 20:03:55 -04:00
Elizabeth Lavenza 86a97e732a Fix scattershot rifle charge overlay 2024-04-13 20:03:55 -04:00
Elizabeth Lavenza 160ec104ab Fix cyborg mounted laser icons 2024-04-13 20:03:55 -04:00
BongaTheProto 1e1fc329f8 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-04-13 14:12:39 -05:00
SandPoot 36bc86cf9c guns... potat 2024-04-12 23:44:29 -03:00
SandPoot 4af0628c8b woo 2024-04-12 22:36:44 -03:00
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot c36105ef88 holy hell 2023-12-07 23:08:17 -03:00
SandPoot a558377206 more stuff i can't guarantee works by itself yet 2023-11-29 23:37:15 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProto 620380e188 Merge remote-tracking branch 'upstream/master' 2023-01-21 13:15:29 -05:00
SandPootandGitHub c5987c6c79 More mining ror reskin (#290) 2023-01-21 13:52:00 -03:00
BongaTheProto d6aa3acbd4 Merge remote-tracking branch 'upstream/master' 2023-01-09 17:08:06 -05:00
SandPootandGitHub 2a772c8482 Adds the commando skin from ror & ror2 to the mining hardsuit (#280)
* first commit with everything

* quick fix and little extra usage!

* the boy

* previous could break

* better head
2023-01-09 18:55:07 -03:00
SandPoot f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
BongaTheProto e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
shellspeed1 15006a5dfd Revert "adds gun safeties, remember to turn them off."
This reverts commit 9ca985b769.
2022-09-17 06:47:26 -07:00
shellspeed1 9ca985b769 adds gun safeties, remember to turn them off. 2022-09-16 19:24:21 -07:00
shellspeed1 91c095989a stuff 2022-09-16 17:55:10 -07:00
shellspeed1 bc13bdb177 sort of working fire selector, still need to get the safety stuff figured out and finish getting the selector working properly 2022-09-09 22:23:05 -07:00
shellspeed1 f2ed6a571c this gets it to the point it compiles 2022-09-09 18:04:52 -07:00
shellspeed1 fbc80cf829 initial port 2022-09-09 00:29:20 -07:00
BongaTheProto 3341812b44 Merge remote-tracking branch 'upstream/master' 2022-08-20 17:16:19 -05:00
SandPoot 550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
zerothebigboy 4c2fc18a0a cheesed to meet you 2022-08-10 11:13:58 -04:00
BongaTheProto 9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
SandPoot 6108e1d522 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 19:46:26 -03:00