d64c23b7f9
[MIRROR] Fix syndicate toy C20r and L6 Saw not having riot darts ( #2740 )
...
* Fix syndicate toy C20r and L6 Saw not having riot darts (#30645 )
* Add riot darts back into toy C20r and L6 Saw
Riot darts were removed from the unrestricted variants of these guns, also changed these ruins to use the new /riot variant in order to maintain original functionality.
* Comments are good
Especially when inheritance makes everything weird.
* Fix syndicate toy C20r and L6 Saw not having riot darts
2017-09-13 20:57:54 -05:00
3b144c423c
[MIRROR] Fix CentCom issues ( #2619 )
...
* Fix CentCom issues
* Actually ports fixes
2017-09-13 20:43:11 -05:00
82d0aae420
[MIRROR] Changes shuttle port direction var from an angle to a dir ( #2613 )
...
* Changes shuttle port direction var from an angle to a dir
* actually ports the directions
* Update shuttle.dm
* how
2017-09-13 20:39:55 -05:00
8406baebbe
Makes APC cell_type actually pick a cell ( #2747 )
...
* Ports TG#30327
* Update apc.dm
* maybe delta can be fully copies over, yes?
2017-09-13 19:57:21 -05:00
9d52a495b2
[MIRROR] Fix monastery shuttle + Pods ( #2599 )
...
* Fix monastery shuttle + Pods
* actually ports podfix
2017-09-13 17:58:25 -05:00
86ebef0f04
[MIRROR] Fixed pubby emergency shuttle ( #2574 )
...
* Fixed pubby emergency shuttle
* actually fixes Pubby
2017-09-13 17:57:41 -05:00
63ebf08a0d
[MIRROR] Adds shovels to the golem ship ( #2742 )
...
* Adds shovels to the golem ship
* Adds shovels to the golem ship
2017-09-13 16:56:30 -05:00
a5a8f8faba
Merge pull request #2691 from Citadel-Station-13/upstream-merge-30530
...
[MIRROR] Adds Gondoland and the rare Gondolas
2017-09-12 01:21:09 -05:00
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
3aec72d4f4
Adds Gondoland and the rare Gondolas ( #30530 )
...
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.
The gondoland asteroid is the last natural habitat for these rare creatures.
2017-09-10 17:10:45 -05:00
849deb5e4e
Cleans up more paper fluff varedits. ( #30418 )
2017-09-06 18:42:43 -05:00
e13ff54c44
disables Pubby from rotation ( #2624 )
2017-09-06 07:05:16 -05:00
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
4b202faa1e
Tiny PubbyStation update
2017-08-30 17:06:42 -05:00
e2a7a40ce2
Fixed Omega comms power
2017-08-30 17:06:29 -05:00
50b88388da
Crew monitoring rework part 1: crew pinpointers
2017-08-30 17:03:20 -05:00
e96a529d8b
Merge pull request #2500
2017-08-29 22:43:21 -07:00
3c1114daf2
Merge pull request #2502
2017-08-29 22:41:56 -07:00
f5689b656a
Merge pull request #2509
2017-08-29 22:40:08 -07:00
175224c5de
Merge branch 'master' into upstream-merge-29859
2017-08-29 21:14:45 -07:00
39e5a65ea9
indent sync with tgstation
2017-08-29 20:13:16 -07:00
74b4133c94
sync with upstream shouldn't break too much
2017-08-29 20:11:46 -07:00
0d104b2cd4
update to master
2017-08-29 20:09:18 -07:00
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
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
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
12ff0e7406
Removes the suppose-to-be unused shuttle wall path
2017-08-28 02:20:45 -05:00
26890c6f81
Pulls the plug on Cerestation (for real this time)
2017-08-26 14:08:30 -05:00
94400c4d38
Allows disabling shuttle purchases per map.
2017-08-26 11:08:12 -05:00
28bc1d992b
Update metastation.json
2017-08-26 11:07:56 -05:00
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
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
d151ebf247
[Omega] Corrected space turf under syndie shuttle corners ( #2418 )
2017-08-22 18:13:23 -07:00
4961966552
|SPECIES FOOD PREFERENCES| ( #2232 )
...
* Species food preferences
* sync
* Update humans.dm
* FUCK PUBBY
2017-08-21 20:23:30 -07:00
c09ec3eb91
fixed delta's n2o console and adds fireaxe to atmos
2017-08-19 18:41:30 -05:00
094c4847f7
Merge pull request #2355 from Citadel-Station-13/upstream-merge-29849
...
[MIRROR] More baseturf helpers
2017-08-18 11:26:53 -05:00
7ab92ade3c
Update lavaland_surface_xeno_nest.dmm
2017-08-18 11:13:45 -05:00
96acbf9853
fixes a blue tile on delta
2017-08-16 01:11:29 -05:00
cfebaa6646
Unlocked miner closet in Pubby aux_base dock
2017-08-14 16:05:29 -05:00
deffc1b1f1
More baseturf helpers
2017-08-13 01:28:20 -05:00
1291b12273
Cleaned up stacked pipes
2017-08-13 01:28:11 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
521c149627
[Pubby] added turrets to AI sat bridge area ( #2235 )
2017-08-05 10:30:21 -07:00
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
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
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
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
cccfeb479e
Update lavaland_surface_ash_walker1.dmm
2017-07-31 23:38:15 -05:00
6fb37022f5
Merge pull request #2189 from Raeschen/Raes_reducemobs
...
Reduces amount of mobs on oldstation.dmm
2017-07-30 23:12:49 -05:00
4032f5de36
Used map merging tool
2017-07-30 17:13:39 +01:00
CitadelStationBot