Commit Graph

6480 Commits

Author SHA1 Message Date
SandPoot
8516b07eee please do not end your paths with / 2024-03-13 14:43:40 -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
SandPoot
fcd036dab5 final stuff, i think? 2024-03-07 20:31:53 -03:00
SandPoot
8d283066b6 just force them to update always, it's pretty much what tg does 2024-01-09 00:30:06 -03:00
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
c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot
05e2cc0979 there 2024-01-05 00:18:21 -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
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
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
SandPoot
b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -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
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
SandPoot
f95f776547 push 2023-12-11 18:30:19 -03:00
SandPoot
e457f40328 maptext 2023-12-11 17:43:24 -03: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
BlueWildrose
8e72f5e7c4 code for patterns 2023-11-16 16:32:48 -07:00
SandPoot
b36da8f5d7 Revert "Revert "[DNM] Updates firemanning, throwing stuff""
This reverts commit def4b38a46.
2023-10-12 14:34:02 -03:00
BlueWildrose
def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
SandPoot
c3735c05ac Merge branch 'master' into throwing-updat 2023-10-04 15:15:15 -03:00
SandPoot
5a90dabd3c stuff 2023-10-03 23:22:57 -03:00
Lin
bae4216c20 Merge pull request #16003 from SandPoot/held-plushies
Adds held sprites to plushes
2023-10-03 17:51:26 -04:00
SandPoot
af33de25b4 the commit 2023-10-03 14:22:05 -03:00
SandPoot
a034a96fc2 part 2 2023-10-02 13:54:40 -03:00