Commit Graph

234 Commits

Author SHA1 Message Date
Joan Lung
b5b4037e2e More istypes replaced with helpers (#20767)
* shouldn't you be merging these by now

* my oh my do we have a lot of these

* a fellow pedantic shit
2016-10-03 13:40:13 +13:00
Joan Lung
bdcb16113a Adds a few turf istype helpers (#20754)
* a very calming act
when the world is too much, too fast

* i'm tired
but i have to be efficient, infinite

* lick your lips at the sight of me
a fantasy made reality
2016-10-01 19:25:46 +02:00
Joan Lung
dff4db726a Replaces a bunch of istypes with their proper macros (#20739)
* Replaces a bunch of istypes with their proper macros

* i'm not sure doing a 100+ file changed pr on a whim is something you do when bored
especially if you do it by hand because you never actually learned the regex that would let you automate it

* i'm just... gonna do this, because that check was true a lot and it shouldn't matter
2016-09-30 20:21:08 +02:00
oranges
47ad6e34c2 Chasms now check their dropped atom doesn't go away after sleep (#20645) 2016-09-24 14:52:55 -05:00
Remie Richards
c50fa5729c Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work 2016-09-10 20:28:23 +01:00
Joan Lung
5bdfd1665f Merge pull request #20328 from Ergovisavi/bring_colossus_back_2016
New colossus loot, the "Anomalous Crystal"
2016-09-08 22:38:50 -04:00
Ergovisavi
114676c548 Finishing up anomalous crystals 2016-09-08 19:29:49 -07:00
Cheridan
f79e2de334 Merge pull request #20372 from ChangelingRain/ohbutdeartheskyislowwatchfluentseamenrigtheirrudderssotheyllgrazeitwiththeirwindarrows
Adds another unused ashplanet turf
2016-09-08 15:02:26 -05:00
Joan Lung
7f200976ec no message 2016-09-07 08:35:28 -04:00
Ergovisavi
4e4f091905 Merge branch 'master' of https://github.com/tgstation/-tg-station into bring_colossus_back_2016 2016-09-07 01:08:58 -07:00
Ergovisavi
8605809c57 New colossus loot, the "Anomolous Crystal" 2016-09-07 00:58:15 -07:00
Joan Lung
03293aa18d CLEVER BAIT 2016-09-06 19:28:03 -04:00
Joan Lung
b3909e6f3e Adds another unused ashplanet turf 2016-09-06 17:51:24 -04:00
Joan Lung
b208e41add Watchers are now actually flying and will not fall into chasms (#20344) 2016-09-06 13:46:56 +02:00
Remie Richards
00738bd2a3 More than 2 hands!? WHAAAAAAT 2016-09-02 16:10:16 +01:00
Joan Lung
073eed4009 a classic 2016-08-28 21:33:27 -04:00
Joan Lung
566936355a less loops 2016-08-28 21:28:35 -04:00
Joan Lung
58459e6239 fix issue 2016-08-28 21:13:08 -04:00
Joan Lung
9ea303705a fancy 2016-08-28 09:14:22 -04:00
Joan Lung
bfb6fa9c16 Makes lavaland more atmospheric 2016-08-27 23:55:33 -04:00
KorPhaeron
e8ec96945c Blackbox 2016-08-15 20:25:38 -05:00
oranges
4d70a39488 Merge pull request #19400 from Bawhoppen/mapfixes
All shuttles now use proper smoothing paths, I had to update them all by hand

I have a few more things to fix for titanium in this PR aswell

Also all syndie shuttles are now consistent with each other. (Added some more turrets since they aren't indestructible now)

(I was exaggerating/joking when I said its like 50 files changed but it turns out it actually is)

add: Titanium now spawns in mining again.
add: It has uses in R&D and robotics production.
add: All shuttle walls are now using a new proper smoothing path. Mappers please make sure to use this path correctly in the future. (along with tiles)
2016-07-22 10:11:46 +12:00
Joan Lung
fa257f92ab Misc fixes (#19375)
* Misc fixes

* river

* delta

* waterfall

* cloudburst

* thunderstorm
2016-07-20 20:12:49 +12:00
Lularian
250623ccdb readds recipes and spawning 2016-07-19 16:32:04 -05:00
KorPhaeron
394d253c8b Titanium Removal (#19334) 2016-07-17 16:06:08 +12:00
bawhoppen
7830992c11 Makes shuttles superficially buildable (#18974)
Added two new materials, Titanium and plastitanium. Titanium is naturally occuring, and plastitanium is an alloy made of plasma and titanium.
These materials can be used to build shuttle walls and floors, though this serves no current purpose.

Before you yell "SNOWFLAKE" about the materials, I have definite planned purposes for them, not to mention what else they could be potentially used for (mechs, R&D, etc.)
You can use titanium to make white shuttle walls that smooth (like the ones of the escape shuttle), and plastitanium to make the grey syndie shuttle walls. You can also make floor tiles out of each material for the different shuttle floors. This PR itself doesn't change any of the paths on the map to use smoothed shuttlewalls and I'll save that for a seperate PR.

Also this PR makes ORM code better and allows people to easily add new alloys

Sprites by WJ
2016-07-14 21:25:49 +12:00
Kyle Spier-Swenson
83e4404f7b Planetary atmos (#19189)
* Planetary atmos
Turfs marked as planetary_atmos will revert back to their default state as if the upper atmosphere mixes with it reverting it.

* Fixes Planetary Atmos being treated as space.
2016-07-09 18:18:31 +12:00
coiax
4c5e478ed6 Observers can auto-orbit meteors; space dust event (#19142)
* Observers can auto-orbit meteors; space dust event

During a meteor shower, observers can automatically orbit
threatening meteors and watch them hit the station.

Added Major Space Dust event, which is a meteor shower
containing only space dust.

Reduced chance of RNG meteor event.

Fixes bug where meteors wouldn't move when spawned.
2016-07-09 18:16:11 +12:00
Xhuis
d818ccee79 Necropolis Beautification (#19134)
* Lavaland patch

* Conflicts

* Now with 100% more compiling

* Removes balance changes

* Conflicts 1

* Conflicts 3

* Updates the map
2016-07-05 20:15:19 -04:00
Leo
08c6923a12 Adds the tele-gulag [ready for review/merge] (#18644)
Now security can send the bad guys to the gulag without any effort!
Just put the unlucky guy inside the teleporter, insert a prisoner ID and hit the button!
You don't even need to strip him, it's all automatic!
2016-07-01 13:28:58 +12:00
Jack Edge
c374782ebf A lot of shuttle changes 2016-06-25 17:28:46 +01:00
Xhuis
75d9e4174f [s] Lavaland Patch (#18398)
* Commit squash before update to master

* Removed repathing and slot machine shenanigans

* Legion spawn changes

* Map edits, round II

* Some changes

* Removes map changes, hopefully

* Conflicts 1

* Updates the maps

* Conflicts 2

* How about now?

* Remaps the colossus arena

* Restores old colossus spawning
2016-06-16 22:00:09 -05:00
Cruix
ac0bad5d61 Added priority overlay system. (#18225)
Added priority overlays to atoms, which will not be removed when overlays are cut and will always remain on top when new overlays are added. This requires everyone to use add_overlay() and cut_overlays() instead of overlays += and overlays.Cut(). These procs are found in __HELPERS/icons.dm, and the priority overlay list is found in game/atoms.dm. Everything else is replacing deprecated overlay manipulation.
2016-06-17 10:11:53 +12:00
KorPhaeron
7ce49f0c1e Less Eyes 2016-06-14 17:37:01 -05:00
KorPhaeron
959a11218d Necropolis Turfs 2016-06-13 19:02:29 -05:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
KorPhaeron
54c6b0e564 Fix 2016-06-07 15:03:16 -05:00
KorPhaeron
135012b101 Fix error in spawning colossus 2016-06-07 14:57:02 -05:00
KorPhaeron
39bdefd9e6 Bubblegum 2016-06-07 03:43:20 -05:00
Cheridan
cad969ce7b Merge pull request #18257 from KorPhaeron/snow
redpills snow turfs
2016-06-06 00:40:40 -05:00
KorPhaeron
8f03e896bc Missing equal sounds 2016-06-05 16:50:50 -05:00
KorPhaeron
84bda094ba Fixes snow 2016-06-04 17:23:49 -05:00
Iamgoofball
e745f7e923 Update mine_turfs.dm 2016-06-02 08:51:15 -07:00
Iamgoofball
aa44396e2e Fixes #18000
Fixes #18000
2016-06-02 08:45:02 -07:00
Kyle Spier-Swenson
e7e8710ced fixes gibtonite explosions (#18046)
fixes #17951
fixes #18044
2016-05-30 18:02:11 -05:00
oranges
617cc56da4 Merge pull request #17838 from KorPhaeron/lavaland3
Fixes lavaland atmos
2016-05-30 17:29:30 +12:00
Kyle Spier-Swenson
8e61de1458 Fixes Gibtonite both defusing AND exploding in rare conditions. (#17970)
(explosion() sleeps)
2016-05-28 12:18:40 -05:00
Shadowlight213
ce01058e7c Fixes merge conflicts 2016-05-27 15:36:56 -07:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949)
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
2016-05-27 22:16:21 +02:00
KorPhaeron
39ed289a0e Fixes lavaland atmos 2016-05-21 19:20:19 -05:00