Commit Graph

112 Commits

Author SHA1 Message Date
CitadelStationBot e354c9f289 Fixes turf slipping 2017-08-13 18:00:36 -05:00
CitadelStationBot cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot 1b2efdcc1d More Initialize() garbage 2017-08-06 18:02:51 -05:00
CitadelStationBot 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
CitadelStationBot ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00
CitadelStationBot 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
CitadelStationBot b0cf9356b7 Combine the two changeturf procs into one 2017-08-02 05:20:12 -05: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
LetterJay e8ae703c16 Update turf.dm 2017-07-31 18:15:16 -05:00
LetterJay 576ef2510c Merge branch 'master' into upstream-merge-29367 2017-07-31 17:19:31 -05:00
LetterJay 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
CitadelStationBot adc7a52b8d BYPASSES THE DEEP FREEZE (#2168) 2017-07-28 23:51:24 -07:00
CitadelStationBot 0f23a00e40 Cleaned up some turf decals, fixed beach away mission (#2152) 2017-07-26 22:56:55 -07:00
CitadelStationBot 147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
CitadelStationBot 49ee9d6cc9 roundstart AT cleanup (#2103) 2017-07-24 04:07:02 -07:00
LetterJay b2032ed7f5 Update turf.dm 2017-07-19 13:40:24 -05:00
CitadelStationBot f61e22958f split typecache filters into two procs 2017-07-19 05:12:17 -05:00
CitadelStationBot 0b7d08d5ac Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc 2017-07-19 04:05:53 -05:00
CitadelStationBot a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot 8d9dc6dd13 [MIRROR] Fixes a ... likely important bug with shuttle code.... (#2061)
* Fixes a ... likely important bug with shuttle code....

* Delete turf.dm.rej

* Update turf.dm
2017-07-18 06:01:02 -07:00
CitadelStationBot 556a8b7216 Unbreaks turf.empty (#2053) 2017-07-18 05:58:27 -07:00
CitadelStationBot e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBot 54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
CitadelStationBot 2d3905457e [MIRROR] Rename Bump to Collide (#2002)
* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
2017-07-14 21:35:56 -07:00
LetterJay df26bdd9cf cleanup 2017-07-14 10:22:43 -05:00
CitadelStationBot eb5cce3b8b Prevents transit turfs from throwing things if it has lattice (#1996) 2017-07-14 03:21:23 -07:00
CitadelStationBot 1da785ffb5 Removes old height parameter from CanPass proc 2017-07-13 17:46:36 -05:00
CitadelStationBot 2892a3710d [MIRROR] Adds collapsing stone tiles (#1933)
* Adds collapsing stone tiles

* Update necropolis_gate.dm

* Update necropolis_gate.dm.rej

* Delete necropolis_gate.dm.rej
2017-07-13 06:38:07 -07:00
CitadelStationBot ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot 1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
CitadelStationBot 220a844f4b Chasm code cleanup 2017-07-08 09:44:37 -05:00
CitadelStationBot 24e0c88263 Removes the hot variants of necropolis tiles and walls (#1885) 2017-07-06 13:20:38 -05:00
Poojawa b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot 5f6a2a999a Chasms, asteroid turfs, basalt, and lava can no longer be made wet (#1847) 2017-07-01 21:21:24 -07:00
CitadelStationBot ac33b9defb Adds some neat tiles and walls for use on lavaland 2017-06-26 09:19:17 -05:00
CitadelStationBot df815e99bd Lavaland's default atmos is now a define 2017-06-21 08:32:00 -05:00
LetterJay f668021230 commit 2017-06-19 17:33:40 -05:00
LetterJay 9332353714 update 2017-06-19 17:31:00 -05:00
LetterJay 866a569e41 dmi to png 2017-06-19 17:28:06 -05:00
LetterJay 12055144e4 fix it 2017-06-19 16:09:16 -05:00
CitadelStationBot 9301af36da Makes RCD ammo use consistent + small speed tweaks (#1646) 2017-06-17 13:14:59 -07:00
LetterJay 923c5b9035 Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
2017-06-08 03:35:23 -05:00
CitadelStationBot bf4973e580 Refactor another spawn (#1394) 2017-06-04 09:04:32 -07:00
CitadelStationBot 79ff2672b4 [MIRROR] Clean snow, lavaland, and thunderdome (#1261)
* Clean snow, lavaland, and thunderdome

* Delete mining.dm.rej
2017-06-02 22:01:46 -07:00
LetterJay fbbceadc6e Merge branch 'master' into AllMapChangesInOne 2017-05-30 23:08:32 -05:00
LetterJay 9b00499d24 It's been a long night 2017-05-30 22:41:22 -05:00
LetterJay 1763c4b65d Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530
[MIRROR] Area Refactor + Var-edit Cleanup
2017-05-30 20:49:42 -05:00
CitadelStationBot 4f9c8a0869 Luxury Bluespace Shelter Capsules, Take 2. 2017-05-30 17:05:54 -05:00
CitadelStationBot a1ebd8c791 Refactors how diagonal smoothing underlays work (#1187) 2017-05-27 13:40:09 -07:00
CitadelStationBot e5f2a09622 Pixel projectile ricochets and reflections! (#1220) 2017-05-27 13:27:52 -07:00