 BongaTheProto
|
e3d1286cb8
|
Merge remote-tracking branch 'upstream/master'
|
2023-11-23 17:23:16 -05:00 |
|
|
SandPoot
|
c519c1e128
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-11-21 15:00:51 -03:00 |
|
|
SandPoot
|
1dc38c46d6
|
poosh
|
2023-11-02 23:17:49 -03:00 |
|
|
BongaTheProto
|
6e6bce8772
|
Merge remote-tracking branch 'upstream/master' into hate-upstream
|
2023-10-18 22:02:48 -05:00 |
|
|
SandPoot
|
45a94856c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-10-18 18:24:11 -03:00 |
|
|
SandPoot
|
297ee64977
|
push
|
2023-10-12 15:45:35 -03:00 |
|
|
BlueWildroseandGitHub
|
def4b38a46
|
Revert "[DNM] Updates firemanning, throwing stuff"
|
2023-10-11 13:52:03 -06:00 |
|
|
BongaTheProto
|
cd026aaddb
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-05 13:38:12 -05:00 |
|
|
SandPootandGitHub
|
c3735c05ac
|
Merge branch 'master' into throwing-updat
|
2023-10-04 15:15:15 -03:00 |
|
|
SandPoot
|
5a90dabd3c
|
stuff
|
2023-10-03 23:22:57 -03:00 |
|
|
SandPoot
|
bb1886ddb3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-10-03 21:00:13 -03:00 |
|
|
SandPoot
|
8c0a4131ac
|
why did i check for empty hand again?
|
2023-10-03 14:29:17 -03:00 |
|
|
BongaTheProto
|
cf3f27f3a0
|
Merge branch 'master' into pr/870
|
2023-09-16 15:25:40 -05:00 |
|
|
BongaTheProto
|
f8b2fdc38b
|
Update flavor_text.dm
|
2023-09-16 15:25:35 -05:00 |
|
|
BongaTheProto
|
085bb06e94
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-16 14:32:38 -05:00 |
|
|
SandPoot
|
0b04af4b76
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-14 22:32:47 -03:00 |
|
|
SandPoot
|
3c7e79d384
|
do after update
|
2023-09-09 15:39:49 -03:00 |
|
|
|
756c166f4f
|
Update to show if pref is on or off.
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
|
2023-08-28 06:55:20 -07:00 |
|
|
ZatarraandGitHub
|
ceb685ab7d
|
Merge branch 'SPLURT-Station:master' into STOMPSHIELDING
|
2023-08-22 16:35:10 -07:00 |
|
|
Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +03:00 |
|
|
Zattarra
|
6ccaecc44a
|
Merge branch 'STOMPSHIELDING' of https://github.com/Zattarra/DATASTREAM into STOMPSHIELDING
|
2023-07-29 18:39:15 -07:00 |
|
|
Zattarra
|
c186b9daae
|
Switches the pref to be a boolean, switches the checks to be booleans, adds stomptext to even display the thing, and also hopefully saves the pref.
|
2023-07-29 18:39:00 -07:00 |
|
|
ZatarraandGitHub
|
9f9c8e8521
|
Merge branch 'SPLURT-Station:master' into STOMPSHIELDING
|
2023-07-28 20:28:51 -07:00 |
|
|
BongaTheProto
|
21d13aae28
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-25 22:48:49 -05:00 |
|
|
BongaTheProto
|
e87e828638
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-25 22:47:02 -05:00 |
|
|
SandPoot
|
07f5e85c2c
|
override
|
2023-07-25 13:37:43 -03:00 |
|
|
SandPoot
|
7e51ef0b98
|
fix merge
|
2023-07-23 19:06:55 -03:00 |
|
|
SandPoot
|
ef186347ca
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-07-23 18:56:20 -03:00 |
|
|
SandPoot
|
19ee7f8bd2
|
some hints
|
2023-07-19 20:51:25 -03:00 |
|
|
BongaTheProto
|
f4e7294296
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-13 19:57:48 -05:00 |
|
|
SandPoot
|
737c2f200d
|
content
|
2023-07-12 13:04:01 -03:00 |
|
|
Zattarra
|
8475e0cfec
|
Merge branch 'STOMPSHIELDING' of https://github.com/Zattarra/DATASTREAM into STOMPSHIELDING
UH OH.
|
2023-07-01 19:51:56 -07:00 |
|
|
BongaTheProto
|
972df3f711
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-16 16:30:59 -05:00 |
|
|
SandPoot
|
072087ec14
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-15 20:22:44 -03:00 |
|
|
SandPoot
|
c1e8039c11
|
source
|
2023-02-09 03:00:56 -03:00 |
|
|
SandPoot
|
78c28a40c7
|
sneaky hint about reskinning
|
2023-02-09 02:54:31 -03:00 |
|
|
SandPoot
|
d29ce2328c
|
some extra touches
|
2023-02-09 02:25:34 -03:00 |
|
|
SandPoot
|
4491abc2d7
|
updates to most recent version and puts intent hints!
|
2023-02-09 02:20:02 -03:00 |
|
|
SandPoot
|
1b1154260c
|
correct everything and some intention based checks
|
2023-02-08 02:17:57 -03:00 |
|
|
SandPoot
|
ed06e686e1
|
pushies.
|
2023-01-31 16:40:17 -03:00 |
|
|
BongaTheProto
|
86a005b590
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-11 12:51:40 -05:00 |
|
|
SandPoot
|
03304ba2c8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-01-10 22:50:16 -03:00 |
|
|
SandPoot
|
3b8d102fac
|
puts pda in the system to remove shitcode
|
2023-01-10 20:02:12 -03:00 |
|
|
SandPoot
|
cf51a4dce9
|
dusting off
|
2023-01-10 18:32:49 -03:00 |
|
|
SandPoot
|
6bbd44afe7
|
element time
|
2023-01-10 18:08:17 -03:00 |
|
|
BongaTheProto
|
ab9d691f1a
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-09 16:59:38 -05:00 |
|
|
SandPoot
|
82eff346c7
|
Merge Upstream
|
2023-01-07 22:52:22 -03:00 |
|
|
Hatterhat
|
34eaf93a01
|
sorters! one-way setting! brazen code borrowing!
|
2022-12-29 20:18:34 -06:00 |
|
|
BongaTheProto
|
03f4c65fc4
|
Merge remote-tracking branch 'upstream/master'
|
2022-06-11 23:25:29 -05:00 |
|
|
SandPoot
|
07a4c5c12b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-06-11 04:54:12 -03:00 |
|