SandPoot
9e8a510ed5
chapter 2: allow right click on action buttons
2023-08-26 21:37:06 -03:00
SandPoot
4b9488a9b3
right codebase!
2023-08-05 14:05:00 -03:00
SandPoot
8bf6e9ffcc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-08-05 13:51:50 -03:00
SandPoot
6fb4267b56
upload
2023-08-04 23:26:33 -03:00
SandPoot
c54ce2d09d
wrong codebase
2023-08-04 00:16:53 -03:00
SandPoot
403c49afab
push
2023-08-04 00:11:08 -03:00
SandPoot
789534ac63
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-07-28 18:36:03 -03:00
SandPoot and GitHub
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
8b66a57665
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-07-21 00:23:16 -03:00
Lin and GitHub
77df8655e0
Merge pull request #15990 from SandPoot/lobby-collapse
...
Collapsible lobby buttons
2023-07-20 11:55:29 -05:00
SandPoot
6ab934f6a1
pushies
2023-07-19 15:06:23 -03:00
SandPoot
7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03:00
KrissKr0ss
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
SandPoot
7cc1ecfa1e
(i'm being shot by those red arrows help)
2023-04-06 18:49:21 -03:00
SandPoot
d63c2ebdd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-03-05 12:35:35 -03:00
silicons and GitHub
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
a1823e7ca8
fix pixel shift
2023-02-27 19:36:01 -03:00
SandPoot
f0dcf824a7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-24 01:59:45 -03:00
SandPoot
11a06b1686
pixelshift + layering
2023-02-21 14:27:10 -03:00
SandPoot
992d25ea08
Revert "pixelshift + layering"
...
This reverts commit 51818478c5
2023-02-21 14:25:29 -03:00
SandPoot
51818478c5
pixelshift + layering
2023-02-21 14:20:48 -03:00
SandPoot
d287fc25ca
poosh
2023-02-21 01:55:49 -03:00
SandPoot
072087ec14
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-15 20:22:44 -03:00
Timothy Teakettle and GitHub
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 and GitHub
4a01b9f5e2
Re-UI-ing (just steals old skyrat) ( #302 )
...
* send it
* redefining counts as error, so goodbye
2023-02-13 00:22:01 -03:00
SandPoot
65c38e9828
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-10 02:18:08 -03:00
Timothy Teakettle and GitHub
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
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
5052f836e7
the stuff
2023-02-06 19:54:54 -03:00
SandPoot
ed06e686e1
pushies.
2023-01-31 16:40:17 -03:00
zerothebigboy
091d9ec00f
good
2023-01-30 00:01:22 -05:00
SandPoot
8ae64b1bd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-29 19:16:50 -03:00
silicons and GitHub
469ac02274
Merge pull request #15950 from SandPoot/trigger-events-tgui
...
Event menu rewrite
2023-01-29 13:46:39 -08:00
Darius and GitHub
893a63cd11
[PORT] New quirk: DNC Order ( #293 )
...
* Port DNC quirt
Ports the do-not-clone quirk from SPLURT. This change is not modular.
- Added a fix for cloning heads and brains
- Removed flavor text implications that the order was voluntary
- Quirk renamed from `DNC` to `DNC Order`
- Trait renamed from `TRAIT_NO_CLONE` to `TRAIT_DNC_ORDER`
* Modularize cloning machine DNC check
Moves the code for DNC Order quirk check in the cloning machine into modular space, and removes it from base code.
2023-01-25 18:47:49 -03:00
SandPoot
54641ce201
send
2023-01-23 20:44:28 -03:00
SandPoot
54192d4d0d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-20 21:35:34 -03:00
Lin and GitHub
bd6a170299
Merge pull request #15943 from SandPoot/silicon-stuff
...
Update some silicon stuff
2023-01-18 17:52:06 -07:00
SandPoot
e76ed6a1ea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-17 22:26:56 -03:00
SandPoot
0ebcf0b72f
stuff
2023-01-16 18:16:32 -03:00
Timothy Teakettle and GitHub
35d01aa0f4
Merge pull request #15918 from LeDrascol/port-heirloom-update
...
[PORT] Non-global heirloom definitions
2023-01-12 23:39:41 +00:00
Darius and GitHub
7fdaa58689
Fix latejoin panel slot displays ( #281 )
...
Fixes a redundant display of job slots on the latejoin panel, caused by non-modular edits.
2023-01-10 08:23:38 -03:00
SandPoot
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
Jerry Wester and GitHub
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
SandPoot
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
silicons and GitHub
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
SandPoot
42d4abc164
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-07 16:44:44 -03:00
Darius
3adcab1756
Display job slots out of total during late-join
...
Changes late join text from "Job (current)" to "Job (current/limit)" to prevent confusion. Infinite-slot jobs display an infinity symbol.
2023-01-04 19:15:09 -05:00
SandPoot