Commit Graph

4748 Commits

Author SHA1 Message Date
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
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
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
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
SandPoot
272879367f solution for numerical display bags 2023-12-30 00:31:57 -03: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
deathride58
ce1d757159 Merge pull request #16016 from SandPoot/throwing-update
[TESTMERGE] Updates firemanning, throwing stuff
2023-12-28 22:44:59 -05: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
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
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
af33de25b4 the commit 2023-10-03 14:22:05 -03:00
SandPoot
3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
SandPoot
19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
Jerry Wester
44c029176c remove signals_atom_movable.dm, revert jetpack 2023-05-01 00:19:48 -05:00
KrissKr0ss
66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
silicons
6efd3098d4 Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
2023-03-04 23:36:36 -08:00
SandPoot
2bdec078d7 Merge pull request #311 from Sandstorm-Station/duct-piping
Several duct pipe fixes/qol
2023-02-21 16:44:35 -03:00
SandPoot
2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00
Timothy Teakettle
71de9c13e3 Merge pull request #15962 from SandPoot/contextual-screentips
Contextual screentips -- Screentips now show you what items/objects can do
2023-02-15 23:04:54 +00:00
Timothy Teakettle
5f6e204866 Merge pull request #15940 from squib-bot/fermichemwork
Re-Adding Bounty Consoles
2023-02-11 00:06:37 +00:00
SandPoot
78c28a40c7 sneaky hint about reskinning 2023-02-09 02:54:31 -03:00
SandPoot
4491abc2d7 updates to most recent version and puts intent hints! 2023-02-09 02:20:02 -03:00
SandPoot
1b1154260c correct everything and some intention based checks 2023-02-08 02:17:57 -03:00
SandPoot
b955bc222b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-02-06 20:24:35 -03:00
SandPoot
ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
zerothebigboy
091d9ec00f good 2023-01-30 00:01:22 -05:00
zerothebigboy
b8bc94ba13 man 2023-01-29 00:49:55 -05:00