shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph
48445 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DeltaFire 7d734b11c2 Merge remote-tracking branch 'upstream/master' into powernet-optim 2023-11-13 11:38:50 +01:00
shellspeed1andGitHub 912e0b3d51 Update lavaland_surface_seed_vault.dmm (#15835) 2023-11-13 10:18:43 +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
BlueWildroseandGitHub 2a732767e1 Merge pull request #16024 from SandPoot/fix-texts_by_atom-being-nulled 
FIxes a case of texts_by_atom on flavor text being nulled
 2023-11-04 02:33:28 -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
LinandGitHub b13249854c Merge pull request #16017 from SandPoot/silicons-flavor-text-loading 
Silicon flavor text loading (for real now)
 2023-10-16 15:26:32 -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 c4c57d3e26 Merge pull request #16014 from Citadel-Station-13/revert-16007-throwing-updat 
Revert "[DNM] Updates firemanning, throwing stuff"
 2023-10-11 13:53:30 -06: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
LinandGitHub 610a02e554 Merge pull request #16008 from SandPoot/update-config 
Ports tgstation#59874 & #60951
 2023-10-07 22:12:48 -04:00
LinandGitHub 559288df78 Merge pull request #16010 from SandPoot/me-when-loadout-code 
Fixes donator backpack items
 2023-10-07 22:09:35 -04:00
SandPoot 4429bce1e1 yeah 2023-10-07 14:36:26 -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
LinandGitHub c11c1fe8c6 Merge pull request #16005 from SandPoot/why-though 
Makes age_verification config work properly
 2023-10-03 17:47:56 -04:00
SandPoot 962c3e7b76 fix 2023-10-03 14:31:45 -03:00
SandPoot 8c0a4131ac why did i check for empty hand again? 2023-10-03 14:29:17 -03:00
SandPoot af33de25b4 the commit 2023-10-03 14:22:05 -03:00
deathride58andGitHub ade0c3cad2 Merge pull request #16002 from SandPoot/more-restraints-issues 
Someone told me you can't resist handcuffs part 2
 2023-10-02 13:11:29 -04:00
SandPoot a034a96fc2 part 2 2023-10-02 13:54:40 -03:00
siliconsandGitHub 8db27b8ff4 Merge pull request #16001 from SandPoot/ignore_restraints-=-1 
Someone told me you can't resist handcuffs
 2023-09-19 12:28:36 -07:00
SandPoot 39aab0dc82 go 2023-09-19 15:16:37 -03:00
LinandGitHub c45ef33afa Merge pull request #16000 from SandPoot/priority_announce 
Randomizing station names trait no longer hides announcements
 2023-09-16 13:03:44 -04:00
siliconsandGitHub 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