Mosley
cd03ca1151
Merge branch 'master' into content-stuff
2024-10-24 15:21:03 -05:00
Mosley
518fea2b1a
Merge remote-tracking branch 'upstream/master'
2024-10-24 01:00:56 -05:00
SandPoot
e2cc28d21d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-10-20 18:05:53 -03:00
Metis
50e2d911a6
Update general.txt
2024-10-15 00:26:38 -04:00
Mosley
928b4c62b0
Merge remote-tracking branch 'venus/master' into content-stuff
2024-10-11 03:47:54 -05:00
Sim
6e57a237a9
[MIRROR] Popup Notice tgstation/tgstation#61010
...
Ports the admin popup notice from tgstation.
2024-10-07 23:27:22 -03:00
Mosley
3a8024db6d
undoes removals
2024-09-20 01:13:14 -05:00
ariaworld
0601002cd1
Space update
2024-09-02 00:20:38 +02:00
ariaworld
27bb11eb76
yt-dlp
2024-08-18 22:46:16 +02:00
ariaworld
d2422de379
Removes N.2 unholy ERP verbs. Add: new textures for doors and floors.
2024-08-05 20:46:52 +02:00
BongaTheProto
652a380d02
Merge remote-tracking branch 'upstream/master'
2024-05-20 18:15:04 -05:00
SandPoot
de83d338fc
sprint by default
2024-05-20 19:10:16 -03:00
BongaTheProto
129506c899
now the wiki version
...
uses the space law page in our wiki
2023-12-28 20:08:43 -05:00
BongaTheProto
7b5ecc7b49
Merge remote-tracking branch 'upstream/master'
2023-10-07 23:28:42 -05:00
SandPoot
910263d2d9
Merge branch 'update-config' of https://github.com/SandPoot/Citadel-Station-13
2023-10-05 22:01:18 -03:00
SandPoot
a105852042
the stuff
...
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com >
2023-10-05 21:15:11 -03:00
Comicao1
3cbf9ed3f0
Go on
2023-09-07 04:42:07 +03:00
Comicao1
9d5dc157e6
go on
2023-06-09 04:35:04 -03:00
Comicao1
454b3ff566
Teshari + much more to do
2023-04-02 23:15:24 -03:00
KathrinBailey
9d15297966
boxstation engines
...
two new engines:
diy - blank canvas to build your own stuff
diy_sm - an empty room with a crystal in it, make your own chamber!!
config changes
2022-10-16 23:06:38 +01:00
BongaTheProto
0669b85494
Update connections.txt
...
it troubles people doing things locally
2022-10-02 19:16:33 -05:00
BongaTheProto
9cdaffc417
Merge remote-tracking branch 'upstream/master'
2022-09-18 23:40:20 -05:00
SandPoot
4b42d228cb
incorrectly named, would never work
2022-09-18 21:43:40 -03:00
SandPoot
cc9c36bd13
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-17 22:48:51 -03:00
shellspeed1
d9e15776ee
Ports the RBMK reactor from both NSV using Hyper and Splurt code (WIP) ( #15847 )
...
* sprites and sounds
* The code for the reactor itself
* Update code/modules/power/reactor/rbmk.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
* Update code/modules/power/reactor/rbmk.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* Map stuff
* Removes Clamps.
* Matrices separated, this was a mistake on my part.
* Update tgstation.dme
* removal as per putnam's review
* redfines highest available as 1007
* possible soundloop fix? probably not.
* temporary config thing to make engine load
* changes to map template from splurt
* Update code/modules/power/reactor/rbmk.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* Update code/modules/power/reactor/rbmk.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* actually somehow fixed the runtimes?
* old maps from hyper, not needed..
* Revert "old maps from hyper, not needed.."
This reverts commit 92ccd89952d360206926d8b57e82084994a6a0d6.
* take two on removal
* fixes power output
* Update code/modules/power/reactor/rbmk.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* Update code/modules/power/reactor/rbmk.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* deals with the double turf
* Revert "temporary config thing to make engine load"
This reverts commit 7f52188d5261cd60024ef36cf7c33df0748d0c79.
* was told to bring it back
* don't need to change these
* next time I'll just copy paste it instead of type it.
* a
* Flexi Seal crate so we can fix the reactor
* set power to 0 so it can be fixed
* nerfs power output
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
2022-09-17 13:33:51 -07:00
BongaTheProto
bdb5a5bcb9
THE CONFIG
...
p
2022-08-24 20:15:41 -05:00
BongaTheProto
8aad94866a
podpeople hairs + markings
...
me omw to force all pod players to change their species
2022-08-07 16:59:33 -05:00
BongaTheProto
811c1df810
Merge remote-tracking branch 'upstream/master'
2022-07-24 12:05:49 -05:00
SandPoot
0a0e4de14b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-07-24 02:59:28 -03:00
deathride58
578eb440c1
If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix
2022-07-20 16:51:38 -04:00
BongaTheProto
375c0f2634
Merge branch 'master' into pr/359
2022-06-16 16:43:41 -05:00
BongaTheProto
814364c814
cit already had their own railings
...
this may fuck up lambda
2022-06-04 20:15:33 -05:00
Bangus
1567f9366d
Merge branch 'Zombie-unfuckery' of git merge --abort://github.com/Yatiyaya/SpurtStation into Zombie-unfuckery
2022-06-04 01:17:11 -04:00
Yatiyaya
de54b59ef0
Merge branch 'SPLURT-Station:master' into Zombie-unfuckery
2022-06-04 01:09:48 -04:00
Bangus
460eb75f5a
Bunch'a changes and additions. General improvements
2022-06-04 01:04:09 -04:00
BongaTheProto
53fa6873d1
Merge remote-tracking branch 'upstream/master'
2022-06-02 09:57:31 -05:00
Yatiyaya
6229e3124d
Update general.txt
2022-06-02 09:28:07 -04:00
Bangus
fecb5fa63b
Updating the zombie race to support modular creation between anthro mammal/insect races since the current high-functioning zombie is a defunct halloween species from years ago.
2022-06-02 01:25:04 -04:00
SandPoot
d1c44afdae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-01 19:21:46 -03:00
Lin
becb035529
Merge pull request #15632 from deathride58/botrefresh
...
Bot refresh - Makes bot output channels configurable, makes the bot capable of pinging the reboot role
2022-06-01 21:18:10 +00:00
deathride58
113981b5a8
Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more!
2022-05-21 00:21:58 -04:00
deathride58
ccc5ea1758
Bot refresh - Makes bot output channels configurable, makes the bot capable of pinging the reboot role
2022-05-19 15:19:21 -04:00
BongaTheProto
e497294a1e
Merge branch 'master' into prefs-update
2022-05-12 21:47:09 -05:00
BongaTheProto
f4b9585c12
Merge remote-tracking branch 'upstream/master'
2022-05-12 20:47:56 -05:00
SandPoot
5c5bb3c5c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-12 18:09:56 -03:00
BongaTheProto
805968e8c3
Merge branch 'master' into prefs-update
2022-05-11 10:51:56 -05:00
BongaTheProto
5bc3ea02ce
Modularizes and fixes
...
Body sprite option was removed and so were a couple extra pixels in the sprites
2022-05-11 02:45:50 -05:00
BongaTheProto
8652fc82a9
was less than I thought
...
yeah this works ig
2022-05-09 17:33:28 -05:00
BongaTheProto
7a8824cede
Merge branch 'master' into prefs-update
2022-05-08 15:29:30 -05:00
BongaTheProto
2d01bbe453
More ass, more belly
...
Look at the SIZE of those things! Imagine the clapping when they let rip a pungent one! hanmgmfgf
2022-05-07 14:30:36 -05:00
