shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,854 Commits 5 Branches 0 Tags
up-to-date
Commit Graph
30881 Commits
Author SHA1 Message Date
SandPoot c36105ef88 holy hell 2023-12-07 23:08:17 -03:00
deathride58andGitHub a91e0990a2 Merge pull request #16037 from SandPoot/fontawesome 
Bumps up FontAwesome to 6.1.2
 2023-12-06 14:58:31 -05:00
SandPoot f698cbb8a7 bump 2023-12-01 14:54:05 -03:00
SandPoot a558377206 more stuff i can't guarantee works by itself yet 2023-11-29 23:37:15 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
BlueWildroseandGitHub 9d8b2bc8cb Merge pull request #16035 from SandPoot/tags 
Adds Datum Tagging for admins
 2023-11-27 20:06:28 -07:00
SandPoot b290efc434 push 2023-11-22 14:11:17 -03:00
siliconsandGitHub 9f7685d65c Merge pull request #16028 from DeltaFire15/powernet-optim 
Minor power_change optimization (updated)
 2023-11-17 12:25:47 -08:00
BlueWildroseandGitHub 8d6801c387 holiday patterns + pansexual/panromantic holiday 2023-11-16 16:34:10 -07:00
BlueWildroseandGitHub 8e72f5e7c4 code for patterns 2023-11-16 16:32:48 -07:00
BlueWildroseandGitHub 177b59b28a LGBT color defines 2023-11-16 16:30:21 -07:00
DeltaFire 7fad042e9e suitlinking 
active modsuits count as viable for Synthetic suitlinking
 2023-11-13 14:49:23 +01:00
DeltaFire a9af463fdf fixes a broken technode icon 2023-11-13 14:03:46 +01:00
Putnam3145GitHubDeltaFire
 		9c4792ea80 Some dynamic midround tweaking (#15841) 
* midround wizard, blob

* make dynamic respect midround pref, too

* Makes attempt_replacement not just make traitors

* Tried to make it poll if you wanna be a wizard

* something is going to happen in 1 minutes

* i left it half finished!

* This one seems a bit over the top

---------

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2023-11-13 13:00:04 +01:00
DJKoutaGitHubDeltaFire
 		5dc2241d6a Syndicate Skinned Box Station (#15580) 
* Syndicate Skinned Box Station

* Create syndicatestation.json

Okay tHIS FIXED IT I THINK HOLY CRAP THIS WAS AN EXPERIENCE.  HERES THE JSON!

* actually makes this work

* random runtime

we lvoe lesser-used items with runtiming actions

---------

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2023-11-13 12:48:38 +01:00
DeltaFire 7bb6d4ca08 another layer 2023-11-13 11:46:21 +01:00
DeltaFire 6da3776558 no sleep 
no sleeping if not using INVOKE_ASYNC
 2023-11-13 11:40:42 +01:00
DeltaFire 7d734b11c2 Merge remote-tracking branch 'upstream/master' into powernet-optim 2023-11-13 11:38:50 +01:00
BlueWildroseGitHubSandPootDeltaFire
 		54089a159c SpookyStation fixes and edits (#16019) 
* spooky 2023

* Spooky colormates, better telecomms?

* yes

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* yes

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* minor pre-merge change

I don't feel like requesting changes for this small of a nitpick so I'll just do it myself & merge.

---------

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2023-11-13 10:02:31 +01:00
DeltaFire fbd26d1968 some modsuit updates 
ports some tg updates & does some of my own.
 2023-11-13 09:10:17 +01:00
BlueWildroseandGitHub c9b0dedf77 Merge pull request #16023 from KrissKr0ss/rename-icon-files 
Renames update icons files
 2023-11-04 18:48:22 -06:00
BlueWildroseandGitHub 5265a92b0e Merge pull request #16025 from SandPoot/runtime-station 
Fix runtime station, pods, and touches maps
 2023-11-04 02:35:58 -06:00
SandPoot 44421ed042 push 2023-11-03 23:46:34 -03:00
SandPoot 1dc38c46d6 poosh 2023-11-02 23:17:49 -03:00
KrissKr0ss b7c7c24f63 rename icons files 2023-11-01 13:51:19 -05:00
BlueWildroseandGitHub 720374a7ef Merge pull request #16022 from SandPoot/fix-loadout-runtime-not-spawning-items 
Fix loadout runtime (which prevents remaining items from spawning)
 2023-10-31 14:47:20 -06:00
SandPoot 55e0e5de06 real quick 2023-10-28 17:54:31 -03:00
SandPoot 0b6d743e22 go 2023-10-28 17:51:02 -03:00
LinandGitHub f27f1a21b0 Merge pull request #16015 from SandPoot/undo-accidental-rollback 
Screentips show the option correctly again
 2023-10-16 15:26:49 -04:00
SandPoot 4797a49914 Update files 2023-10-13 16:40:45 -03:00
SandPoot 6df09381bd Update overlays.dm 2023-10-13 16:40:43 -03:00
SandPoot 297ee64977 push 2023-10-12 15:45:35 -03:00
SandPoot b36da8f5d7 Revert "Revert "[DNM] Updates firemanning, throwing stuff"" 
This reverts commit def4b38a46.
 2023-10-12 14:34:02 -03:00
SandPoot 45d5d92775 oops 2023-10-12 14:28:57 -03:00
BlueWildroseandGitHub def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
BlueWildroseandGitHub aff43910af Merge pull request #16007 from SandPoot/throwing-updat 
[DNM] Updates firemanning, throwing stuff
 2023-10-11 13:51:54 -06:00
BlueWildroseandGitHub 9f29f08cd0 Merge pull request #16013 from SandPoot/change-preferences 
Preferences menu layout change
 2023-10-11 13:51:37 -06:00
LinandGitHub 0c823be763 Merge pull request #16012 from SandPoot/admin-respawn-runtime 
Fixes runtime when unrestricted respawning someone
 2023-10-09 15:37:06 -04:00
LinandGitHub de4168bc0e Merge pull request #16011 from SandPoot/not-again-- 
Fixes piggyback riding
 2023-10-09 15:36:52 -04:00
SandPoot d4ea14c4ef push 2023-10-09 16:15:49 -03:00
SandPoot b624de1c10 you go 2023-10-08 13:01:15 -03:00
SandPoot c5ba21994d If i had a nickel for every time incapacitated() had some issue, i would have... 2023-10-08 12:49:40 -03:00
SandPoot d16a39505f oopsies 2023-10-05 21:39:55 -03:00
SandPoot 6cd2cfcd01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-config 2023-10-05 21:25:29 -03:00
SandPoot ddf9827afb lowercasing possible 2023-10-05 21:24:13 -03:00
SandPootandМарк a105852042 the stuff 
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
 2023-10-05 21:15:11 -03:00
SandPootandGitHub 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
LinandGitHub bae4216c20 Merge pull request #16003 from SandPoot/held-plushies 
Adds held sprites to plushes
 2023-10-03 17:51:26 -04:00
LinandGitHub 6dc628e053 Merge pull request #16004 from SandPoot/reskin-tip 
Makes the hints for reskinning things not require empty hand
 2023-10-03 17:49:32 -04:00