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-17 09:46:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
7296 Commits
Author SHA1 Message Date
BongaTheProto 2d1d665e41 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
 2023-12-16 10:48:35 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot 8cdb82a23f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-12 22:06:13 -03:00
deathride58andGitHub 3e45c18ab4 Merge pull request #16038 from SandPoot/fix-lava+borgs 
Deals with lava plus a lot of borg stuff
 2023-12-12 19:25:13 -05:00
SandPoot e457f40328 maptext 2023-12-11 17:43:24 -03:00
SandPoot 289695d17f missing arg 2023-12-10 15:26:26 -03:00
SandPoot 36f3edaf4c push 2023-12-10 15:16:51 -03:00
SandPoot c36105ef88 holy hell 2023-12-07 23:08:17 -03:00
SandPoot c519c1e128 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-21 15:00:51 -03:00
ariaworldandGitHub d10a773e3f Merge branch 'SPLURT-Station:master' into spooktober-update 2023-11-18 15:01:21 +01:00
BongaTheProtoandGitHub 161f5a477a Merge pull request #978 from MysteryMan21333/Xenobiology 
[NON-MODULAR] Xenobiology V1.0
 2023-11-17 23:48:39 -05:00
BongaTheProtoandGitHub 460e924f6a Merge pull request #997 from MysteryMan21333/Ports-Wasteland-Robots 
[SEMI-MODULAR] [READY] Fallout 13 Cyborg Sprites.
 2023-11-17 23:42:48 -05:00
ariaworld 1f463a734c Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update 2023-11-17 23:26:33 +01:00
Anonymous c4ed02e793 i live in misery pt 2 2023-11-07 19:04:54 +03:00
Anonymous 3f3d35ad2f No sir, not allowing sprites being unused 
Since SPLURT doesn't have science module, it is made for service one.
 2023-11-07 18:10:22 +03:00
Anonymous cdf660e0ea whoops i forgor 2023-11-07 17:58:53 +03:00
MysteryMan21333 ab1b8912b4 V1.0 2023-11-06 22:08:28 -06: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
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
BongaTheProto ac236ecccd Merge branch 'master' into hate-upstream 2023-10-24 14:37:39 -05: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
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
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
MysteryMan21333 06153ae98f Xenobiology V1.0 2023-10-14 07:15:46 -05: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 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
SandPoot a70314d98e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-10 17:29:05 -03: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
SandPoot b624de1c10 you go 2023-10-08 13:01:15 -03:00
SandPoot c5ba21994d If i had a nickel for every time incapacitated() had some issue, i would have... 2023-10-08 12:49:40 -03:00
BongaTheProtoandGitHub 4742a61480 Merge branch 'Sandstorm-Station:master' into master 2023-10-08 02:36:51 -05:00
SandPoot b945e7a5ed push 2023-10-07 20:48:02 -03: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