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-27 18:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

190 Commits

Author SHA1 Message Date
BongaTheProto
79fa770ab3 Merge remote-tracking branch 'upstream/master' 2022-10-13 11:21:32 -05:00
shellspeed1
9759bd48e0 another one 2022-09-18 23:19:33 -07:00
shellspeed1
c71dc547cd why do we have so many coin presses? 2022-09-18 23:14:21 -07:00
BongaTheProto
0563def679 Merge remote-tracking branch 'upstream/master' 2022-08-03 17:41:43 -05:00
TripleShades
37da7018e1 god I hate power 2022-07-31 02:42:49 -04:00
BongaTheProto
811c1df810 Merge remote-tracking branch 'upstream/master' 2022-07-24 12:05:49 -05:00
TripleShades
f9cda832ba powerrrrr 2022-07-20 23:25:35 -04:00
nullfag
5cfd0212a5 a 2022-04-17 00:51:23 +02:00
BongaTheProto
a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
BongaTheProto
08b676d23e Update wildwest.dmm 2022-03-14 01:33:12 -05:00
LeonDuvall
5fb3012abf Add files via upload 2022-03-13 21:59:38 -07:00
LeonDuvall
e009560e13 Add files via upload 2022-03-13 21:53:49 -07:00
jbox1
d4f1de862e SPLURT LORE?!! 2022-02-19 11:35:47 +11:00
BongaTheProto
b437b03b48 Merge remote-tracking branch 'upstream/master' 2022-02-13 13:40:33 -05:00
BongaTheProto
77f736d8e7 yes 
:^)
 2021-12-08 18:18:50 -05:00
keronshb
1971e65be3 Fixes the linter 2021-10-14 20:55:58 -04:00
silicons
73d6266f89 fix (#15248) 2021-10-05 19:42:26 +02:00
SandPoot
be2a85d9d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-03 15:41:30 -03:00
WanderingFox95
83987db48a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-10-01 18:51:46 +02:00
Hatterhat
469387881f live eggs? in 2021? (#15216) 
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2021-09-29 20:18:11 +02:00
WanderingFox95
fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
WanderingFox95
dce9801616 another slab gone 2021-09-19 20:42:16 +02:00
dapnee
20f1d8b57b Pubby and Beach Away Fixes 
The one vent bothered me enough to make a map edit.
 2021-09-17 04:32:28 -06:00
zeroisthebiggay
7717c7446c Update SnowCabin.dmm 2021-09-07 19:39:29 -04:00
zeroisthebiggay
6a900e4ec4 Update SnowCabin.dmm 2021-09-07 19:38:40 -04:00
Putnam3145
cc0fb99029 Adds some showers to the beach 2021-08-18 10:19:29 -07:00
WanderingFox95
024d2cd757 Another slab to remove 2021-07-20 19:15:55 +02:00
silicons
a9a12cab54 missed that 2021-04-27 01:00:20 -07:00
silicons
47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08: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
Letter N
69a054826b add art areas on meta, and adds lapvend on box,delta,meta. 
Other map changes are cosmetic.
 2021-03-10 16:34:37 +08:00
Putnam
f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -08:00
Vynzill
60011f339d Jungle Gateway Quickfix 
haha, whoops! forgot I left a cursed rice hat in front of gate during my testing
 2021-02-28 00:33:10 -06:00
Vynzill
5d001fc4b3 rice hat fix 2021-02-12 16:13:59 -06:00
Vynzill
3d7e74ba66 less loot more danger 
touches stuff up, removes gamer loot, buffs a frog and adds apes.
 2021-02-11 23:44:54 -06:00
Hatterhat
fc88f27c85 what atvs? 2021-02-09 22:40:00 -06:00
Putnam
d8e408d1f1 Fixed some major incompetency from 2018. 
// If someone will place 0 of some gas there, SHIT WILL BREAK. Do not do that.
LINDA_turf_tile.dm, line 16.
 2021-01-24 13:26:47 -08:00
Putnam
158dd11d8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-19 17:52:40 -08:00
Putnam
e32dbd1d03 thanks away missions, very cool 2021-01-07 05:36:30 -08:00
MrJWhit
abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
silicons
2b273addf1 Merge pull request #13618 from Vynzill/mappinghell 
new jungle gateway map
 2020-11-07 00:19:11 -07:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
Vynzill
ff6850b9b0 jungle gateway map 2020-10-23 15:11:27 -05:00
Vynzill
5f75151c51 junglemap 2020-10-21 17:00:28 -05:00
Detective Google
86871a92fc fixes the door bolts on the snow cabin 2020-10-02 11:41:43 -05:00
dapnee
cb17ea4874 More Active Turf Fixes 
None of these nerds make their map names logically and it's hard to find which is which wihout going through a hundred of them.
 2020-08-04 12:16:29 -06:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
Cirno
020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00