 Mosley
|
f700fd616b
|
Merge remote-tracking branch 'upstream/master'
|
2025-01-15 17:11:43 -05:00 |
|
|
SandPoot
|
ce801b39b6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-12-24 19:31:23 -03:00 |
|
|
ariaworld
|
e23b1f84fd
|
BEESTATION PORT PR#4567: Filters + plane_master atomized
|
2024-11-30 16:39:30 +01:00 |
|
|
ariaworld
|
0601002cd1
|
Space update
|
2024-09-02 00:20:38 +02:00 |
|
|
ariaworld
|
d42c7a4f2a
|
Merge remote-tracking branch
|
2024-08-29 14:42:55 +02:00 |
|
|
SandPoot
|
75d1a7d69c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-08-26 04:31:35 -03:00 |
|
|
SandPoot
|
dc08550162
|
push
|
2024-08-25 04:38:03 -03:00 |
|
|
SandPoot
|
a1905591f7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-08-24 23:49:10 -03:00 |
|
|
SandPoot
|
c07e94be66
|
push
|
2024-08-24 21:28:55 -03:00 |
|
|
BongaTheProto
|
dbd4505372
|
Merge remote-tracking branch 'upstream/master'
|
2024-04-30 19:02:41 -05:00 |
|
|
SandPoot
|
91a9223df6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-25 17:08:42 -03:00 |
|
|
deathride58
|
0517ece12a
|
fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon
|
2024-04-24 22:30:25 -04:00 |
|
|
SandPoot
|
2e2528ee56
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-13 00:36:29 -03:00 |
|
|
SandPoot
|
4af0628c8b
|
woo
|
2024-04-12 22:36:44 -03:00 |
|
|
BongaTheProto
|
dc057a41ad
|
Merge branch 'master' into upstream-merge
|
2024-04-06 18:51:51 -05:00 |
|
|
Elizabeth Lavenza
|
026af381f9
|
Fix runtime from update_icon() being called on a qdeleted lewd decl
|
2024-04-01 11:33:31 -04:00 |
|
|
BongaTheProto
|
493fa7f215
|
Merge branch 'master' into upstream-merge
|
2024-03-28 15:43:55 -05:00 |
|
|
BongaTheProto
|
b2e14a5393
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-03-24 17:02:38 -05:00 |
|
|
SandPoot
|
b76127c2d7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-15 19:21:39 -03:00 |
|
|
SandPoot
|
676cb864b1
|
missed proc refs
|
2024-03-12 22:17:30 -03: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 |
|
|
ariaworld
|
79a9c482a3
|
Add: kiss slut trait + fix oral sex verbs
|
2024-03-06 13:58:35 +01:00 |
|
|
BongaTheProto
|
558d33f7c6
|
Merge branch 'master' into upstream-merge
|
2024-03-04 16:59:05 -05:00 |
|
|
BongaTheProto
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
|
ariaworld
|
8fdebe95c5
|
A few tweaks.
|
2024-02-21 12:02:08 +01:00 |
|
|
ariaworld
|
4b290b450f
|
Fix: Accidentally removed important drink checks
|
2024-02-21 11:54:59 +01:00 |
|
|
ariaworld
|
1ea1ac2d76
|
Chugging from every possible liquid container + clean code
|
2024-02-21 01:45:40 +01:00 |
|
|
ariaworld
|
9a3d8123f5
|
P > hitting_projectile
|
2024-01-28 22:46:39 +01:00 |
|
|
ariaworld
|
820a340fa2
|
Refactor reagent_dispenser welder explosion
|
2024-01-28 22:31:57 +01:00 |
|
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
ariaworld
|
fde8d80de6
|
Merge remote-tracking branch 'upstream/master' into december-qol
|
2024-01-02 21:16:39 +01:00 |
|
|
BongaTheProto
|
a9715638ad
|
Merge remote-tracking branch 'upstream/master'
|
2024-01-02 01:00:59 -05:00 |
|
|
SandPoot
|
65ed5c79f4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-30 02:07:21 -03:00 |
|
|
deathride58
|
15e1858862
|
Merge pull request #16045 from Putnam3145/eggnog-fix
Adds non-alcoholic eggnog
|
2023-12-29 22:04:59 -05:00 |
|
|
SandPoot
|
4e9ff44ee7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-29 15:49:14 -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 |
|
|
BongaTheProto
|
13cd269788
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-25 14:28:51 -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
|
be37603291
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-23 13:28:41 -03:00 |
|
|
ariaworld
|
22befe7327
|
Winter QOL
|
2023-12-23 14:59:11 +01:00 |
|
|
SandPoot
|
b9a422ee2d
|
throw at mobs laying down
|
2023-12-18 14:07:25 -03:00 |
|
|
SandPoot
|
7b62dbe7bb
|
ai + mech
|
2023-12-17 23:15:59 -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 |
|
|
ariaworld
|
0c2be63a85
|
Add: Milk decal + organize stripper outfits.
|
2023-11-18 17:58:53 +01:00 |
|
|
ariaworld
|
1f463a734c
|
Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update
|
2023-11-17 23:26:33 +01:00 |
|