Commit Graph

30725 Commits

Author SHA1 Message Date
SandPoot
003eec1850 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-to-action-buttons 2024-01-07 02:09:58 -03:00
deathride58
ae557a1df5 Merge pull request #16055 from SandPoot/point-bubbles
Pointing at something on yourself now shows the item
2024-01-06 22:51:35 -05:00
deathride58
e7fd497895 Merge pull request #16053 from SandPoot/extra-huds
Changes operative hud and adds three more
2024-01-06 22:51:28 -05:00
deathride58
6c601f18fb Merge pull request #16054 from SandPoot/solves-borg-mat-storage-issues
Solves borg material storage issues
2024-01-06 22:50:27 -05:00
SandPoot
387b4b236c push 2024-01-07 00:37:16 -03:00
SandPoot
8eab55aaa6 fix stacks leaving stuff in unexpected ways 2024-01-06 18:56:46 -03:00
SandPoot
f497c4d09e delete if not in borg 2024-01-06 18:56:17 -03:00
SandPoot
76e7ffc80d push 2024-01-06 17:36:02 -03:00
SandPoot
6d7321b0c4 okay so this is necessary 2024-01-05 22:09:21 -03:00
SandPoot
51c1c2abc9 huds! 2024-01-05 17:07:54 -03:00
SandPoot
00b30e0672 stoppable 2024-01-05 12:53:42 -03:00
deathride58
70b1a776a5 Merge pull request #16050 from SandPoot/split-radial
Puts Radials on splitting stacks for quick splits
2024-01-04 22:51:19 -05:00
SandPoot
c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot
05e2cc0979 there 2024-01-05 00:18:21 -03:00
SandPoot
a8be340925 fix constructs follow-up pr 2024-01-03 22:46:19 -03:00
SandPoot
7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot
e5146066eb Update code/game/objects/items/stacks/stack.dm 2024-01-03 18:51:09 -03:00
SandPoot
b82dd9d7a5 no "ALL" option 2024-01-02 14:16:10 -03:00
SandPoot
3bacf0a1dc push 2024-01-01 23:35:28 -03:00
deathride58
c660811fe8 Merge pull request #16027 from DeltaFire15/modsuit-updates
Some modsuit updates
2024-01-01 21:08:56 -05:00
SandPoot
20d80858b6 solve minor issues real quick 2023-12-31 15:53:38 -03:00
deathride58
9217fcc7dc Merge pull request #16043 from SandPoot/stacks
Make stacks show how much there are in inventory
2023-12-29 22:57:38 -05:00
SandPoot
272879367f solution for numerical display bags 2023-12-30 00:31:57 -03:00
deathride58
c95f60c37b Merge pull request #16034 from BlueWildrose/TransRightsAreHumanRights
Adds decal patterns to LGBT holidays + Pansexual and Panromantic Awareness Day holiday
2023-12-29 22:05:37 -05:00
deathride58
15e1858862 Merge pull request #16045 from Putnam3145/eggnog-fix
Adds non-alcoholic eggnog
2023-12-29 22:04:59 -05:00
SandPoot
6733de69bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stacks 2023-12-29 23:16:11 -03:00
SandPoot
2ab6c62ee6 prevent hit 2023-12-29 23:07:24 -03:00
deathride58
ce1d757159 Merge pull request #16016 from SandPoot/throwing-update
[TESTMERGE] Updates firemanning, throwing stuff
2023-12-28 22:44:59 -05:00
SandPoot
2585c545fa not necessary 2023-12-28 00:37:23 -03:00
Putnam3145
4ded956613 actually it's 33% rum why is it not 33% the power 2023-12-23 14:57:34 -08:00
Putnam3145
78982c2e6f typos and other such issues 2023-12-23 14:49:46 -08:00
Putnam3145
e65f386de9 Makes eggnog not alcoholic 2023-12-23 14:22:58 -08:00
SandPoot
b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -03:00
SandPoot
de3c8435b5 thanks for saying it was a brain, you guys are the best 2023-12-17 23:43:54 -03:00
SandPoot
653b767f32 remove antags for borging... 2023-12-17 23:35:51 -03:00
SandPoot
27bdd4b732 aiModule > ai_module 2023-12-17 23:20:43 -03:00
SandPoot
7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot
7533d51ae4 is_cyborg 2023-12-13 13:07:10 -03:00
SandPoot
35723b9bd7 field access... 2023-12-13 12:55:33 -03:00
SandPoot
606ffd5b1e just get rid of these issues already 2023-12-13 12:52:50 -03:00
SandPoot
c182a337fe poosh 2023-12-13 00:24:57 -03:00
SandPoot
f626df9d1d push 2023-12-13 00:08:58 -03:00
deathride58
3e45c18ab4 Merge pull request #16038 from SandPoot/fix-lava+borgs
Deals with lava plus a lot of borg stuff
2023-12-12 19:25:13 -05:00
deathride58
4e39bef762 Merge pull request #16040 from SandPoot/better-countdown-effect
Makes countdown objects follow their targets better
2023-12-12 19:21:51 -05:00
deathride58
e729badcd2 Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable)
Maptext()s the maptexts
2023-12-12 19:21:17 -05:00
SandPoot
f95f776547 push 2023-12-11 18:30:19 -03:00
SandPoot
e457f40328 maptext 2023-12-11 17:43:24 -03:00
SandPoot
c1ec13b1bf maybe final 2023-12-07 23:55:44 -03:00
SandPoot
c36105ef88 holy hell 2023-12-07 23:08:17 -03:00
deathride58
a91e0990a2 Merge pull request #16037 from SandPoot/fontawesome
Bumps up FontAwesome to 6.1.2
2023-12-06 14:58:31 -05:00