Mosley
0d9eebd20c
Merge remote-tracking branch 'upstream/master'
2025-04-24 17:03:15 -05:00
SandPoot
06572b5e20
cover holes
2025-04-18 18:30:23 -03:00
SandPoot
f6405100b5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2025-02-25 21:46:53 -03:00
SandPoot
3425760ced
push
2025-02-25 17:48:02 -03:00
SandPoot
dca8b2503c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2025-02-13 18:11:36 -03:00
SandPoot
2d87780147
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2025-02-13 18:06:56 -03:00
SandPoot
fc530786b8
push
2025-02-13 17:39:15 -03:00
SandPoot
56d972eb0b
all sorts of fixes and updates, may break stuff
2025-02-09 02:09:28 -03:00
Mosley and GitHub
313f48875e
Merge pull request #1216 from SaraSayomi/Snaxi-regretti
...
Snaxi regretti
2025-02-02 23:25:27 -05:00
SandPoot
76042510df
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2025-01-28 19:21:39 -03:00
SandPoot
cae94afdb7
push
2025-01-26 18:06:36 -03:00
SandPoot
a2aa92cbc4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2025-01-24 02:08:58 -03:00
ariaworld and GitHub
44e507dfef
[BEESTATION PORT] Semi-Port of Beestation Decal Fixes, Fixes turf decals disappearing on shuttle movements ( #16119 )
...
* SEMI-PORT OF BEESTATION PR #3111 : Decal fixes
* Forgot this, rotate flag
2025-01-24 01:47:50 -03:00
Mosley
dedc5aef94
Merge remote-tracking branch 'upstream/master'
2024-12-05 16:49:03 -05:00
SandPoot
51b854d788
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-12-04 19:21:37 -03:00
SandPoot
ad23911fe8
set real rank, NOWWWW
2024-12-04 16:10:09 -03:00
SandPoot
91c911383b
stuff
2024-12-04 16:01:03 -03:00
Letter N and GitHub
caec26cd20
buh
2024-12-04 23:05:09 +08:00
Sara
0ba877ce10
"Coding is my passion™"
...
It really isn't, at all
2024-12-03 12:24:55 -07:00
Sara and GitHub
0cebc2bdda
Merge branch 'SPLURT-Station:master' into Snaxi-regretti
2024-12-03 10:10:10 -07:00
Mosley
3c63bdc873
Merge remote-tracking branch 'upstream/master'
2024-11-29 19:41:18 -05:00
SandPoot and GitHub
2a306556be
Merge pull request #388 from xTheLifex/tweaks
...
Tweaks
2024-11-28 20:09:05 -03:00
Mosley
a44046076a
Merge remote-tracking branch 'upstream/master'
2024-11-21 22:44:41 -05:00
SandPoot
1d6008397a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-11-19 23:22:26 -03:00
Sara and GitHub
b26a9f9c46
Merge branch 'SPLURT-Station:master' into Snaxi-regretti
2024-11-18 03:00:50 -07:00
deathride58 and GitHub
aa4ab29d97
Merge pull request #16113 from sheepishgoat/usable_bsrped
...
Buffs RPEDs
2024-11-17 18:18:02 -05:00
Metis
d6561e5236
Update rped.dm
2024-11-17 18:00:26 -05:00
Darius
e70aeea39b
Quirk file separations
...
This does the following:
- Separates all modular quirks into separate files, with no other changes.
- Modularizes some non-modular edits into a new file
- Fixes location of hydra trait definition
2024-11-04 13:49:08 -05:00
Metis
f6af059a06
job titles
2024-11-02 03:16:16 -04:00
Sara
8091d7a060
More maints
2024-10-31 21:04:30 -06:00
Sara
b0957d7def
A-Maze-ing addition
2024-10-31 11:35:52 -06:00
Sara
bd5d56336b
Major push
2024-10-30 23:14:31 -06:00
Metis
b072a63cea
Update emotes.dm
2024-10-26 18:48:16 -04:00
Metis
1bbe63c33b
sweet relief
2024-10-25 00:44:31 -04:00
Mosley
928b4c62b0
Merge remote-tracking branch 'venus/master' into content-stuff
2024-10-11 03:47:54 -05:00
Sim
50c16ccfad
[PORT] Adds Immersion from tgstation/tgstation/47704
...
Please roleplay appropriately, okay?
Commit can also be called "How I Lost My Entire Playerbase"
2024-10-08 18:29:20 -03:00
Sim
c8983e1b03
Did you know Mosley pulls from downstreams without knowing what he pulls?
...
AKA [PORT] Refactors smiting, adds smite build mode tgstation/tgstation#55327
!! NOT!! A!! RUNNING!! BUILD!!
LIGHTNING IS BROKEN
IMMERSE IS COMMENTED OUT
HALF OF THIS SHIT IS BROKEN
DO NOT BASE YOURSELF ON THIS BUILD!!
2024-10-08 01:50:15 -03: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
14380b60a5
Merge remote-tracking branch 'venus/master' into content-stuff
2024-10-07 17:12:36 -05:00
Sim
64becded7f
Ports the Emote Panel
...
This Commit does the following:
Ports the Emote Panel
Turns SPLURT's emotes into /sound/human datums to reduce redundancy in the amount of emotes.
Gives almost every emote a name for the emote panel.
Removes herobrine.
Also fixes a few errors and makes sure all files are properly tested for Pull Request
2024-09-30 21:48:48 -03:00
Sim
8825218293
initial commit
2024-09-27 16:13:51 -03:00
Mosley
494e4d86d8
Update negative.dm
2024-09-18 18:56:22 -05:00
ariaworld
1034322536
A few more apartments
2024-09-15 03:26:10 +02:00
SandPoot
a103acd509
cavalry's here
2024-09-10 02:00:55 -03:00
xTheLifex
0fbdbb7339
cleaning element with range
2024-09-09 23:06:55 -03:00
ariaworld
27e2e80cb8
Add: random-gen maintenance and other useful things
2024-09-08 22:46:28 +02:00
ariaworld
e0b2d50710
Merge remote-tracking branch 'splurt/master'
2024-09-08 01:20:49 +02:00
Mosley
bd1993e2a8
Merge remote-tracking branch 'upstream/master'
2024-09-07 15:56:35 -05:00
ariaworld
e45b334f6d
Two new ruins
2024-09-07 22:42:18 +02:00
SandPoot
909acfb468
push some fixes
2024-09-05 22:47:46 -03:00
Mosley