shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,541 Commits 5 Branches 0 Tags
9c4792ea80af51dd72a97c2e21d7aa16c23bd13c
Commit Graph

20838 Commits

Author SHA1 Message Date
Putnam3145
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
DJKouta
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
BlueWildrose
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
BlueWildrose
c9b0dedf77 Merge pull request #16023 from KrissKr0ss/rename-icon-files 
Renames update icons files
 2023-11-04 18:48:22 -06:00
SandPoot
44421ed042 push 2023-11-03 23:46:34 -03:00
KrissKr0ss
b7c7c24f63 rename icons files 2023-11-01 13:51:19 -05:00
BlueWildrose
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
0b6d743e22 go 2023-10-28 17:51:02 -03:00
Lin
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
297ee64977 push 2023-10-12 15:45:35 -03:00
SandPoot
45d5d92775 oops 2023-10-12 14:28:57 -03:00
BlueWildrose
def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
BlueWildrose
aff43910af Merge pull request #16007 from SandPoot/throwing-updat 
[DNM] Updates firemanning, throwing stuff
 2023-10-11 13:51:54 -06:00
BlueWildrose
9f29f08cd0 Merge pull request #16013 from SandPoot/change-preferences 
Preferences menu layout change
 2023-10-11 13:51:37 -06:00
Lin
0c823be763 Merge pull request #16012 from SandPoot/admin-respawn-runtime 
Fixes runtime when unrestricted respawning someone
 2023-10-09 15:37:06 -04:00
Lin
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
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
a105852042 the stuff 
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
 2023-10-05 21:15:11 -03:00
SandPoot
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
SandPoot
a034a96fc2 part 2 2023-10-02 13:54:40 -03:00
SandPoot
39aab0dc82 go 2023-09-19 15:16:37 -03:00
silicons
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
SandPoot
3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
SandPoot
f1d9fb376e Merge pull request #15969 from Phoenix4O4/port-ability-to-change-AI/Robot-laws 
[PORT-YOG] Gives admins the ability to change AI/Robot Laws at wil
 2023-09-03 15:24:48 -03:00
Katherine Kiefer
16a490ee5c update auxmos 2023-08-18 22:13:30 +10:00
Lin
1ed893f16d Merge pull request #15995 from SandPoot/orbit-jobs 
Shows people's jobs on the orbit menu
 2023-08-05 12:47:56 -04: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
410d80987e nope, who OWNS it 2023-07-31 15:04:52 -03:00
SandPoot
860f75d464 go 2023-07-31 15:02:51 -03:00
SandPoot
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
Lin
b1f6271cb5 Merge pull request #15991 from SandPoot/screenhints 
Adds a couple hints to things
 2023-07-23 16:52:31 -05:00
SandPoot
994ff214d5 ? 2023-07-23 15:06:20 -03:00
Lin
77df8655e0 Merge pull request #15990 from SandPoot/lobby-collapse 
Collapsible lobby buttons
 2023-07-20 11:55:29 -05:00
SandPoot
3645d00ec0 alright then 2023-07-19 21:15:52 -03:00
SandPoot
19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
Lin
3c3f609541 Merge pull request #15989 from SandPoot/screentip-update 
Update screentips
 2023-07-19 15:53:38 -05:00
SandPoot
6ab934f6a1 pushies 2023-07-19 15:06:23 -03:00
SandPoot
217e23fc7f push 2023-07-18 15:22:24 -03:00
deathride58
4e975c819e Merge pull request #15988 from SandPoot/fix-tooltips-again 
Fix tooltips AGAIN
 2023-07-06 15:29:40 -04:00
SandPoot
3fca781947 push 2023-07-06 16:12:40 -03:00
KrissKr0ss
0212870845 Update SDQL_2.dm 2023-06-24 22:41:56 -05:00
Jerry Wester
31e87bc2d7 Safeguard suit 2023-05-01 00:26:56 -05:00
Jerry Wester
86ba327b9d update painting 2023-05-01 00:24:52 -05:00
Jerry Wester
4067e0bdef Armor rebalancing 2023-05-01 00:24:42 -05:00