Commit Graph

719 Commits

Author SHA1 Message Date
LatD
25827d6ccb [Ready] Tweaks some R&D levels (#18246)
Removes tech levels from some traitor objectives. They had tech levels even before the remake but apparently now that the levels got raised that became a problem. Also some small tweaks to other items to make some early levels easier to get.
2016-06-07 20:18:19 +12:00
Jack Edge
8cbb10cab2 Moved dragon loot into necropolis_chests.dm
In addition:
- Added an admin notification when dragon blood causes the dragon
transformation.
- Fixes #18275, lava staff can no longer turn transit tiles to lava.
2016-06-07 02:57:12 +01:00
oranges
d360479227 Merge pull request #17934 from coiax/bluespace-shelter-templates
Bluespace shelters use map templates
2016-06-07 13:43:59 +12:00
oranges
ef53e135e0 Merge pull request #18266 from MMMiracles/minipickers
Adds compact pickaxes
2016-06-07 13:23:26 +12:00
Jack Edge
a9b43f06bf Bluespace shelters use templates
🆑 coiax
rscdel: Bluespace shelter capsules can no longer be used on shuttles.
rscadd: Bluespace shelters may have different capsules stored. View what
your capsule has inside by examining it.
/🆑
2016-06-07 02:11:35 +01: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
AnturK
cd67c17a80 Merge pull request #18175 from Iamgoofball/patch-57
fixes gibtonite runtime
2016-06-05 14:43:30 +02:00
MMMiracles
5833990acb whew 2016-06-04 23:16:02 -04:00
MMMiracles
f7dd4495dd adds compact pickaxes to make pickaxes less non-relevant for miners 2016-06-04 23:12:06 -04:00
KorPhaeron
84bda094ba Fixes snow 2016-06-04 17:23:49 -05:00
TechnoAlchemist
d75ded29fa Adds all-seeing-eye to necropolis chests. (#18160)
* Swaps xray syringe with new item.

* blankspace

* standards
2016-06-04 02:52:04 -05:00
Iamgoofball
a3c6571cfd Fixes #18167 (#18170) 2016-06-03 14:48:32 -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
Razharas
9fdae2fe4e Merge pull request #17576 from LatD/Research
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
KorPhaeron
26cbf2e3bb You've been down too long in the midnight sea 2016-05-30 23:35:03 -05:00
MMMiracles
d585656950 Potion of Flight (#18019)
* i cant wait to get this to become my snowflake OC

* id

* i dones it
2016-05-30 20:58:34 -05:00
Kyle Spier-Swenson
e7e8710ced fixes gibtonite explosions (#18046)
fixes #17951
fixes #18044
2016-05-30 18:02:11 -05:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
oranges
617cc56da4 Merge pull request #17838 from KorPhaeron/lavaland3
Fixes lavaland atmos
2016-05-30 17:29:30 +12:00
oranges
1ebc858091 Merge pull request #17962 from coiax/admin-logging
Adds admin logging to megafauna movement, shuttle loading
2016-05-30 11:00:14 +12:00
coiax
20a055b90e Wisps can now be recalled with the lantern (#17999)
🆑 coiax
fix: Fixes bug where the wisp was unable to be recalled to the lantern.
/🆑

The way that the code is structured suggests that wisp recall works in
two parts, stripping the person who's being orbited of their thermal
vision, and then putting the wisp back in. While I was there, I cleaned
up some variables.
2016-05-30 10:54:38 +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
Jack Edge
3910a546e6 Adds admin logging to megafauna movement
🆑 coiax
rscadd: Admins are now notified if a megafauna uses a wormhole or a
shuttle.
rscadd: A new Shuttle Manipulator verb has been added for quick access
to probably the best and most bugfree feature on /tg/.
/🆑

Megafauna adminnotifies on portal TP

Standard shuttle names and logging

Also ignore .mdme files

Muh commit

Actually works and stuff
2016-05-28 16:26:28 +01:00
Cheridan
b6c956e294 Merge pull request #17059 from Shadowlight213/Archangel
[Review Ready]Wing mutant body parts and Angel wings
2016-05-28 01:16:16 -05:00
Cheridan
e687795914 Merge pull request #17959 from blobbernaut/capsulefix
Prevents bluespace capsules from breaking the escape shuttle
2016-05-27 17:46:51 -05:00
LatD
65a0027979 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-28 01:37:55 +03: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
blobbernaut
c214909b7c actually this is cleaner
removes some useless redefinitions
2016-05-26 18:26:31 -04:00
LatD
a6680b9f06 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-26 19:02:46 +03:00
coiax
4483d5275c Shuttle manipulator (#17436)
* Starting out on our tgui journey

* God tgui, why do you need to be updated

You're dynamically generated anyway

* Commit of stuff

* Further progress is being made

* Everyone loves buildscripts

* Further modifications to my incredible running script

* Starting to modify the minimap code to be better

* It's going well thusfar, I guess

* What have I done

* RIP minimap

* FUN FUN FUN FUN FUN

* Adds shuttle_manipulator.dmi

MUH HOLOGRAMS

* Is it done? IS IT OVER

* Peer review

* Some bug fixes

* Makes that damn greentext shut up

* Shuttle registration

* Made the Emergency Escape Bar more robust

No climbing on the bar.

* Do not stare into the operation end of the device

* Compile shame

* THE MOST DUMB

* Passive barmaiden

* Emergency shuttle memes

* MORE SAFETY CODE

* Fancy shuttle manipulator icons

* Smoothing it out

* We are going to have a lot of fun with this one

* Independent blobbernauts

* WABBAJACK WABBAJACK

* Message for attempting to authenticate old style

* Angry alert noise is back

* Revert "Independent blobbernauts"

This reverts commit 34d6af7c9c88cfc2864990cb37b586bb90163dd3.

* No parrot sleep plz

* Moves the special shuttle stuff to special.dm

* No Bartender like a Centcom Bartender

* Non-controversial map changes

- Backup shuttle moved closer to Centcom main structure, docking tube
created
- Moved shuttle import landmark to above Centcom main building
- Added shuttle displays to Conference Room
- Squashed the Chapel a bit in Metastation
- Made the docking port on Z2 massive
- Made the docking port on Metastation a lot larger

* Hacks and slashes at Box

A bunch of things are extended and squashed so Box shuttle dock can
support the MetaStation emergency shuttle.

* Some Metastationshit

* Never ending changes

* Wabbajack to TGM

* Modified the bar, I think that's all of them

* Stops Barmaiden wandering around

* More code review

* Whitspace, the bane of us all

* DIE WHITESPACE DIE
2016-05-26 15:15:19 +02:00
LatD
907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
blobbernaut
427bff2243 prevents capsules from breaching escape shuttle 2016-05-23 02:14:20 -04:00
LatD
6e6474ee9e Imprinter origin and req lvls 2016-05-22 23:46:05 +03:00
KorPhaeron
1130be3c1b Fixes weather killing everyone 2016-05-22 00:07:53 -05:00
KorPhaeron
39ed289a0e Fixes lavaland atmos 2016-05-21 19:20:19 -05:00
oranges
2bbc778899 Merge pull request #17759 from KorPhaeron/weather_immunity
Weather Immunity Refactor
2016-05-22 11:17:04 +12:00
LatD
7d6b3e6847 origin and req lvl changes 2016-05-21 17:17:20 +03:00
Shadowlight213
86cbe14d15 Conflict fixes 2016-05-19 20:42:26 -07:00
KorPhaeron
224c77c859 Weather Immunity 2016-05-18 02:12:55 -05:00
KorPhaeron
0cf94ad6b0 Explorer Gear 2016-05-18 00:31:48 -05:00
LatD
fe76e64641 Origin tech changes and some fixes 2016-05-17 20:57:01 +03:00
Cheridan
ba3f4f4733 Merge pull request #17634 from KorPhaeron/austurfs2
Removes extra lines from austurfs
2016-05-14 15:10:55 -05:00
Joan Lung
8b656d2603 Merge pull request #17284 from MMMiracles/spookyjookie
Lavaland Ruins
2016-05-13 20:22:56 -04:00
KorPhaeron
4179cdeae9 Removes extra lines from austurfs 2016-05-13 10:56:25 -05:00
AnturK
d41be10210 Merge pull request #17605 from coiax/urgent-golem-jaunter-fix
[s] Golems target Free Golem ship when jaunting
2016-05-13 17:55:58 +02:00
Jack Edge
da8d8effb5 [s] Golems target Free Golem ship when jaunting 2016-05-12 11:00:46 +01:00
KorPhaeron
5f6ef4a383 Ausops Turfs 2016-05-12 03:15:43 -05:00