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-22 20:26:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
1798 Commits
Author SHA1 Message Date
SandPoot dfdcbdbb32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-04 01:33:18 -03:00
The0bserver f1109c4f67 what a crate day (initial commit) 2021-05-01 02:15:07 -04:00
silicons 47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
silicons 275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
SandPoot 93a3b6dac1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-21 14:58:45 -03:00
siliconsandGitHub f0c2188c5f Merge pull request #14443 from necromanceranne/baton_change_pr 
Another dreaded baton rework pr; batons knockdown and slow on rightclick (with a cooldown), otherwise stagger, plus more
 2021-04-20 05:52:59 -06:00
SandPoot bab386168e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-18 23:23:02 -03:00
siliconsandGitHub 821511e64e Merge pull request #14571 from BlueWildrose/piracyisillegal 
Space pirate sleepers can now be crowbared to be destroyed
 2021-04-18 19:38:41 -06:00
BlueWildroseandGitHub 911d8ffc12 requested changes 2021-04-18 18:02:04 -07:00
necromanceranneandGitHub 75e0e893a2 Merge branch 'master' into baton_change_pr 2021-04-19 10:55:33 +10:00
siliconsandGitHub 0dcc6b44ba Merge pull request #14543 from qweq12yt/cargo-bugfixes 
Cargo bugfixes
 2021-04-18 18:52:54 -06:00
siliconsandGitHub e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option 
Activity tracking; traitor class tweaks
 2021-04-18 18:49:27 -06:00
SandPoot 56fab061d3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-15 12:42:23 -03:00
DeltaFire f1e1169e85 dispenser moment 2021-04-13 17:33:04 +02:00
Putnam 4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
SandPoot 0165c4a7c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-10 12:34:59 -03:00
qweq12ytandGitHub 7ca46715d7 Merge branch 'master' into cargo-bugfixes 2021-04-08 19:15:55 -03:00
SandPoot 29bf226fe1 upload closets.dm 2021-04-06 18:18:08 -03:00
siliconsandGitHub cbd7e0de6a Merge pull request #14418 from LetterN/perlin-genny 
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
 2021-04-06 04:10:00 -06:00
BlueWildroseandGitHub de6b3552d5 that grammar would make me mad if I left it there why did I do that 2021-04-05 22:59:24 -07:00
Blue Wildrose 80e9437390 add some game logging for good measure 2021-04-05 21:47:15 -07:00
SandPoot c3f429e718 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-05 14:51:20 -03:00
Blue Wildrose fb79a2033d usr.name into user, also adding in do_after. 2021-04-04 21:34:27 -07:00
LinandGitHub c65b1791d0 Merge pull request #14547 from SandPoot/lockers-and-laptops 
Fixing some issues for laptops and lockers/crates.
 2021-04-04 23:22:41 -05:00
Blue Wildrose 414d9d43e3 adding a gap here 2021-04-04 18:50:11 -07:00
Blue Wildrose 43d855c413 Killable space pirate sleepers 2021-04-04 17:05:18 -07:00
SandPootandGitHub 795a3b3f39 Gives each department id to their respective head. (#148) 
* upload files

* oops, nobody saw this
 2021-04-02 00:37:19 -03:00
SandPoot 2381db5f53 upload files 2021-03-31 12:35:43 -03:00
LetterN f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
qweq12yt 04f90b749f fixes material crates not shipping 2021-03-30 12:33:23 -03:00
SandPoot d13cc725b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-28 16:50:17 -03:00
siliconsandGitHub 2a7aa8e826 Merge pull request #14524 from SandPoot/borgs-buff 
Allows borgs to move pulled stuff around like a human
 2021-03-28 13:48:14 -06:00
SandPoot 1a7d33b801 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-27 11:41:32 -03:00
siliconsandGitHub f269a8d35f Merge pull request #14274 from timothyteakettle/disguise 
lets ghost cafe residents disguise themselves as any mob or object
 2021-03-27 01:37:09 -06:00
SandPoot 0994a37af5 upload files 2021-03-26 11:05:36 -03:00
LetterN e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
SandPoot afae5c3247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-23 19:49:58 -03:00
LinandGitHub 715f86ef5c Merge pull request #14447 from LetterN/fixes-2 
Fixes laptop and tweaks stacks
 2021-03-22 19:52:42 -05:00
LinandGitHub 4e641eedb9 Merge pull request #14489 from LetterN/amogus 
Fixes NIRM
 2021-03-22 15:37:56 -05:00
LetterN 760a7de229 Merge remote-tracking branch 'origin/master' into fixes-2 2021-03-22 09:32:21 +08:00
LetterN 86b8bbf727 no more free shipping 2021-03-21 21:44:04 +08:00
Putnam f1e55f2df0 Paranoid updates to maybe fix air duplication 2021-03-20 22:02:47 -07:00
SandPoot d789df5aa9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-20 18:15:07 -03:00
silicons 5b2a42f254 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-03-20 14:13:23 -07:00
siliconsandGitHub 6491615775 Merge pull request #14461 from Hatterhat/violent-cafe 
removes pacifism from ghost cafe
 2021-03-20 14:28:33 -06:00
SandPoot ff14e45327 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-20 10:51:21 -03:00
LetterN 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
siliconsandGitHub d434f60cb3 Update closets.dm 2021-03-18 16:59:03 -07:00
Hatterhat dd44ebae46 peak funny 2021-03-17 16:10:32 -05:00
LetterN 228105b391 laptop and closet decon fix 2021-03-16 14:47:28 +08:00