Commit Graph

737 Commits

Author SHA1 Message Date
oranges
538a963a4e Merge pull request #18551 from KorPhaeron/necro
Necropolis floors and walls
2016-06-15 19:19:41 +12:00
oranges
829243360d Merge pull request #18489 from Core0verload/ce_jetpack
Brings back CE's hardsuit jetpack
2016-06-15 10:44:59 +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
c0
b615fb504f Brings back CE's hardsuit jetpack 2016-06-12 09:18:39 +03:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
c0
1a6fa0031d Adds explorer gas mask for lavaland miners 2016-06-11 10:38:53 +03:00
oranges
ab73b4569a Merge pull request #18413 from phil235/FixAssortment1
Fives Fixes
2016-06-11 10:05:35 +12:00
AnturK
859082829b Merge pull request #18401 from optimumtact/skorvydorvy
Adds admin notice and game log entry to the grief (lava) staff
2016-06-10 15:44:10 +02:00
c0
692e40688f Splits equipment_locker.dm 2016-06-10 11:48:45 +03:00
Core0verload
77d70b9955 Finishes boards refactor (#18392)
This PR finishes work started in #17300 by making all the machines use apply_default_parts(src) for components initialization.

It also adds two new board sprites, one for Abductor boards and one for Ravtar boards:
board board_a board_r

There are no deconstructable Ravtar machines yet, sprites are added for future use. Abductor sprite is used only by Seed Vault's plant DNA modifier. It wasn't made by actual abductors, but it was surely made by aliens.

Boards now have a new var: def_components. It is a list containing replacement paths for default parts. For example, list(/obj/item/weapon/stock_parts/matter_bin = /obj/item/weapon/stock_parts/matter_bin/super) would make machine spawn with super matter bins instead of basic ones by default.

Console screens that were used in machines instead of glass sheets are replaced with actual glass sheets. Support for sheets as machine components was added in a previous PR
2016-06-10 13:13:33 +12:00
phil235
219639e00b Using a multitool on telepad with open panel to save data no longer hits the machine.
Packagewrapping a pulled item now properly stops the pulling.
Using put_in_hands() procs now properly checks if the mob has a hand.
bodyparts icon_state is now "" like it should be.
You can no longer build a firelock on top of another firelock.
You can reinforce a firelock assembly to build a heavy firlock.
Human species who breath something other than oxygen now get the proper alert when in crit, and I fixed the alert not being removed when healed.
2016-06-09 20:46:00 +02:00
oranges
c699bae573 Adds admin notice and game log entry to the grief (lava) staff 2016-06-09 06:22:25 +00:00
oranges
47cb6db5ae Merge pull request #18337 from KorPhaeron/bubblegum2
Bubblegum
2016-06-09 09:22:02 +12: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
AnturK
19eb97ae18 Moves some list initializations to New
Fixes missing ..() calls in New()
2016-06-07 18:39:13 +02:00
KorPhaeron
39bdefd9e6 Bubblegum 2016-06-07 03:43:20 -05:00
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