Commit Graph

47384 Commits

Author SHA1 Message Date
SandPoot d287fc25ca poosh 2023-02-21 01:55:49 -03:00
Timothy Teakettle b86c508b5a Merge pull request #15954 from SandPoot/new-decal-painter
Updates airlock painter, decal painter, adds tile sprayer
2023-02-15 23:06:55 +00: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
SandPoot 6c0aedeb4c Merge pull request #15970 from Putnam3145/fix-shuttle-event-2
Fix shuttle catastrophe happening during transit
2023-02-12 22:20:31 -03:00
Putnam3145 008eedfedc Fix shuttle catastrophe happening during transit 2023-02-12 17:12:52 -08: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 c1e8039c11 source 2023-02-09 03:00:56 -03:00
SandPoot 78c28a40c7 sneaky hint about reskinning 2023-02-09 02:54:31 -03:00
SandPoot d29ce2328c some extra touches 2023-02-09 02:25:34 -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 9e2851b76b donator. 2023-02-06 20:01:47 -03:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
Timothy Teakettle 7e77bc8023 Merge pull request #15963 from zeroisthebiggay/sickkicks
sick kicks: tg/skyrat boot sprite theft
2023-02-03 09:54:04 +00: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
zerothebigboy d93dcf5b76 sickkicks 2023-02-01 08:25:30 -05:00
Timothy Teakettle c357986b62 Merge pull request #15957 from zeroisthebiggay/wendigo
the tg wendigo resprite
2023-02-01 00:53:55 +00:00
Timothy Teakettle 6723c0166e Merge pull request #15960 from zeroisthebiggay/glasses
the tg gloves resprite
2023-02-01 00:53:42 +00:00
Timothy Teakettle 2f6d2e838b Merge pull request #15959 from zeroisthebiggay/fire
new mob fire sprites
2023-02-01 00:53:29 +00:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
Lin a1cdb4705a Merge pull request #15955 from SandPoot/fix-surgery-ui
Fixed the operating computer displaying alternative steps.
2023-01-29 22:52:29 -07:00
zerothebigboy 65a0bce02d yeppers 2023-01-29 23:07:37 -05:00
zerothebigboy c17c7fd53b realest 2023-01-29 22:56:35 -05:00
zerothebigboy 8776b8c0cc epic 2023-01-29 22:35:59 -05:00
zerothebigboy a7dd149203 shrimple 2023-01-29 22:19:56 -05:00
zerothebigboy c10b026492 yeah 2023-01-29 22:01: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
silicons fec5653da6 Merge pull request #15949 from SandPoot/fix-solar-runtimes
Turns out the glass type giving you better stats didn't work
2023-01-29 13:46:21 -08:00
silicons eda34c0dc2 Merge pull request #15946 from LetterN/mentor-sql-fix
update mentor admin log sql query
2023-01-29 13:46:12 -08:00
silicons 5e30dad781 Merge pull request #15942 from LeDrascol/protolathe-ejection-improvements
Protolathe material ejection improvements
2023-01-29 13:46:01 -08:00
silicons bb7f6d1766 Merge pull request #15944 from LeDrascol/fix-sprite-drink-filling
Fix drinking glass sprite issues
2023-01-29 13:45:48 -08:00
silicons e7a9edbc6f Merge pull request #15953 from SandPoot/fix-pen-tablet
Fixes the tablet pen buttons
2023-01-29 13:42:29 -08:00
silicons 172ba1c4e3 Merge pull request #15951 from zeroisthebiggay/bat
tg det baton resprite `limited editon bat inside`
2023-01-29 13:38:54 -08:00
silicons 411bc2d81b Merge pull request #15925 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/follow-redirects-1.15.2
Bump follow-redirects from 1.13.2 to 1.15.2 in /tgui
2023-01-29 13:37:34 -08:00
zerothebigboy 73d0395cb5 realest 2023-01-29 08:17:01 -05:00
zerothebigboy e76221f68b yeppers 2023-01-29 03:57:32 -05:00
zerothebigboy b8bc94ba13 man 2023-01-29 00:49:55 -05:00
SandPoot 5ea481089b push 2023-01-28 21:36:23 -03:00
SandPoot d53c010745 gone 2023-01-28 15:47:18 -03:00
SandPoot bf31279109 prayer 2023-01-28 01:28:47 -03: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 a56247f828 oops? 2023-01-28 01:18:35 -03:00
SandPoot c60f36a42b files 2023-01-28 01:10:49 -03:00
SandPoot 32a36a1bfa put back 2023-01-27 23:03:47 -03:00