CitadelStationBot
f778b3061c
[MIRROR] Gives Deltastation's and Metastation's armory one more riot shotty ( #2771 )
...
* share the love
* Gives Deltastation's and Metastation's armory one more riot shotty
2017-09-17 23:07:55 -05:00
CitadelStationBot
83ec9b6d26
[MIRROR] Cleans up showcase & plaque varedits, updated loyalty implant references ( #2768 )
...
* Cleans up showcase & plaque varedits, updated loyalty implant references (#30698 )
* Cleans up showcase varedits
* drop_location for oldpods
* Plaques + more loyalty implant references
* Cleans up showcase & plaque varedits, updated loyalty implant references
2017-09-17 23:07:05 -05:00
CitadelStationBot
e2e85e9294
[MIRROR] Window Spawner Refactor ( #2815 )
...
* Window spawner refactor (#30747 )
* Window Spawner Refactor
2017-09-17 22:42:22 -05:00
CitadelStationBot
0187068b6a
[MIRROR] Omega fixes ( #2816 )
...
* Omega fixes (#30779 )
* Omega fixes
2017-09-17 22:36:49 -05:00
CitadelStationBot
4dd0dc9d66
[MIRROR] Various grammar fixes ( #2842 )
...
* Various grammar fixes
* Update mecha_parts.dm
* Update crates.dm
* Update ghost_role_spawners.dm
* Update paper_premade.dm
* Update oldstation.dm
2017-09-17 22:35:51 -05:00
CitadelStationBot
c8b153ee71
[MIRROR] Varedit cleanup mk4 ( #2833 )
...
* Varedit cleanup mk4 (#30794 )
* Cleans up and corrects a bunch of varedits
* Plant varedits
* More layers
* Adjusted plant name/description
* Varedit cleanup mk4
2017-09-17 22:31:30 -05:00
CitadelStationBot
b0b3e00c51
[MIRROR] Cleans up some chemmaster varedits ( #2832 )
...
* Cleans up some chemmaster varedits (#30787 )
* Cleans up some chemmaster varedits
* Moved the chemmaster on Omega.
* Cleans up some chemmaster varedits
2017-09-17 22:27:17 -05:00
CitadelStationBot
1db4249fa1
[MIRROR] Adds Abandoned Airlocks ( #2784 )
...
* Adds Abandoned Airlocks (#30705 )
* Automatic changelog generation for PR #30056 [ci skip]
* Delete AutoChangeLog-pr-30056.yml
* Abandoned Airlocks
* Added to maps
* inclusive numbering
* Update airlock.dm
* Tweaks
* Capital ChangeTurf
* Update airlock.dm
* no more update_icons
* Abandoned paths (#4 )
* Abandoned paths
* Cleaned up dirty var
* Adds Abandoned Airlocks
2017-09-16 04:32:19 -05:00
CitadelStationBot
3b144c423c
[MIRROR] Fix CentCom issues ( #2619 )
...
* Fix CentCom issues
* Actually ports fixes
2017-09-13 20:43:11 -05:00
CitadelStationBot
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
Poojawa
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
CitadelStationBot
9d52a495b2
[MIRROR] Fix monastery shuttle + Pods ( #2599 )
...
* Fix monastery shuttle + Pods
* actually ports podfix
2017-09-13 17:58:25 -05:00
CitadelStationBot
86ebef0f04
[MIRROR] Fixed pubby emergency shuttle ( #2574 )
...
* Fixed pubby emergency shuttle
* actually fixes Pubby
2017-09-13 17:57:41 -05:00
LetterJay
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
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
CitadelStationBot
50b88388da
Crew monitoring rework part 1: crew pinpointers
2017-08-30 17:03:20 -05:00
kevinz000
f5689b656a
Merge pull request #2509
2017-08-29 22:40:08 -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
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
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
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
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05: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
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
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
LetterJay
1e2fd6c235
Merge pull request #2044 from Citadel-Station-13/upstream-merge-29293
...
[MIRROR] Made cell / holding cell windoors their own subtype
2017-07-19 13:41:37 -05:00
LetterJay
e94cb572e7
Merge pull request #2077 from Citadel-Station-13/upstream-merge-29328
...
[MIRROR] [Delta] fixed doppler direction
2017-07-19 13:30:59 -05:00
LetterJay
27b826a6f1
Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260
...
[MIRROR] Changes all access const to be a define
2017-07-19 13:18:58 -05:00
CitadelStationBot
66b42903cb
[Delta] fixed doppler direction
2017-07-19 10:25:33 -05:00
