 Elizabeth Lavenza
|
2c12f089ee
|
Fix Create and Destroy causing stacking turf decals
|
2024-04-16 02:55:51 -04:00 |
|
|
BongaTheProto
|
1e1fc329f8
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-13 14:12:39 -05:00 |
|
|
SandPoot
|
002a4c31c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-12 22:06:15 -03:00 |
|
|
SandPoot
|
ca8ce67cd6
|
mail
|
2024-04-10 20:54:04 -03:00 |
|
|
BongaTheProto
|
d20caf7191
|
Merge branch '515-update' into upstream-merge
|
2024-03-24 17:39:24 -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 |
|
|
BongaTheProto
|
1883c47d5c
|
basic ref regex
makes the proc calls compatible with 515
|
2024-03-11 19:46:05 -05: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 |
|
|
BongaTheProto
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
|
ariaworld
|
0a2a00dd2e
|
Proximity monitor runtime fix
|
2024-01-24 22:24:55 +01:00 |
|
|
ariaworld
|
93f0fb7e6c
|
Fix a few hard-dels
|
2024-01-21 16:14:07 +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 |
|
|
BongaTheProtoandGitHub
|
8e8999fa08
|
Merge branch 'Sandstorm-Station:master' into master
|
2024-01-07 19:58:34 -05:00 |
|
|
SandPoot
|
46384d2a67
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-07 03:36:25 -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 |
|
|
SandPoot
|
387b4b236c
|
push
|
2024-01-07 00:37:16 -03:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03: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 |
|
|
deathride58andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
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 |
|
|
BongaTheProto
|
26c86a9152
|
followup
I believe those are the only name changes
|
2023-12-25 14:29:23 -05:00 |
|
|
BongaTheProto
|
13cd269788
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-25 14:28:51 -05:00 |
|
|
SandPoot
|
be37603291
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-23 13:28:41 -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 |
|
|
BongaTheProto
|
c1c9fef224
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-15 18:12:47 -05:00 |
|
|
SandPoot
|
f626df9d1d
|
push
|
2023-12-13 00:08:58 -03:00 |
|
|
SandPoot
|
8cdb82a23f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-12 22:06:13 -03:00 |
|
|
deathride58andGitHub
|
4e39bef762
|
Merge pull request #16040 from SandPoot/better-countdown-effect
Makes countdown objects follow their targets better
|
2023-12-12 19:21:51 -05:00 |
|
|
SandPoot
|
f95f776547
|
push
|
2023-12-11 18:30:19 -03:00 |
|
|
SandPoot
|
e457f40328
|
maptext
|
2023-12-11 17:43:24 -03:00 |
|
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
|
BlueWildroseandGitHub
|
8e72f5e7c4
|
code for patterns
|
2023-11-16 16:32:48 -07:00 |
|
|
MysteryMan21333
|
06153ae98f
|
Xenobiology V1.0
|
2023-10-14 07:15:46 -05:00 |
|
|
Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +03:00 |
|
|
Tsurupeta
|
d4f3793f8f
|
QDEL_IN improvements
|
2023-08-08 14:01:16 +03:00 |
|
|
BongaTheProto
|
9e9f9915fa
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-03 17:23:22 -05:00 |
|
|
SandPoot
|
996e472f80
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-03 18:53:29 -03:00 |
|
|
zerothebigboy
|
8776b8c0cc
|
epic
|
2023-01-29 22:35:59 -05:00 |
|
|
zerothebigboy
|
e76221f68b
|
yeppers
|
2023-01-29 03:57:32 -05:00 |
|
|
BongaTheProto
|
ee6823c69b
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-13 12:14:11 -05:00 |
|
|
SandPoot
|
f4b7513f10
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-12-13 01:35:33 -03:00 |
|
|
LinandGitHub
|
7205781c47
|
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
Solves some harddels
|
2022-12-12 19:11:49 -07:00 |
|
|
SandPoot
|
8911fe5e0b
|
clear em
|
2022-12-11 17:58:45 -03:00 |
|
|
BongaTheProto
|
79fa770ab3
|
Merge remote-tracking branch 'upstream/master'
|
2022-10-13 11:21:32 -05:00 |
|
|
SandPoot
|
5384cb9d4b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-10-12 22:25:25 -03:00 |
|