01920e5fea
Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220
...
[MIRROR] Adds Archaeology Component
2017-09-11 15:22:59 -05:00
33f36fd0de
Adds Archaeology Component
2017-09-08 10:02:01 -05:00
d73b82cf11
Gets rid of manual overlay manipulation
2017-09-06 23:39:08 -05:00
92e055be97
Quick sync ( #2587 )
...
* sync since the mirror was down
* fucking byond
* can't forget these
2017-09-04 04:38:49 -05:00
e70b6ceb33
Chasms will alert mobs below them when they form
2017-08-30 17:06:38 -05:00
44c3aecb3b
Merge pull request #2549
2017-08-29 22:38:57 -07:00
f982cd1d5a
Merge pull request #2550
2017-08-29 22:38:54 -07:00
0f37872fb5
Merge pull request #2463
2017-08-29 22:27:27 -07:00
9cb65df70d
Merge pull request #2426
2017-08-29 22:27:21 -07:00
5c7b743cfa
Merge pull request #2405
2017-08-29 22:27:10 -07:00
408acdd66d
sync
2017-08-29 22:05:16 -07:00
175224c5de
Merge branch 'master' into upstream-merge-29859
2017-08-29 21:14:45 -07:00
b9c58a2914
wew
2017-08-29 21:14:33 -07:00
4faa0d6104
Merge branch 'master' into upstream-merge-30244
2017-08-29 20:06:07 -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
4dc8a1adbc
Workaround to prevent slippery components from flooding SSgarbage
2017-08-29 17:09:53 -05:00
911e1fa194
sync
2017-08-29 09:43:10 -07:00
301a581e64
sync
2017-08-29 09:41:11 -07: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
0a4efdcc8f
Switched dirtystation to use typecaches for checks
2017-08-28 02:20:06 -05:00
94429bdccc
Cleaned up environment_smash vars with bitflag defines ( #2515 )
2017-08-27 05:55:07 -07: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
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
eb0235792a
Singularities dig up asteroid turf
2017-08-19 18:41:38 -05:00
6dd7c44bbc
Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829
...
[MIRROR] Merges the two turf/Entereds
2017-08-18 13:41:23 -05:00
3c91fba8e3
Update turf.dm
2017-08-18 11:16:30 -05:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
16428315aa
Merges the two turf/Entereds
2017-08-13 18:01:40 -05:00
e354c9f289
Fixes turf slipping
2017-08-13 18:00:36 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
1b2efdcc1d
More Initialize() garbage
2017-08-06 18:02:51 -05:00
f5bc18bb55
buildmode fix + blueprints fix ( #2261 )
...
* Fixes Admin Buildmode Mass-Deletion making people nude, gives GetAllContents() an ignore typecache.
* sync turf.dm
2017-08-04 11:46:11 -07:00
ef715b7837
Removes all checks for subsystem existence ( #2252 )
2017-08-04 08:41:52 -07:00
d4f15ff6da
[MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use ( #2039 )
...
* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use
* Fixes beam rifle indent error
* Projectile target check hit code now uses a proc for resharing
* Update beam_rifle.dm
* Delete beam_rifle.dm.rej
* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed
* Update turf.dm
* Update turf.dm
* Delete click.dm.rej
* Update click.dm
* fxies
* woops
* Update turf.dm
* the actual rifle
* dumb clickcatcher
* actions
2017-08-03 06:12:27 -07:00
b0cf9356b7
Combine the two changeturf procs into one
2017-08-02 05:20:12 -05: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
e8ae703c16
Update turf.dm
2017-07-31 18:15:16 -05:00
576ef2510c
Merge branch 'master' into upstream-merge-29367
2017-07-31 17:19:31 -05:00
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
adc7a52b8d
BYPASSES THE DEEP FREEZE ( #2168 )
2017-07-28 23:51:24 -07:00
0f23a00e40
Cleaned up some turf decals, fixed beach away mission ( #2152 )
2017-07-26 22:56:55 -07:00
147bd4cf97
Lava is no longer a plating subtype ( #2138 )
2017-07-26 00:05:53 -07:00
49ee9d6cc9
roundstart AT cleanup ( #2103 )
2017-07-24 04:07:02 -07:00
b2032ed7f5
Update turf.dm
2017-07-19 13:40:24 -05:00
LetterJay