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:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,443 Commits 55 Branches 0 Tags
065ca5d2fa7868adb36403c396e857b666f923da
Commit Graph

1605 Commits

Author SHA1 Message Date
Detective Google
d0024575e7 fixes the non matching turf atmos (hopefully) 2020-04-30 20:25:51 -05:00
kevinz000
270f5ed168 fix 2020-04-30 18:15:43 -07:00
Detective Google
8cd5b4ff4a fixes solars + removes the space tiles in the toxins burn chamber 2020-04-30 19:21:53 -05:00
Detective-Google
c146c898c0 Merge branch 'master' into 91-files-changed-fml 2020-04-30 18:42:38 -05:00
Detective Google
41d1dd1763 fixes the maps 2020-04-30 18:13:02 -05:00
kevinz000
2f236ffc04 Merge pull request #12048 from zeroisthebiggay/ilowkeydespiseatmospherics 
deautismosifies box station atmospherics
 2020-04-30 15:00:36 -07:00
kevinz000
d2b7c35ec7 Merge pull request #12057 from MrJWhit/fixes-up-singulo-room 
Links up the rad shutters in singulo engine
 2020-04-30 11:13:51 -07:00
ZeroMan
52b7086876 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ilowkeydespiseatmospherics 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
 2020-04-30 13:48:48 -04:00
kevinz000
f028672e3c Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml 2020-04-30 01:00:08 -07:00
kevinz000
72cbb77ecc fixes 2020-04-30 00:48:37 -07:00
kevinz000
619609f5ff Merge pull request #12020 from bunny232/master 
Box pool/bar holopads+ scrubbers (that lead to space) in xenobio pens
 2020-04-29 12:01:11 -07:00
kevinz000
1d12aa5779 Merge pull request #12006 from Trilbyspaceclone/kiloton-of-errors 
Kilo station improvements
 2020-04-29 11:59:26 -07:00
MrJWhit
7831b53932 Links up the rad shutters 2020-04-29 14:03:17 -04:00
ZeroMan
22d6ac78e1 i actually despise coding 2020-04-28 12:26:33 -04:00
ZeroMan
c5107f8fe0 i actually despise coding 2020-04-28 12:25:48 -04:00
ZeroMan
041d7ce4bc i have committed warcrimes 2020-04-28 02:56:38 -04:00
ZeroMan
40f7472410 i actually despise coding 2020-04-28 02:47:28 -04:00
ZeroMan
8dc130175d i actually despise coding 2020-04-28 02:46:46 -04:00
TrilbySpaceClone
39e460d795 Kevs request 2020-04-27 07:16:00 -04:00
kevinz000
6ff9d54e4f Merge pull request #11947 from MrJWhit/vg-atmos-box 
Ports /vg/ atmos map for boxstation
 2020-04-25 17:01:34 -07:00
kevinz000
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 
code for designs' security level requirements.
 2020-04-25 16:53:48 -07:00
kevinz000
7d688126c8 Merge pull request #12008 from Ghommie/Ghommie-cit707 
VR Levels are not a subset of Away Missions anymore.
 2020-04-25 16:51:52 -07:00
TrilbySpaceClone
655497be89 why didnt these save? 2020-04-25 18:17:38 -04:00
TrilbySpaceClone
5637ba3b53 more decal delettion 2020-04-25 18:12:09 -04:00
bunny232
a245741f3e Update BoxStation.dmm 2020-04-25 07:58:08 -04:00
Lin
f745c59fad Merge pull request #11968 from MrJWhit/TEG-heat-go-away 
teg map hot no hot room plz
 2020-04-25 03:28:00 +00:00
Ghommie
0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
Ghom
a831b3b623 Merge pull request #11995 from MrJWhit/fixes-to-pubby-engine 
Quick fixing up of pubbystation things
 2020-04-24 21:29:32 +02:00
Ghommie
58fc679cce WIP 2020-04-24 20:49:15 +02:00
TrilbySpaceClone
a3379089a6 Decal delete 2020-04-24 11:26:21 -04:00
Detective Google
71be8ed2fc ports all the tg junk for icemoon, not yet changed to make it all compile 2020-04-24 00:02:03 -05:00
MrJWhit
cc9d3b485a Removes putnam upsetti mixer 2020-04-24 00:47:11 -04:00
MrJWhit
100d7cffd2 Also fix that one maint door to be a maint door 2020-04-23 19:20:43 -04:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
MrJWhit
037ea6e073 fixing up the engine 2020-04-23 18:26:39 -04:00
MrJWhit
a621474ae7 Adds a missing wire and a second SMES to the AI sat 2020-04-23 18:10:56 -04:00
TrilbySpaceClone
c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
MrJWhit
8e7728c216 Reduce atmos suits, add pump to waste from mix, turn off air to waste pump 2020-04-22 14:18:00 -04:00
MrJWhit
eafdae5e66 Swaps out some catwalks for latices to make travis happy 2020-04-22 14:01:11 -04:00
MrJWhit
286d1298fd Fixes for atmos 
Sure are some gosh dilly dang fixes
 2020-04-21 22:44:07 -04:00
MrJWhit
4fc041d4f4 teg hot no hot 
aaaaaaah
 2020-04-21 19:43:38 -04:00
nik707
5e1c6ae58e Merge pull request #11945 from EmeraldSundisk/cogfix2.1 
Cogfix2.1
 2020-04-21 09:23:16 -05:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge 
Ports TG Tackling and uses it to rework bloodsucker lunge
 2020-04-21 15:50:44 +02:00
Ghommie
1659e2804e Deletes lots of autoylathe copypasta. 2020-04-21 04:04:10 +02:00
MrJWhit
f498fb106a Update BoxStation.dmm 
Aaaaah
 2020-04-20 05:25:20 -04:00
EmeraldSundisk
10d8ef79db Update CogStation.dmm 2020-04-19 20:33:35 -07:00
TrilbySpaceClone
d98f536003 map fix + cube fix 2020-04-19 19:38:23 -04:00
MrJWhit
ba9d7c7dbc Fixing up of boxstation 2020-04-18 17:12:16 -04:00
kevinz000
038cb5c911 Merge pull request #11849 from Ghommie/Ghommie-cit680 
Removes pixel offsets from box dorms lockers/dressers etcetera.
 2020-04-17 05:09:37 -07:00
Ghom
044d360d20 Merge pull request #11877 from Detective-Google/lambda-fixes 
Fixes a bunch of gripes people had with lambda.
 2020-04-17 08:55:14 +02:00