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

20872 Commits

Author SHA1 Message Date
SandPoot
a8be340925 fix constructs follow-up pr 2024-01-03 22:46:19 -03:00
SandPoot
7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
deathride58
c660811fe8 Merge pull request #16027 from DeltaFire15/modsuit-updates 
Some modsuit updates
 2024-01-01 21:08:56 -05:00
deathride58
9217fcc7dc Merge pull request #16043 from SandPoot/stacks 
Make stacks show how much there are in inventory
 2023-12-29 22:57:38 -05:00
deathride58
c95f60c37b Merge pull request #16034 from BlueWildrose/TransRightsAreHumanRights 
Adds decal patterns to LGBT holidays + Pansexual and Panromantic Awareness Day holiday
 2023-12-29 22:05:37 -05:00
deathride58
15e1858862 Merge pull request #16045 from Putnam3145/eggnog-fix 
Adds non-alcoholic eggnog
 2023-12-29 22:04:59 -05:00
SandPoot
6733de69bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stacks 2023-12-29 23:16:11 -03:00
deathride58
ce1d757159 Merge pull request #16016 from SandPoot/throwing-update 
[TESTMERGE] Updates firemanning, throwing stuff
 2023-12-28 22:44:59 -05:00
Putnam3145
4ded956613 actually it's 33% rum why is it not 33% the power 2023-12-23 14:57:34 -08:00
Putnam3145
78982c2e6f typos and other such issues 2023-12-23 14:49:46 -08:00
Putnam3145
e65f386de9 Makes eggnog not alcoholic 2023-12-23 14:22:58 -08:00
SandPoot
b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -03:00
SandPoot
27bdd4b732 aiModule > ai_module 2023-12-17 23:20:43 -03:00
SandPoot
7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot
7533d51ae4 is_cyborg 2023-12-13 13:07:10 -03:00
SandPoot
35723b9bd7 field access... 2023-12-13 12:55:33 -03:00
SandPoot
606ffd5b1e just get rid of these issues already 2023-12-13 12:52:50 -03:00
SandPoot
c182a337fe poosh 2023-12-13 00:24:57 -03:00
SandPoot
f626df9d1d push 2023-12-13 00:08:58 -03:00
deathride58
3e45c18ab4 Merge pull request #16038 from SandPoot/fix-lava+borgs 
Deals with lava plus a lot of borg stuff
 2023-12-12 19:25:13 -05:00
deathride58
e729badcd2 Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable) 
Maptext()s the maptexts
 2023-12-12 19:21:17 -05:00
SandPoot
e457f40328 maptext 2023-12-11 17:43:24 -03:00
SandPoot
c36105ef88 holy hell 2023-12-07 23:08:17 -03:00
deathride58
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
BlueWildrose
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
silicons
9f7685d65c Merge pull request #16028 from DeltaFire15/powernet-optim 
Minor power_change optimization (updated)
 2023-11-17 12:25:47 -08:00
BlueWildrose
8d6801c387 holiday patterns + pansexual/panromantic holiday 2023-11-16 16:34:10 -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
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
DeltaFire
6da3776558 no sleep 
no sleeping if not using INVOKE_ASYNC
 2023-11-13 11:40:42 +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
DeltaFire
fbd26d1968 some modsuit updates 
ports some tg updates & does some of my own.
 2023-11-13 09:10:17 +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
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
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