 BongaTheProtoandGitHub
|
6ae55be3f4
|
Merge pull request #919 from SPLURT-Station/borgos
Borg sprite updates
|
2023-08-17 14:21:20 -05:00 |
|
|
BongaTheProto
|
4056ac8165
|
Merge branch 'master' into borgos
|
2023-08-13 01:48:13 -05:00 |
|
|
BongaTheProto
|
a965da14aa
|
mekas
why they look like that ps4 game tho
|
2023-08-13 01:47:54 -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
|
cdd5bb87d8
|
Merge remote-tracking branch 'upstream/master'
|
2023-08-08 01:42:46 -05:00 |
|
|
SandPoot
|
4b9488a9b3
|
right codebase!
|
2023-08-05 14:05:00 -03:00 |
|
|
SandPoot
|
8bf6e9ffcc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-08-05 13:51:50 -03:00 |
|
|
SandPoot
|
6fb4267b56
|
upload
|
2023-08-04 23:26:33 -03:00 |
|
|
SandPoot
|
c54ce2d09d
|
wrong codebase
|
2023-08-04 00:16:53 -03:00 |
|
|
SandPoot
|
403c49afab
|
push
|
2023-08-04 00:11:08 -03:00 |
|
|
BongaTheProto
|
83bb8a2e11
|
haydee
that ass better fart
|
2023-08-03 03:11:05 -05:00 |
|
|
BongaTheProto
|
ea324c5bc1
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-28 20:43:43 -05:00 |
|
|
SandPoot
|
789534ac63
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-07-28 18:36:03 -03:00 |
|
|
SandPootandGitHub
|
9421423ed5
|
Merge branch 'master' into changeling-update
|
2023-07-26 22:22:14 -03:00 |
|
|
SandPoot
|
11aa13e4e8
|
part 1 - 41928
|
2023-07-26 21:45:43 -03:00 |
|
|
BongaTheProto
|
2b718295d3
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-23 13:41:11 -05:00 |
|
|
SandPoot
|
8b66a57665
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-07-21 00:23:16 -03:00 |
|
|
LinandGitHub
|
77df8655e0
|
Merge pull request #15990 from SandPoot/lobby-collapse
Collapsible lobby buttons
|
2023-07-20 11:55:29 -05:00 |
|
|
SandPoot
|
6ab934f6a1
|
pushies
|
2023-07-19 15:06:23 -03:00 |
|
|
BongaTheProtoandGitHub
|
33a9c33e9f
|
Merge pull request #856 from SPLURT-Station/make-code-better
Genital equipment code cleaning
|
2023-06-17 12:07:45 -05:00 |
|
|
BongaTheProtoandGitHub
|
4d994fa1f9
|
Merge pull request #852 from Satile1/HotelComms
Hotel Radio channel! Mapping fixes and flavour
|
2023-06-14 18:51:28 -05:00 |
|
|
BongaTheProto
|
f281a9f3eb
|
Merge branch 'master' into make-code-better
|
2023-06-13 20:21:29 -05:00 |
|
|
LagardereMathis
|
e00ed0f8cd
|
Assaultron sprite changes
|
2023-06-12 13:09:33 +02:00 |
|
|
BongaTheProto
|
b950414c84
|
genital equipment component
holy fuck his was so difficult to get done
|
2023-06-04 02:53:02 -05:00 |
|
|
WoolyAypa
|
1e44a42515
|
newline..?
|
2023-05-28 18:34:02 -03:00 |
|
|
WoolyAypa
|
e1c9bb9775
|
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system
|
2023-05-28 13:39:05 -03:00 |
|
|
Satile1
|
61ef0f337e
|
Hotel Radio channel! Mapping fixes and flavour
|
2023-05-25 17:09:21 +01:00 |
|
|
LagardereMathis
|
2527d8fdd5
|
Add Sexy Assaultron sprites
|
2023-05-24 22:17:03 +02:00 |
|
|
BongaTheProtoandGitHub
|
8e4f1d54c4
|
Merge pull request #843 from SPLURT-Station/pixelshift
Pixelshift tweaks
|
2023-05-20 19:37:26 -05:00 |
|
|
BongaTheProtoandGitHub
|
de2ae3f954
|
Merge pull request #844 from PhazeJump/RoboMaid-Fix
Mining RoboMaid fix
|
2023-05-20 15:56:34 -05:00 |
|
|
PhazeJump
|
9ec56463ff
|
fix
titl
|
2023-05-20 16:06:52 +02:00 |
|
|
BongaTheProto
|
635fc04860
|
Merge branch 'allow-old-shifting' of https://github.com/DeDrascol/Snowstorm-Station-13 into pixelshift
|
2023-05-19 17:32:38 -05:00 |
|
|
PhazeJump
|
0a5c86fd07
|
added Fembot
Added (Janitor) Fembot borg model for service
And fixed heavy's icon not showing up :3
|
2023-05-19 23:24:25 +02:00 |
|
|
BongaTheProto
|
5116acad15
|
Merge remote-tracking branch 'upstream/master'
|
2023-05-06 18:31:55 -05:00 |
|
|
SandPoot
|
7038059ab5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-05-06 10:47:06 -03:00 |
|
|
KrissKr0ss
|
66aa1cb05c
|
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
|
2023-05-01 00:16:20 -05:00 |
|
|
WoolyAypa
|
36f8a4ea71
|
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system
|
2023-04-26 16:12:15 -03:00 |
|
|
BongaTheProto
|
525741658b
|
shaft beast? Like hype beast but with cocks?
|
2023-04-23 13:55:45 -05:00 |
|
|
BongaTheProto
|
4b547a3208
|
Merge remote-tracking branch 'upstream/master'
|
2023-04-08 15:49:43 -05:00 |
|
|
SandPoot
|
7cc1ecfa1e
|
(i'm being shot by those red arrows help)
|
2023-04-06 18:49:21 -03:00 |
|
|
WoolyAypa
|
ff61f1def1
|
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system
|
2023-04-04 11:28:23 -03:00 |
|
|
KeplerWasTaken
|
02c20c35e4
|
Mafia verb removal
|
2023-03-28 23:22:55 +02:00 |
|
|
KeplerWasTaken
|
3a81451a2d
|
Tweaked cryo messages for heads of staff and AI, changed greeting messages for blueshields and bridge officers
|
2023-03-28 23:22:32 +02:00 |
|
|
WoolyAypa
|
f70e1e901e
|
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system
|
2023-03-24 23:46:54 -03:00 |
|
|
BongaTheProto
|
57a7a516e6
|
Merge remote-tracking branch 'upstream/master'
|
2023-03-06 22:43:10 -05:00 |
|
|
SandPoot
|
d63c2ebdd8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-03-05 12:35:35 -03:00 |
|
|
siliconsandGitHub
|
6efd3098d4
|
Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
|
2023-03-04 23:36:36 -08:00 |
|
|
BongaTheProto
|
d0fa6c842e
|
Merge remote-tracking branch 'upstream/master'
|
2023-03-01 14:58:31 -05:00 |
|
|
SandPoot
|
a1823e7ca8
|
fix pixel shift
|
2023-02-27 19:36:01 -03:00 |
|