cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-30 00:36:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,788 Commits 8 Branches 0 Tags
modsuit-update
Commit Graph
579 Commits
Author SHA1 Message Date
SandPoot 8b66a57665 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-21 00:23:16 -03:00
SandPoot 6ab934f6a1 pushies 2023-07-19 15:06:23 -03:00
SandPootandGitHub 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
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
DariusandGitHub 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 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 011dd2e817 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-16 16:47:19 -03:00
LinandGitHub 7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo 
dullahans 2: electric boogaloo
 2022-12-14 19:07:59 -07:00
SandPoot ba6d614e6a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-11-09 20:50:44 -03:00
siliconsandGitHub 268184347a Merge pull request #15875 from JerryWester/revert-15869-feat/drider-webs 
Revert "Grant Arachnid Abilities to Driders"
 2022-11-03 22:52:38 -07:00
SandPoot 02e4551a27 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-25 22:52:45 -03:00
LinandGitHub 03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast 
Fixes deadchat_broadcast
 2022-10-25 04:36:00 +00:00
SandPoot 24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
Jerry WesterandGitHub aace737989 Revert "Grant Arachnid Abilities to Driders" 2022-10-19 17:20:52 -06:00
siliconsandGitHub afed04d2fa Merge pull request #15873 from zeroisthebiggay/tallears 
tall ears from virgo
 2022-10-19 16:15:11 -07:00
zerothebigboy 1f8f5dc071 cocka 2022-10-19 03:49:33 -04:00
zerothebigboy 2fd981a05a penis 2022-10-18 23:57:02 -04:00
zerothebigboy 30bf2312f3 seizure 2022-10-18 23:37:40 -04:00
Jerry Wester 1015987d12 driderman, driderman, does whatever a spider can 2022-10-06 23:38:16 -06:00
SandPoot d9b51fa748 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-31 19:39:24 -03:00
zerothebigboy 434d7e0d10 don't lick a pai worst mistake i have ever made please fuck do not do it 2022-08-27 06:29:16 -04:00
timothyteakettle 2313a24918 Merge branch 'master' into dullahan-2-electric-boogaloo 2022-08-11 14:43:48 +01:00
SandPoot 00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -03:00
Putnam3145 b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Timothy Teakettle 671e5dd872 oh shit oh fuck 2022-08-07 23:53:08 +01:00
Timothy Teakettle 7df374a1f5 IPC PLEASE 2022-08-07 23:51:02 +01:00
Timothy Teakettle 783d22b2d2 some more additions 2022-08-07 23:38:38 +01:00
Timothy Teakettle 7ed2ee82bf core changes 2022-08-04 14:11:42 +01:00
SandPoot 07a4c5c12b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-11 04:54:12 -03:00
deathride58 512a8c783c basic code cleanup and limits 2022-06-09 23:37:49 -04:00
deathride58 f30c9406cc randomization! 2022-06-09 15:29:48 -04:00
SandPoot 6bff4b4165 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-05 01:38:42 -03:00
deathride58 c5e0048efd oops - forgot to completely undo the de-fanging i did for testing! 2022-05-30 22:10:37 -04:00
deathride58 ee92230176 Moves newplayer button population to a dedicated proc, significantly reducing the hackiness involved for getting the agegate working proper 2022-05-30 22:08:49 -04:00
SandPoot 8bb1c2b32a Upload files 2022-05-30 01:31:54 -03:00
Putnam3145 33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145 6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
SandPoot 0fa5987105 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-01 14:06:17 -03:00
Timothy TeakettleandGitHub 778bf1777b fixes coiling issue (#15530) 
* why

* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant

* fix

* Update preferences.dm

* no slimes you're not allowed the hidden sprite
 2022-02-28 14:01:57 -08:00
SandPoot 598dcc5828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-24 13:44:22 -03:00
Timothy TeakettleandGitHub f6b9858f4f adds snake coiling (#15514) 
* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant
 2022-02-23 22:01:13 -07:00
SandPoot f3ba281d78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-20 21:18:57 -03:00
LinandGitHub 1adbf914c2 Merge pull request #15414 from BlueWildrose/wingport 
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
 2022-02-21 00:02:21 +00:00
SandPoot 5dc331c406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-13 11:51:07 -03:00
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
SandPoot 7523279254 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-07 22:07:59 -03:00