cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-24 13:16:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
22590 Commits
Author SHA1 Message Date
SandPoot fd124b03e4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-03 21:27:30 -03:00
SandPoot 3bb6783438 content 2023-11-03 21:17:22 -03:00
BongaTheProtoandGitHub b312b97970 Merge pull request #982 from ariaworld/fix-photography 
[FIX] - Photography Album Persistence + Neutral Photographer Quirk
 2023-11-03 17:26:38 -05:00
KrissKr0ss b7c7c24f63 rename icons files 2023-11-01 13:51:19 -05:00
Anonymous ff2d56b023 Ports raptorborgs and catborgs 
Raptorborgs are by Valekin4.
Not sure about catborgs (Vix?), commit was by TheGreatKitsune.
 2023-11-01 09:40:54 +03:00
BlueWildroseandGitHub 720374a7ef Merge pull request #16022 from SandPoot/fix-loadout-runtime-not-spawning-items 
Fix loadout runtime (which prevents remaining items from spawning)
 2023-10-31 14:47:20 -06:00
ariaworld 1594bd360e Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update 2023-10-31 14:03:41 +01:00
ariaworld 23f141965e First draft. 2023-10-31 14:03:34 +01:00
SandPoot 0b6d743e22 go 2023-10-28 17:51:02 -03:00
BongaTheProtoandGitHub e9e96516bd Merge pull request #976 from SPLURT-Station/hate-upstream 
Moves flavor texts to the background tab
 2023-10-26 02:00:46 -05:00
SPLURT-Station f548d60fea Update TGS DMAPI 2023-10-25 00:29:11 +00:00
ariaworldandGitHub f207ad0383 Merge branch 'SPLURT-Station:master' into fix-photography 2023-10-24 22:02:53 +02:00
ariaworld 708ad3d128 Revert "modularize" 
Demodularizes Photography Album Persistence.

This reverts commit 7ebdfba5c9.
 2023-10-24 21:59:22 +02:00
BongaTheProto ac236ecccd Merge branch 'master' into hate-upstream 2023-10-24 14:37:39 -05:00
ariaworld d74d2656e5 Revert erroneous attack_paw proc muzzle removal. 2023-10-24 11:57:34 +02:00
BongaTheProtoandGitHub 1e3e286dd2 Merge pull request #957 from ariaworld/master 
Vacuum Resistance quirk + Haydee Snout + Various body markings
 2023-10-23 19:56:32 -05:00
ariaworld 08ca1f392c Muzzle can be self-removed and locked. 2023-10-23 22:28:57 +02:00
ariaworld 2e88bd396d Penis update. 2023-10-23 22:27:17 +02:00
BongaTheProto a6b7bab389 Merge remote-tracking branch 'upstream/master' into hate-upstream 2023-10-22 21:26:12 -05:00
BongaTheProto bbc7e46021 Merge branch 'master' into hate-upstream 2023-10-22 21:25:06 -05:00
SPLURT-Station 2b34565643 Update TGS DMAPI 2023-10-23 00:30:04 +00:00
SandPoot cb24bd8256 Quickly makes lawsets per character and defaults on server default 2023-10-22 19:39:50 -03:00
BongaTheProto 604b8ea867 Merge remote-tracking branch 'upstream/master' into hate-upstream 2023-10-20 22:29:47 -05:00
SandPoot 3aa3aead3d re-do the whole goddamn thing. 2023-10-20 17:48:13 -03:00
Марк 73e33a788e Choosable Laws. 2023-10-20 16:43:14 +05:00
BongaTheProto 6e6bce8772 Merge remote-tracking branch 'upstream/master' into hate-upstream 2023-10-18 22:02:48 -05:00
BongaTheProto ff03181384 Merge branch 'master' into hate-upstream 2023-10-18 22:02:36 -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
BongaTheProtoandGitHub 4aed5ea1e0 Merge pull request #973 from MysteryMan21333/Code-Edits 
[Mirror] Renames Update_Icons.dm
 2023-10-16 18:23:53 -05:00
LinandGitHub f27f1a21b0 Merge pull request #16015 from SandPoot/undo-accidental-rollback 
Screentips show the option correctly again
 2023-10-16 15:26:49 -04:00
BongaTheProto 58bdf9876b Merge remote-tracking branch 'upstream/master' into hate-upstream 2023-10-14 19:50:53 -05:00
MysteryMan21333 06153ae98f Xenobiology V1.0 2023-10-14 07:15:46 -05:00
SandPoot b78cf83df9 quick fix for the language refactor 2023-10-13 12:54:41 -03:00
ariaworld b70a5b5875 Fix: Missing "select_alteration" 2023-10-12 21:12:34 +02:00
SandPoot 297ee64977 push 2023-10-12 15:45:35 -03:00
BongaTheProto 3230992305 Merge remote-tracking branch 'upstream/master' 2023-10-12 13:28:32 -05:00
SandPoot 45d5d92775 oops 2023-10-12 14:28:57 -03:00
SandPoot ee163aae68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-12 02:40:12 -03:00
BlueWildroseandGitHub def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
BlueWildroseandGitHub aff43910af Merge pull request #16007 from SandPoot/throwing-updat 
[DNM] Updates firemanning, throwing stuff
 2023-10-11 13:51:54 -06:00
BlueWildroseandGitHub 9f29f08cd0 Merge pull request #16013 from SandPoot/change-preferences 
Preferences menu layout change
 2023-10-11 13:51:37 -06:00
BongaTheProto dca4dab806 Merge remote-tracking branch 'upstream/master' 2023-10-10 21:58:50 -05:00
SandPoot 41671a5f22 quick dmapi stuff update 2023-10-10 18:30:48 -03:00
SandPootandGitHub e19de0d8cb Merge pull request #323 from Sandstorm-Station/tgs-dmapi-update 
Automatic TGS DMAPI Update
 2023-10-10 17:42:09 -03:00
SandPoot a70314d98e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-10 17:29:05 -03:00
tgstation-server b29219aa1a Update TGS DMAPI 2023-10-10 01:05:15 +00:00
LinandGitHub 0c823be763 Merge pull request #16012 from SandPoot/admin-respawn-runtime 
Fixes runtime when unrestricted respawning someone
 2023-10-09 15:37:06 -04:00
LinandGitHub de4168bc0e Merge pull request #16011 from SandPoot/not-again-- 
Fixes piggyback riding
 2023-10-09 15:36:52 -04:00
SandPoot d4ea14c4ef push 2023-10-09 16:15:49 -03:00
MysteryMan21333 622b73f02f [Mirror] Renames Update_Icons.dm 
# About The Pull Request

Changes all Update_Icons.dm names to their respected pathing groups to help with clarification.

## Why It's Good For The Game

I personally think this will help with clarification on which Update_Icons.dm they represent as we have quite a few already.

## A Port?

Renames update_icons.dm (#51067)
- TG Station

## Pre-Merge Checklist

- [ ] You tested this on a local server.
- [ ] This code did not runtime during testing.
- [ ] You documented all of your changes.

## Changelog

🆑
code: Small changes to naming.
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
 2023-10-08 15:58:18 -05:00