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-09 16:07:40 +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
EmeraldSundisk
6512866c06 Initial OmegaStation Security overhaul. (#12499) 
* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Add files via upload
 2020-06-11 05:44:01 -07:00
Trilbyspaceclone
f42994c79b Toxin tweaks! Just storage (#12363) 
* Toxin tweaks

* bepis readd

* paintings

* Update DeltaStation2.dmm

* Fixed
 2020-06-09 05:34:22 -07:00
EmeraldSundisk
1d990d317e Minimally invasive update to Omega Station. (#12434) 
* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Add files via upload
 2020-06-04 15:44:12 -07:00
Ghom
1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2 
Adds a New map, Snow Taxi (A vgstation13 map port)
 2020-06-02 23:48:50 +02:00
EmeraldSundisk
2ac1ada029 Add files via upload 2020-05-31 19:52:00 -07:00
EmeraldSundisk
29108e6cd6 Update CogStation.dmm 2020-05-28 19:59:41 -07:00
MrJWhit
55a58ba76c Fixes pipe to turbine (#12346) 2020-05-28 00:37:36 -07:00
KathrinBailey
778db1d9f5 Fixes missing shutters (#12359) 2020-05-26 03:52:23 -07:00
Ghom
85186a9714 Porting updates related to material datums. (#12317) 
* Porting updates related to material datums.

* art_type

* oh oh
 2020-05-25 14:21:00 -07:00
Ghom
0a6b755eff Apotechary chem dispenser nerf. (#12292) 
* Apotechary chem dispenser nerf.

* Spelling and build_path.
 2020-05-24 13:20:32 -07:00
Ghom
293e3fea28 Removing that maint dorm carbin beside the disposal room, and excess wardrobe. (#12308) 2020-05-24 13:12:18 -07:00
EmeraldSundisk
da772b9cb7 Adds the "Space Diner" space ruin. (#12337) 
* Create spacediner.dmm

* Update spacediner.dmm

* Update spacediner.dmm

* Conversion.

* Adds the beacon and APC.
 2020-05-24 13:11:49 -07:00
Ghom
6756b564b7 Removing that one keg. (#12333) 2020-05-24 13:07:53 -07:00
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
Detective Google
d03d20d570 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-22 13:52:56 -05:00
Detective Google
ddc9118b46 adds disposals courtesy of friend 2020-05-22 13:52:44 -05:00
MrJWhit
861734d119 Updates icebox atmos to box atmos (#12299) 2020-05-20 18:47:54 -07:00
Ghom
3ac61c0704 Porting tg painting code. (#12305) 
* Porting tg painting code.

* yes.
 2020-05-20 18:45:36 -07:00
Ghom
ed90c59d65 Removal of """silk""" (#12221) 
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
 2020-05-19 23:43:46 -07:00
Ghom
9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268) 
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
 2020-05-18 04:46:57 -07:00
jjpark-kb
cbc208375d [Map Fix] Button and Wall (#12285) 2020-05-16 22:29:43 +02:00
Trilbyspaceclone
b21fb97bda Some fixes, some addtions some harm - Ice box changes (#12147) 
* Some fixes, some addtions some harm

* Update icemoon_surface_engioutpost.dmm
 2020-05-15 07:54:25 -07:00
Detective Google
c4ca8db4de showers + insuls 2020-05-14 00:42:32 -05:00
Ghommie
29ce144e94 Delta. 2020-05-14 01:24:47 +02:00
Ghommie
fc5d5fb087 Moving buttons away from windows. 2020-05-14 00:23:47 +02:00
Detective Google
dc49df0a4d clean up 2020-05-13 15:03:41 -05:00
Detective Google
234ed8da8e service lathe go brr 2020-05-13 14:33:29 -05:00
MrJWhit
44bb989ff9 Delta station opening of atmos (#12237) 
* Opening up delta atmos

* Final fixes

* adjustment to recheck travis
 2020-05-13 21:00:12 +02:00
jjpark-kb
1e0f30a446 [Map Edits] Minimal Piping/Device Fixes (#12239) 
* map fixes

* reverting delta fix for PR conflict
 2020-05-13 20:56:56 +02:00
Detective Google
f5754a55ea armory cams 2020-05-13 03:15:41 -05:00
Detective Google
c613376e47 try 2 at nerfing these barricades 2020-05-13 03:10:38 -05:00
Detective Google
e79b1312eb gps for lower mining 2020-05-13 03:06:46 -05:00
Detective Google
676af007fe fan 2020-05-13 02:28:45 -05:00
Detective Google
75ae4f5aa6 more directional doors for medbay 2020-05-13 01:35:50 -05:00
Detective Google
c0843d46d9 tiny fans galore 2020-05-13 01:02:52 -05:00
Detective Google
4378a34ea7 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 21:34:04 -05:00
kevinz000
5a905b2f02 Fixes boxstation (#12236) 
* revert

* ok
 2020-05-13 03:15:17 +02:00
Detective Google
6e5e1b249f Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 18:38:28 -05:00
Detective Google
4f75358ab3 maint bar barricades no longer take 50 years to break 2020-05-12 17:17:12 -05:00
Detective Google
948081fdce outdoor lights, rad protection 2020-05-12 17:13:23 -05:00
kevinz000
e0f1b65785 Merge pull request #12209 from MrJWhit/moving-fire-alarm-in-boxstation-chemistry 
Moves fire alarm in box station in the chem department
 2020-05-12 12:28:41 -07:00
Ghommie
84af9d9d40 wtf 2020-05-12 21:12:17 +02:00
Ghommie
757706653d Map paths. 2020-05-12 21:01:34 +02:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Arturlang
0b03958136 Makes The syndi outpust tanks work (#12228) 2020-05-12 18:31:33 +02:00
Detective Google
2edfcada4c adds a medlathe 2020-05-12 05:03:41 -05:00
Detective Google
10cd4320a7 gaytway 2020-05-12 04:40:18 -05:00
Detective Google
ad1a03d679 chem unfuckery 2020-05-12 02:04:12 -05:00
Detective Google
8f06ae3c56 Q-pads and disposals tune ups 2020-05-11 22:53:32 -05:00
Detective Google
dc931490fd disposals needs a recycler 2020-05-11 21:38:49 -05:00