15 Commits
Author SHA1 Message Date
BongaTheProto dc057a41ad Merge branch 'master' into upstream-merge 2024-04-06 18:51:51 -05:00
Elizabeth Lavenza d50794333f Fix zweihander kinetic crusher runtimes 2024-04-01 23:32:38 -04: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
BongaTheProto 596ab81dd0 Merge remote-tracking branch 'upstream/master' 2023-01-16 01:06:20 -05:00
SandPootandGitHub 0fe80e9234 Puts span defines on sandstorm's strings (#284) 2023-01-15 00:40:48 -03:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
BongaTheProtoandGitHub f10b89515e Merge pull request #245 from CloverIsLucky/patch-2
[Semi-modular]Shambler mask nerf.
2022-03-10 20:01:51 -06:00
SandPoot 1825d224bf Fuck 2022-03-09 23:56:02 -03:00
SandPoot 357e11cd84 Better fix of this big stupid 2022-03-09 23:49:44 -03:00
CloverIsLuckyandGitHub 1813d21438 Shambler mask nerf.
Now IT is a more cheaper version of colossus' blaster flutes.
2022-03-09 20:39:39 -06:00
SandPoot 43cac7ff46 Abuse this ya fucks. 2022-03-05 12:36:49 -03:00
SandPoot 8cdb28f163 upload files 2021-04-21 20:16:45 -03:00
c8082e1009 Compliance with standards (#134)
* enjoy

* Update shuttles.dm

sowwy

Co-authored-by: Maksxpl <18237380+maksxpl@users.noreply.github.com>
2021-01-19 12:44:08 -03:00