Commit Graph

10336 Commits

Author SHA1 Message Date
SandPoot
a034a96fc2 part 2 2023-10-02 13:54:40 -03:00
silicons
98c0f38de3 Merge pull request #15999 from SandPoot/do_after
Implements timed_action_flags for do_after-like procs
2023-09-14 17:59:55 -07:00
SandPoot
51bf703ca7 no 2023-09-09 15:56:48 -03:00
SandPoot
3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
Katherine Kiefer
16a490ee5c update auxmos 2023-08-18 22:13:30 +10:00
SandPoot
9421423ed5 Merge branch 'master' into changeling-update 2023-07-26 22:22:14 -03:00
SandPoot
11aa13e4e8 part 1 - 41928 2023-07-26 21:45:43 -03:00
SandPoot
86cc2c0b0d must return 2023-07-19 20:57:09 -03:00
SandPoot
19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
Lin
3c3f609541 Merge pull request #15989 from SandPoot/screentip-update
Update screentips
2023-07-19 15:53:38 -05:00
SandPoot
217e23fc7f push 2023-07-18 15:22:24 -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
SandPoot
a1ab60fd07 push 2023-04-08 22:47:48 -03:00
Lin
654e5dad9d Merge pull request #15864 from Putnam3145/auxmos-2
UPDATE AUXMOS TO 2.0.0 (TESTMERGE THIS HOLY CRAP)
2023-04-01 00:17:22 -07: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
69a487e3bd Merge pull request #15973 from SandPoot/screentips-update
Screentips context help now have advanced, fancy icons (with a way to disable it for only text)
2023-02-23 21:49:51 -07: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
b2f7fc5a9e over action buttons also very cool you guy that hates my fancy hints, hope you know how to do everything 2023-02-24 01:07:27 -03: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
1f6338189a new icon with adjustments for it 2023-02-19 14:29:25 -03:00
SandPoot
09ebd0fddf lizard content 2023-02-19 03:46:36 -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
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
5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
Timothy Teakettle
f40584685b Merge pull request #15952 from zeroisthebiggay/sabre
very ready sabre resprite and minor sprite tweaks
2023-02-03 09:53:15 +00:00
Timothy Teakettle
560fbd3ffb Merge pull request #15956 from zeroisthebiggay/posters
poster resprite bottom text
2023-02-03 09:52:48 +00:00
SandPoot
ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
zerothebigboy
091d9ec00f good 2023-01-30 00:01:22 -05:00
zerothebigboy
8776b8c0cc epic 2023-01-29 22:35:59 -05:00
zerothebigboy
c99b22fe32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre
# Conflicts:
#	icons/obj/items_and_weapons.dmi
2023-01-29 21:59:01 -05:00
silicons
469ac02274 Merge pull request #15950 from SandPoot/trigger-events-tgui
Event menu rewrite
2023-01-29 13:46:39 -08:00
zerothebigboy
e76221f68b yeppers 2023-01-29 03:57:32 -05:00
zerothebigboy
b8bc94ba13 man 2023-01-29 00:49:55 -05:00
SandPoot
44913d5fff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-01-28 01:20:26 -03:00
SandPoot
c60f36a42b files 2023-01-28 01:10:49 -03:00
SandPoot
54641ce201 send 2023-01-23 20:44:28 -03:00