245 Commits

Author SHA1 Message Date
Mosley 0d9eebd20c Merge remote-tracking branch 'upstream/master' 2025-04-24 17:03:15 -05:00
SandPoot f6405100b5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-25 21:46:53 -03:00
SandPoot 3425760ced push 2025-02-25 17:48:02 -03:00
BongaTheProto dbd4505372 Merge remote-tracking branch 'upstream/master' 2024-04-30 19:02:41 -05:00
SandPoot 91a9223df6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-25 17:08:42 -03:00
deathride58 0517ece12a fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon 2024-04-24 22:30:25 -04:00
SandPoot a1a80c5d4f pusher 2024-04-24 20:12:27 -03:00
BongaTheProto dc057a41ad Merge branch 'master' into upstream-merge 2024-04-06 18:51:51 -05:00
Elizabeth Lavenza ccfc08b7a8 Fix attack_hand-related runtimes 2024-04-01 11:33:30 -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
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 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -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
Casper ae399d1d7c Fixes e-chair and shockkit runtimes. 2023-01-14 22:13:00 +00:00
SandPoot c439263757 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-12 13:40:14 -03:00
SandPoot 1888b91536 interaction_flags_item 2022-07-08 20:24:05 -03:00
silicons f3f1a89aa4 Update holder.dm 2022-07-08 13:58:20 -07:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot 2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot 9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot c8df97474b Adds pick-up, drop and throw sounds for items. (#240) 2022-04-01 15:57:30 -03:00
Solaris-Shade 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
SandPoot 67cfd000fe Upload files 2021-12-16 12:57:21 -03:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
Putnam3145 f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
Putnam3145 fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
Putnam 86177c51c4 auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
Putnam d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
necromanceranne 2368968c66 Ports #42721 which happened to resolve this already 2021-03-26 08:45:14 +11:00
Artur 66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur 16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
Letter N a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
Letter N a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
silicons 9ff94e019b Merge pull request #12924 from SiliconMain/analyzer
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
SiliconMain abdafe15fa fuck 2020-07-26 15:21:24 -05:00
Letter N 8e177bf01e another batch - MAJOR: teleportaiton, displaycase (ico port needed), 2020-07-24 19:58:48 +08:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Artur 1682cfd3fd Compile 2020-05-13 13:52:12 +03:00
Artur 5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00