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-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,908 Commits 55 Branches 0 Tags
5029af901b173475bb4d5ce480e89f0ca87d3d3b
Commit Graph

865 Commits

Author SHA1 Message Date
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
Lin
1adbf914c2 Merge pull request #15414 from BlueWildrose/wingport 
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
 2022-02-21 00:02:21 +00:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
silicons
2b726d7670 Merge pull request #15324 from Trilbyspaceclone/ashtree 
Ashen tree!
 2022-01-22 04:34:28 -08:00
Hatterhat
0077f682fd crusher gauntlets - resonator hitsound, sharpness to SHARP_NONE (#15458) 
* boo womp

* wrongsonator

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2022-01-09 18:46:48 +01:00
Cognition
c1a41394da flight fixes, pick all wing types if second wing potion chugged, a fucking slime species fix 2021-12-29 22:20:27 -07:00
BlueWildrose
0e3d30e59f Merge branch 'Citadel-Station-13:master' into wingport 2021-12-11 12:53:03 -07:00
DeltaFire
50be57f107 grrrr 2021-12-08 18:33:06 +01:00
Cognition
318240bdc6 TG wing port - Now YOU TOO, can be an "angel" 2021-12-07 18:59:07 -07: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
Trilbyspaceclone
41b3643631 tested and all working 2021-11-09 23:41:57 -05:00
keronshb
9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
Trilbyspaceclone
c7fb7dd90f lower honey + metadata 2021-11-03 14:16:36 -04:00
Trilbyspaceclone
2a4968489d 10-30 2021-11-02 09:31:54 -04:00
Trilbyspaceclone
7816417c32 tree fix and balance honey 2021-11-02 06:31:15 -04:00
Trilbyspaceclone
e10397777c Update ash_tree.dm 2021-11-02 06:06:23 -04:00
Trilbyspaceclone
087e00be1c New line linnet thing 2021-11-01 11:40:01 -04:00
Trilbyspaceclone
5bd9b440a9 Ashen tree! 2021-11-01 11:27:42 -04:00
keronshb
8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
keronshb
c80d65df73 Merge branch 'master' into familyport 2021-10-28 14:34:20 -04: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
keronshb
0bae06adcd Original Port 2021-10-11 22:00:54 -04: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