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 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,108 Commits 55 Branches 0 Tags
bfcdf83e55292cd867ba587aba5171e891a65508
Commit Graph

831 Commits

Author SHA1 Message Date
Artur
bfcdf83e55 buildmode mapgen tool save 2021-10-26 16:31:36 +03:00
Emily
57950045a7 Fixes the sprites for wielding. 2021-10-20 10:06:14 +02: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
silicons
720f525683 Merge pull request #14323 from dzahlus/hierophant-esword-no-more 
Hierophant staff no longer deals 30 damage
 2021-03-20 14:32:14 -06:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
silicons
df92faadd4 Update necropolis_chests.dm 2021-03-15 19:05:25 -07:00
Letter N
935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
Sneakyrat6
d5b0251cb5 Merge branch 'master' into matContainer 2021-03-09 05:42:47 -05:00
Sneakyrat6
703567e591 other fixes 2021-03-07 04:09:36 -05:00
dzahlus
71cbd8a615 no more free esword 2021-02-26 14:40:00 +01:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N
de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N
5db87b9065 more updates! 2021-02-12 17:52:59 +08:00
Letter N
6286d40082 code works 2021-02-12 17:26:08 +08:00
keronshb
68b65c3f93 Fixes some error, re adds knockdown 
should prevent item drops
 2021-01-30 16:19:09 -05:00
keronshb
8a75d59db2 Meathook tweaks 
Changes some values to make it a bit more fair.
 2021-01-30 15:59:59 -05:00
Timothy Teakettle
6d6b232afe i hate shitcoders 2021-01-27 20:33:14 +00:00
kappa-sama
c751f114aa finally 2021-01-12 01:42:55 -05:00