313 Commits

Author SHA1 Message Date
SandPoot a085c514d6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2026-02-15 15:41:52 -03:00
SandPoot 40be4145c4 push 2026-02-09 21:30:28 -03:00
SandPoot a2aa92cbc4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-01-24 02:08:58 -03:00
ariaworld 44e507dfef [BEESTATION PORT] Semi-Port of Beestation Decal Fixes, Fixes turf decals disappearing on shuttle movements (#16119)
* SEMI-PORT OF BEESTATION PR #3111: Decal fixes

* Forgot this, rotate flag
2025-01-24 01:47:50 -03:00
SandPoot a103acd509 cavalry's here 2024-09-10 02:00:55 -03:00
xTheLifex 0fbdbb7339 cleaning element with range 2024-09-09 23:06:55 -03:00
SandPoot 909acfb468 push some fixes 2024-09-05 22:47:46 -03:00
SandPoot 75d1a7d69c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-26 04:31:35 -03:00
SandPoot dc08550162 push 2024-08-25 04:38:03 -03:00
SandPoot bc0dc5ee02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-12 19:54:43 -03:00
SandPoot 0fd4dba15b push 2024-08-11 14:10:35 -03:00
SandPoot 95a30412ad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-05-25 15:46:29 -03:00
SandPoot 5852293116 PROC_REF!!!!!! 2024-05-22 00:25:21 -03:00
SandPoot 002a4c31c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-12 22:06:15 -03:00
SandPoot ca8ce67cd6 mail 2024-04-10 20:54:04 -03:00
SandPoot c2df4281b9 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-05 23:31:50 -03:00
SandPoot 68fa21d602 content 2024-04-05 17:57:54 -03: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 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 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -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
SandPoot e30f79b4df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-05 17:22:43 -03:00
SandPoot 05e2cc0979 there 2024-01-05 00:18:21 -03:00
SandPoot 3bacf0a1dc push 2024-01-01 23:35:28 -03:00
SandPoot 4e9ff44ee7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-29 15:49:14 -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 be37603291 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-23 13:28:41 -03:00
SandPoot 7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot c519c1e128 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-21 15:00:51 -03:00
SandPoot 1dc38c46d6 poosh 2023-11-02 23:17:49 -03:00
SandPoot 45a94856c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-18 18:24:11 -03:00
SandPoot 297ee64977 push 2023-10-12 15:45:35 -03: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
SandPoot bb1886ddb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-03 21:00:13 -03:00
SandPoot 8c0a4131ac why did i check for empty hand again? 2023-10-03 14:29:17 -03:00
SandPoot 0b04af4b76 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-14 22:32:47 -03:00
SandPoot 3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
SandPoot 07f5e85c2c override 2023-07-25 13:37:43 -03:00
SandPoot 7e51ef0b98 fix merge 2023-07-23 19:06:55 -03:00
SandPoot ef186347ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-23 18:56:20 -03:00
SandPoot 19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
SandPoot 737c2f200d content 2023-07-12 13:04:01 -03:00
SandPoot 072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03:00
SandPoot c1e8039c11 source 2023-02-09 03:00:56 -03:00