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 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,581 Commits 55 Branches 0 Tags
2e6ff742a987079f184cbe8af42bd35519ed226f
Commit Graph

849 Commits

Author SHA1 Message Date
shellspeed1
2e6ff742a9 minor change to map template description. 2022-08-24 15:15:36 -07:00
shellspeed1
d175b4d247 capitalization stuff 2022-08-24 15:13:19 -07:00
shellspeed1
f030d0038f New garden pod 2022-08-21 05:00:26 -07:00
DeltaFire
50be57f107 grrrr 2021-12-08 18:33:06 +01:00
Lin
d5c17f0d84 Merge pull request #15376 from SandPoot/double 
Double beds
 2021-11-24 17:38:10 +00:00
Lin
e3a5391250 Merge pull request #14868 from Arturlang/admin_mapsave 
buildmode mapgen tool save [ready]
 2021-11-24 17:32:48 +00:00
Artur
99dedb54ed Merge remote-tracking branch 'upstream/master' into admin_mapsave 2021-11-20 00:16:56 +02:00
SandPoot
5b85c260a7 Upload files 2021-11-15 01:34:30 -03:00
DeltaFire
6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
silicons
a14549d07b Merge pull request #15299 from Hatterhat/cgau 
funny hands gaming - adds proto-kinetic gauntlets
 2021-10-27 13:36:08 -07:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
Artur
bfcdf83e55 buildmode mapgen tool save 2021-10-26 16:31:36 +03:00
Hatterhat
5dbadffe6b wait a fucking second 2021-10-23 18:15:20 -05:00
Hatterhat
21f88e9711 sounb 2021-10-23 17:47:31 -05:00
Hatterhat
73bbe4f694 igons 2021-10-23 17:47:06 -05:00
Hatterhat
4559b680fd whoops 2021-10-22 22:07:10 -05:00
Hatterhat
7fb3666f43 funny hands gaming 2021-10-22 22:05:18 -05:00
Emily
57950045a7 Fixes the sprites for wielding. 2021-10-20 10:06:14 +02:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
WanderingFox95
fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
zerothebigboy
5206524dd4 gommit 2021-09-02 07:38:48 -04:00
WanderingFox95
97e4b7aef9 Apply suggestions from code review 
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
 2021-07-21 19:58:58 +02:00
WanderingFox95
fabd42be43 lowercase items #2 2021-07-20 23:00:55 +02:00
WanderingFox95
1af648dd47 Bone Spade & Glaive 2021-07-20 18:56:10 +02:00
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
silicons
a29d107d33 Merge pull request #14899 from shellspeed1/blood-drunk-miner-drop 
Moves tendril KA upgrade disks to blood drunk miner.
 2021-06-29 08:51:10 -07:00
silicons
c7766b0f02 Merge pull request #14895 from shellspeed1/another-pod 
Adds a new survival pod, the penthouse pod.
 2021-06-29 08:48:55 -07:00
shellspeed1
26cb16311d A 2021-06-27 20:08:33 -07:00
shellspeed1
f52385ca46 all the stuff to add pod to code 2021-06-27 03:39:13 -07:00
Putnam3145
630098c8aa that might be all 2021-06-21 20:03:27 -07:00
Putnam3145
fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
Putnam3145
c253a2de86 alright how about these 2021-06-21 09:52:54 -07:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
zerothebigboy
e757f9ea2c thetwentythirdofmany 2021-06-12 17:41:09 -04:00
zerothebigboy
3fae79f876 thetwentyfirstofmany 2021-06-11 20:28:25 -04:00
silicons
1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
silicons
d0bb22da5f Merge pull request #14653 from timothyteakettle/rp-markings-attempt-two 
ports rp's marking system
 2021-05-19 08:02:59 -06:00
shellspeed1
e4e5d8f5cd adds an pod for projects 2021-05-17 00:59:10 -07:00
Timothy Teakettle
3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
silicons
1585d1c2be fixes 2021-04-26 23:32:33 -07:00
silicons
af7bb2e09f Merge pull request #14585 from zeroisthebiggay/cumbblegum 
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
 2021-04-18 19:00:14 -06:00
silicons
bda9f2ac76 Merge pull request #14540 from SandPoot/fixing-lizzies 
Fixes some lizards
 2021-04-08 03:22:46 -06:00
zerothebigboy
657d1f69c8 sex 2021-04-07 04:18:04 -04:00
SandPoot
2aa2a8c802 actually not that much needed 2021-03-31 20:28:50 -03:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
SandPoot
df4779dced upload files 2021-03-29 22:26:34 -03:00
R3dtail
0b3773163c Removes Ichor Crates from chest rolls 
Does what it says on the tin
 2021-03-24 22:20:09 -05:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00