Commit Graph

6459 Commits

Author SHA1 Message Date
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
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
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
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
31e87bc2d7 Safeguard suit 2023-05-01 00:26:56 -05:00
Jerry Wester
22309324dc whitespace should not be syntax grrr 2023-05-01 00:23:09 -05:00
Jerry Wester
8271cf9bc1 move rescue plating to CMO locker 2023-05-01 00:22:59 -05: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
Lin
d003e3faa5 Merge pull request #15979 from SandPoot/reflector-rotat
Reflectors will rotate inside shuttles - Rejoice supermatter shuttle builders
2023-03-15 14:43:40 -07:00
SandPoot
f1eb8fe54f rotat 2023-03-14 15:06:18 -03: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
Lin
00fe11ee3a Merge pull request #15974 from SandPoot/does-aligning-the-correct-way
Does runechat aligning properly
2023-02-23 21:22:03 -07: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
d287fc25ca poosh 2023-02-21 01:55:49 -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
8ea39f9cf4 helpers 2023-02-10 00:39:04 -03:00
Timothy Teakettle
390dcbcea0 Merge pull request #15966 from SandPoot/accessory-equip
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
2023-02-09 21:39:05 +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