LetterJay
8ac267eafa
Merge pull request #2567 from Citadel-Station-13/upstream-merge-30277
...
[MIRROR] Fixed Omega comms power
2017-08-31 22:24:37 -05:00
CitadelStationBot
4b202faa1e
Tiny PubbyStation update
2017-08-30 17:06:42 -05:00
CitadelStationBot
e2a7a40ce2
Fixed Omega comms power
2017-08-30 17:06:29 -05:00
kevinz000
e96a529d8b
Merge pull request #2500
2017-08-29 22:43:21 -07:00
kevinz000
3c1114daf2
Merge pull request #2502
2017-08-29 22:41:56 -07:00
kevinz000
f5689b656a
Merge pull request #2509
2017-08-29 22:40:08 -07:00
kevinz000
175224c5de
Merge branch 'master' into upstream-merge-29859
2017-08-29 21:14:45 -07:00
kevinz000
39e5a65ea9
indent sync with tgstation
2017-08-29 20:13:16 -07:00
kevinz000
74b4133c94
sync with upstream shouldn't break too much
2017-08-29 20:11:46 -07:00
kevinz000
0d104b2cd4
update to master
2017-08-29 20:09:18 -07:00
CitadelStationBot
719717934c
Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it
2017-08-29 17:10:59 -05:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
LetterJay
27750d91d6
Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214
...
[MIRROR] Removes the suppose-to-be unused shuttle wall path
2017-08-28 09:01:47 -05:00
CitadelStationBot
12ff0e7406
Removes the suppose-to-be unused shuttle wall path
2017-08-28 02:20:45 -05:00
CitadelStationBot
26890c6f81
Pulls the plug on Cerestation (for real this time)
2017-08-26 14:08:30 -05:00
CitadelStationBot
94400c4d38
Allows disabling shuttle purchases per map.
2017-08-26 11:08:12 -05:00
CitadelStationBot
28bc1d992b
Update metastation.json
2017-08-26 11:07:56 -05:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
d151ebf247
[Omega] Corrected space turf under syndie shuttle corners ( #2418 )
2017-08-22 18:13:23 -07:00
CitadelStationBot
4961966552
|SPECIES FOOD PREFERENCES| ( #2232 )
...
* Species food preferences
* sync
* Update humans.dm
* FUCK PUBBY
2017-08-21 20:23:30 -07:00
CitadelStationBot
c09ec3eb91
fixed delta's n2o console and adds fireaxe to atmos
2017-08-19 18:41:30 -05:00
LetterJay
094c4847f7
Merge pull request #2355 from Citadel-Station-13/upstream-merge-29849
...
[MIRROR] More baseturf helpers
2017-08-18 11:26:53 -05:00
LetterJay
7ab92ade3c
Update lavaland_surface_xeno_nest.dmm
2017-08-18 11:13:45 -05:00
CitadelStationBot
96acbf9853
fixes a blue tile on delta
2017-08-16 01:11:29 -05:00
CitadelStationBot
cfebaa6646
Unlocked miner closet in Pubby aux_base dock
2017-08-14 16:05:29 -05:00
CitadelStationBot
deffc1b1f1
More baseturf helpers
2017-08-13 01:28:20 -05:00
CitadelStationBot
1291b12273
Cleaned up stacked pipes
2017-08-13 01:28:11 -05:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
CitadelStationBot
521c149627
[Pubby] added turrets to AI sat bridge area ( #2235 )
2017-08-05 10:30:21 -07:00
CitadelStationBot
8a4ddbe8a8
[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise ( #2162 )
...
* Ports Rapid Cable Layers from /vg/ and paradise
* rej clean up + manual sync
* maps and .rej file cleanup
* sprite and WGW memes
* actual spellchecked memes
* some other map fix memes
* fuck it, let's just hard sync maps
* dumb paperwork shit for maps
* Revert "dumb paperwork shit for maps"
This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.
* *autistic screeching*
* REEEEEEEEEEEEEEEEEEEEE
* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
CitadelStationBot
76f7fcef9a
[MIRROR] Cleaned up paper varedits + tidied up paths ( #2156 )
...
* Cleaned up paper varedits + tidied up paths
* work smarter, not harder
* citadel snowflake
* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
LetterJay
3d6200ce41
Merge pull request #2143 from Citadel-Station-13/upstream-merge-29492
...
[MIRROR] Tweaks the ash walker nest so that lava rivers won't wreck them
2017-08-01 23:55:53 -05:00
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
LetterJay
cccfeb479e
Update lavaland_surface_ash_walker1.dmm
2017-07-31 23:38:15 -05:00
LetterJay
6fb37022f5
Merge pull request #2189 from Raeschen/Raes_reducemobs
...
Reduces amount of mobs on oldstation.dmm
2017-07-30 23:12:49 -05:00
Raeschen
4032f5de36
Used map merging tool
2017-07-30 17:13:39 +01:00
Raeschen
e5749b08f7
Merge branch 'Raes_reducemobs' of https://github.com/Raeschen/Citadel-Station-13 into Raes_reducemobs
...
# Conflicts:
# _maps/RandomRuins/SpaceRuins/oldstation.dmm
2017-07-30 17:10:38 +01:00
Raeschen
824e4287f2
Heavily reduced the amount of mobs on oldstation.dmm due to NPC POOL MC lag. (Previously about 109 hivebots, now there are fewer, stronger ones.)
...
Edit: Actually used map merge this time.
2017-07-30 17:05:39 +01:00
Raeschen
a6662da11d
Heavily reduced the amount of mobs on oldstation.dmm due to NPC POOL MC lag. (Previously about 109 hivebots, now there are fewer, stronger ones.)
2017-07-30 14:03:01 +01:00
LetterJay
70a5aed428
Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977
...
[MIRROR] Augment Styles/Changes
2017-07-29 23:56:52 -05:00
CitadelStationBot
0f23a00e40
Cleaned up some turf decals, fixed beach away mission ( #2152 )
2017-07-26 22:56:55 -07:00
CitadelStationBot
7c65bae7ba
Cleaned up doubled turf on omega ( #2150 )
2017-07-26 22:56:43 -07:00
CitadelStationBot
7cdeae21a5
Moved abductor ships further apart ( #2149 )
2017-07-26 22:56:13 -07:00
CitadelStationBot
9b7a0c5d54
Tweaks the ash walker nest so that lava rivers won't wreck them
2017-07-26 15:44:58 -05:00
CitadelStationBot
147bd4cf97
Lava is no longer a plating subtype ( #2138 )
2017-07-26 00:05:53 -07:00
LetterJay
51846b1efd
Merge pull request #2122 from Citadel-Station-13/upstream-merge-29485
...
[MIRROR] Map Spellcheck
2017-07-25 12:56:27 -05:00
CitadelStationBot
b998e14a5b
Map Spellcheck
2017-07-24 21:16:46 -05:00
CitadelStationBot
32586afe69
cerestation grammar fix
2017-07-24 21:16:41 -05:00
CitadelStationBot
37b9e24bc0
Removes the gulag sink and water bottles from the sustenance vendor. ( #2094 )
2017-07-24 04:08:56 -07:00
