cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-23 21:27:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
687 Commits
Author SHA1 Message Date
SandPoot a1905591f7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-24 23:49:10 -03:00
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot 4db393440e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-16 21:10:31 -03:00
SandPoot d3a256f1de push 2024-08-11 04:12:13 -03:00
SandPoot 95a30412ad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-05-25 15:46:29 -03:00
SandPoot ad0f659226 push 2024-05-23 21:53:15 -03:00
SandPoot 2e2528ee56 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-13 00:36:29 -03:00
deathride58andGitHub dd8c641520 Merge pull request #15486 from SandPoot/kills-cache 
Solves issues with overlays by updating the whole subsystem
 2024-04-12 23:31:54 -04:00
SandPoot 002a4c31c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-12 22:06:15 -03:00
SandPoot 91045350e5 overlay stuff 2024-04-12 22:01:03 -03:00
SandPoot ca8ce67cd6 mail 2024-04-10 20:54:04 -03:00
SandPoot fd124b03e4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-03 21:27:30 -03:00
SandPoot 0b6d743e22 go 2023-10-28 17:51:02 -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
SandPoot 42d03cb5ae in all seriousness, this can all be kept 2023-10-10 18:41:41 -03:00
SandPoot d4ea14c4ef push 2023-10-09 16:15:49 -03: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
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
SandPoot 072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03:00
SandPootandGitHub 2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00
Timothy TeakettleandGitHub 71de9c13e3 Merge pull request #15962 from SandPoot/contextual-screentips 
Contextual screentips -- Screentips now show you what items/objects can do
 2023-02-15 23:04:54 +00:00
SandPoot 65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -03:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
zerothebigboy 091d9ec00f good 2023-01-30 00:01:22 -05:00
SandPoot 44913d5fff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-01-28 01:20:26 -03:00
SandPoot c60f36a42b files 2023-01-28 01:10:49 -03:00
SandPoot 122bc02af9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-23 20:58:51 -03:00
siliconsandGitHub 2d5e163916 Merge pull request #15947 from SandPoot/bitfield-updates 
Updates bitfields, admin side
 2023-01-23 13:02:28 -08:00
SandPoot 854a1c1b5c modified content 2023-01-22 14:09:10 -03:00
SandPoot e76ed6a1ea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-17 22:26:56 -03:00
SandPoot d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
Darius d90fa375e1 Move heirloom lists to relevant files 
Port of the current TG heirloom system.

Heirlooms are now stored in job_types and species_types instead of a global list. Items used as heirlooms match their modern TG counterparts when possible.

Also fixes the ancient first aid kit, which is used for a heirloom.
 2023-01-04 13:57:54 -05:00
Jerry Wester 13f8559190 add springlock module 2022-12-17 16:54:41 -07:00
Jerry WesterandGitHub 32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07:00
SandPoot f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03:00
PeriodicChaosandJerry Wester 183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
Cognition b747ab56f4 Pins, New Loadout Category, CTRLclick for accessory above suit 2022-11-17 20:58:31 -07:00
SandPoot 4132858e60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-22 02:02:31 -03:00
shellspeed1 4bade2b1c6 merge conflict fix 2022-09-18 23:10:00 -07:00
shellspeed1andGitHub 4ddd0e76cc Update flavor_misc.dm 2022-09-17 19:57:26 -07:00
SandPoot cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03:00
shellspeed1andGitHub b8f7bb00c9 Fixes encoded langauge so people can speak it, also redoes xeno tongue so it can speak same langauges as rest of crew. (#15845) 2022-09-17 13:44:29 -07:00
shellspeed1 cf45a23bb4 adds bellows, mumbles, and crackles as speech verbs 2022-09-17 00:59:27 -07:00
SandPoot 00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -03:00
Putnam3145 b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00