SandPoot
a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
SandPoot
fcd036dab5
final stuff, i think?
2024-03-07 20:31:53 -03:00
SandPoot
17a01b6f2a
revert stuff
2024-01-16 14:53:48 -03:00
SandPoot
1dad7e880e
514 click stuff?
2024-01-13 13:35:54 -03:00
SandPoot
003eec1850
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-to-action-buttons
2024-01-07 02:09:58 -03:00
deathride58
ae557a1df5
Merge pull request #16055 from SandPoot/point-bubbles
...
Pointing at something on yourself now shows the item
2024-01-06 22:51:35 -05:00
deathride58
e7fd497895
Merge pull request #16053 from SandPoot/extra-huds
...
Changes operative hud and adds three more
2024-01-06 22:51:28 -05:00
SandPoot
387b4b236c
push
2024-01-07 00:37:16 -03:00
SandPoot
76e7ffc80d
push
2024-01-06 17:36:02 -03:00
SandPoot
6d7321b0c4
okay so this is necessary
2024-01-05 22:09:21 -03:00
SandPoot
51c1c2abc9
huds!
2024-01-05 17:07:54 -03:00
SandPoot
00b30e0672
stoppable
2024-01-05 12:53:42 -03:00
SandPoot
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
SandPoot
05e2cc0979
there
2024-01-05 00:18:21 -03:00
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
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
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