12ff0e7406
Removes the suppose-to-be unused shuttle wall path
2017-08-28 02:20:45 -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
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
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
70a5aed428
Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977
...
[MIRROR] Augment Styles/Changes
2017-07-29 23:56:52 -05:00
7c65bae7ba
Cleaned up doubled turf on omega ( #2150 )
2017-07-26 22:56:43 -07:00
7cdeae21a5
Moved abductor ships further apart ( #2149 )
2017-07-26 22:56:13 -07:00
147bd4cf97
Lava is no longer a plating subtype ( #2138 )
2017-07-26 00:05:53 -07:00
51846b1efd
Merge pull request #2122 from Citadel-Station-13/upstream-merge-29485
...
[MIRROR] Map Spellcheck
2017-07-25 12:56:27 -05:00
b998e14a5b
Map Spellcheck
2017-07-24 21:16:46 -05:00
32586afe69
cerestation grammar fix
2017-07-24 21:16:41 -05:00
37b9e24bc0
Removes the gulag sink and water bottles from the sustenance vendor. ( #2094 )
2017-07-24 04:08:56 -07:00
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
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
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
66b42903cb
[Delta] fixed doppler direction
2017-07-19 10:25:33 -05:00
0ce34e08b6
Augment Styles/Changes
2017-07-18 06:45:44 -05:00
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
bbc28aa856
Energy swords and other transforming energy weapons are now subtypes of transforming weapons ( #2049 )
2017-07-17 22:51:51 -07:00
755de4f223
Made cell / holding cell windoors their own subtype
2017-07-17 06:52:17 -05:00
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
d286ed197e
Cleaned up duped vars
2017-07-15 22:28:58 -05:00
3f1204e31d
[Deltastation] Fixes some access issues
2017-07-13 17:46:30 -05:00
cce816f900
Fixed walls on pubby shuttle ( #1968 )
2017-07-10 16:13:37 -07:00
ce82313f30
Alters Meta's robo resources to an amount closer to Box's ( #1966 )
2017-07-10 16:13:27 -07:00
292bed59f0
Adds a crew monitoring console to the warden's office in BoxStation
2017-07-09 19:43:35 -05:00
acb20fcde2
Box Viro Wants Plasma v2
2017-07-08 09:45:42 -05:00
a85476ec78
Corrected misplaced vents on Delta ( #1939 )
2017-07-07 23:48:37 -07:00
cb5247d060
Fixes Gamemode Voting & Map Edits ( #1937 )
...
* fixes roundtype voting
* keg spawner
* maint bar to box and kinkmates to delta+meta
2017-07-07 17:54:53 -04:00
85b4996267
Merge pull request #1912 from Citadel-Station-13/upstream-merge-29062
...
[MIRROR] Adds wires to armory on Meta
2017-07-06 22:46:15 -05:00
642817d144
Merge pull request #1911 from Citadel-Station-13/upstream-merge-29063
...
[MIRROR] Adds aux resources to Delta's aux storage
2017-07-06 22:46:03 -05:00
24ec38bfe3
Merge pull request #1910 from Citadel-Station-13/upstream-merge-29065
...
[MIRROR] Renames mech bay APC on Pubby
2017-07-06 22:45:48 -05:00
2a5ad74faf
Merge pull request #1909 from Citadel-Station-13/upstream-merge-29070
...
[MIRROR] Replaces centcom admin mirrors with normal ones
2017-07-06 22:45:35 -05:00
169983ff9d
Merge pull request #1908 from Citadel-Station-13/upstream-merge-29069
...
[MIRROR] Replaces useless teleporter consoles on bridge
2017-07-06 22:45:19 -05:00
e0db6cd92b
Merge pull request #1907 from Citadel-Station-13/upstream-merge-29067
...
[MIRROR] Sets wall in pod evac area on centcom to nodiag
2017-07-06 22:45:03 -05:00
d653febeb2
Adds wires to armory on Meta
2017-07-06 19:19:31 -05:00
e413712d68
Adds aux resources to Delta's aux storage
2017-07-06 19:19:27 -05:00
6fdbee9f2f
Renames mech bay APC on Pubby
2017-07-06 19:18:22 -05:00
CitadelStationBot