SandPoot
|
91045350e5
|
overlay stuff
|
2024-04-12 22:01:03 -03:00 |
|
SandPoot
|
dfe90dfb61
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into pr/SandPoot/15486
|
2024-04-12 20:48:41 -03:00 |
|
chel
|
c7fe7a4274
|
Update drinkingglass.dm
|
2024-04-11 20:09:52 -03:00 |
|
chel
|
02249ec43e
|
Update nuclearbomb.dm
|
2024-04-11 20:05:24 -03:00 |
|
chel
|
5e070f76fb
|
Update paper.dm
|
2024-04-11 20:03:59 -03:00 |
|
deathride58
|
8ed65490a4
|
Merge pull request #16071 from SandPoot/hotkeys-default-pls
Makes keybindings default to hotkeys
|
2024-04-08 14:11:18 -04:00 |
|
SandPoot
|
1a7a423032
|
safeguard for those who already joined before
|
2024-04-08 14:59:09 -03:00 |
|
SandPoot
|
f8a912b7c6
|
ye
|
2024-04-08 14:50:40 -03:00 |
|
deathride58
|
448c0e014e
|
Merge pull request #16068 from SandPoot/thrown,-not-projectile
Fixes an incorrect type being used for blocking
|
2024-04-05 21:55:51 -04:00 |
|
SandPoot
|
68fa21d602
|
content
|
2024-04-05 17:57:54 -03:00 |
|
SandPoot
|
141d783708
|
not a projectile!!
|
2024-04-01 21:13:35 -03:00 |
|
deathride58
|
ad68229b8f
|
Merge pull request #16064 from SandPoot/fix-throw
Fix embed throws
|
2024-03-30 17:59:57 -04:00 |
|
deathride58
|
f38172182d
|
Merge pull request #16058 from SandPoot/remove-cyborg-safety
Removes cyborg surgery safety that messes with other medical instruments
|
2024-03-30 17:58:40 -04:00 |
|
SandPoot
|
ffe55f67b1
|
go!!
|
2024-03-30 18:29:11 -03:00 |
|
SandPoot
|
2518dd9fac
|
go
|
2024-03-30 18:03:05 -03:00 |
|
SandPoot
|
8516b07eee
|
please do not end your paths with /
|
2024-03-13 14:43:40 -03:00 |
|
SandPoot
|
89c7abec36
|
oopsies
|
2024-03-12 22:24:15 -03:00 |
|
SandPoot
|
676cb864b1
|
missed proc refs
|
2024-03-12 22:17:30 -03:00 |
|
Katherine Kiefer
|
a41d6b4369
|
fix the runtimes
|
2024-03-10 12:41:16 +11:00 |
|
Katherine Kiefer
|
fd29f9c902
|
initial
|
2024-03-09 21:16:02 +11:00 |
|
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
|
ee4d35ad32
|
here
|
2024-02-05 14:59:20 -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 |
|