Commit Graph

16442 Commits

Author SHA1 Message Date
Joan Lung
1c19a6a2fb why didn't it do this before fuck oh my god
shields can now block impaling
2016-06-11 08:05:41 -04: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
oranges
daf413704a Merge pull request #18427 from Core0verload/mining_split
Splits equipment_locker.dm
2016-06-11 01:36:57 +12:00
c0
692e40688f Splits equipment_locker.dm 2016-06-10 11:48:45 +03:00
oranges
88b0c64b9d Merge pull request #18328 from kevinz000/bugfix1
Multiple Bugfixes
2016-06-10 20:04:07 +12:00
oranges
a726c30a7f Merge pull request #18397 from coiax/fix-18352
Refactors slime names; altered slime, xeno names kept when evolving
2016-06-10 20:03:43 +12:00
kevinz000
cb907d1ada itworksedition 2016-06-09 18:55:25 -07:00
kevinz000
c4b8dd4bc7 . 2016-06-09 18:53:42 -07:00
kevinz000
31de8f4ec2 allgunsnowburnright 2016-06-09 18:53:06 -07: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
oranges
0bae93b2bf Merge pull request #18391 from GunHog/Dual_pAI_HUDs
pAI data HUDs no longer conflict.
2016-06-10 13:11:59 +12:00
bgobandit
179d641c32 Plant-B-Gone and napalm now do what they should. (#18395) 2016-06-09 18:52:43 -05:00
Jordie
0389ff9528 fixes gold slime extracts (#18408) 2016-06-09 10:03:01 -05:00
Jack Edge
4f8981c6a5 Refactors slime names; altered slime, xeno names kept when evolving
Also fixes #18352.

Slime colour and adulthood are specified in New(), which is a lot better
than having an ugly spawn(0) in the middle of a New(). Slimes also only
update their names when growing or shrinking when it matches their
existing name format.

So if you happen to be a slime called Carl Lagerfield, it won't change
your name if you grow up to adulthood.

In addition non-standard xeno names are preserved while evolving.
And it also applies your old dir to the new xeno, because that looks
slightly better.
2016-06-09 15:57:24 +01:00
AnturK
2f0a3919d2 Merge pull request #18368 from KorPhaeron/limbs
Fixes explosive dismemberment not damaging limbs
2016-06-09 10:55:14 +02:00
nullbear
98ee507de8 Adds noteleport variable
This is mostly a pre-setup for my greater-bag-of-holding stuff.

You can't use bluespace crystals/jaunters/hand teleporters to access bluespace-proofed areas. at the moment, this only applies to shuttles and centcomm.

Teleport beacons placed in bluespace proofed rooms can't be teleported to, except via teleporter station hub.

A little concerned because now 'hijack' antags cant use teleprods to fling everyone out of the shuttle while in transit. q_q could easily just make the shuttle non-bluespace proof though.

Note for mappers: This means you can create ruins that can't be teleported into using bspace crystals by setting the area "noteleport" to 1. This can be used to force players to travel through the ruin the way they're intended to. Or to prevent them from gaining access to areas they shouldnt normally be able to. (ie. the wishgranter ruin)
2016-06-09 20:33:25 +12:00
AnturK
0a3df55930 Merge pull request #18342 from optimumtact/paranoia
Improved and safer check for localhost admin
2016-06-09 09:17:21 +02:00
Xhuis
68b51d88cf Hydroponics tray changes and new plants (#18366)
You can now remove all plants and weeds from a hydroponics tray by using a spade on it. This process takes five seconds.

Hydroponics trays now have a unique variable, using_irrigation, that replaces the previous iteration of irrigation hoses that used the anchored variable to track it instead.

Fixes a possible runtime error that can occur when using irrigation hoses to transfer non-water reagents (specifically nutrients, although it hasn't been tested with any other reagents).

Added meatwheat, which is mutated from normal wheat plants. It's essentially a blood-red version of wheat that can be crushed into a meat slab by activating it with an empty hand. These meatwheat clumps are slightly bloodier than normal meat, but it still works for recipes that use normal meat slabs.

Added ambrosia gaia, which is mutated from ambrosia deus. It's yellow, glows brightly, and contains only earthsblood (renamed adminordrazine). The plant is destroyed after a single harvest, and its product can be planted in an empty hydroponics tray to cause it to become self-sufficient, no longer requiring nutrients, water, or weed/pest removal. Gaia-blessed trays will glow bright yellow in comparison to normal trays, and gaia-blessed soil will turn yellow. Both will emit light.

Added cherry bombs, which are mutated from blue cherries. They're orange and have a black stem, and start with a tiny amount of black powder in them. Activating them in an empty hand will ignite them and cause them to explode after three seconds, with explosion strength varying based on potency (at the most, it's around that of a minibomb).
2016-06-09 18:40:06 +12:00
oranges
c699bae573 Adds admin notice and game log entry to the grief (lava) staff 2016-06-09 06:22:25 +00:00
oranges
4c09ee4fbc Merge pull request #18364 from PKPenguin321/rip-scooterborgs
makes legless scootering a feature
2016-06-09 16:10:09 +12:00
Joan Lung
14f92bb2b1 Megafauna can now properly smash walls (#18385) 2016-06-08 22:50:18 -05:00
oranges
c143e30ab5 Merge pull request #18350 from GunHog/AshTreaders
Mining Cyborg Ash Storm Plating Upgrade
2016-06-09 15:46:06 +12:00
oranges
6445deed2e Merge pull request #18360 from coiax/new-beacon
Support guardian beacons are now structures
2016-06-09 15:41:27 +12:00
oranges
a08cff21f0 Merge pull request #18345 from TechnoAlchemisto/glass_bottles_don't_break_on_heads_as_easily_as_in_the_movies_I_would_know
Renames and relores loyalty implants to mindshield implants.
2016-06-09 15:39:53 +12:00
oranges
4af9392f01 Merge pull request #18333 from KorPhaeron/charter
Captain's Charter/Captain can name the station
2016-06-09 15:39:41 +12:00
PKPenguin321
beccfc08a6 makes it work 2016-06-08 19:21:47 -07:00
KorPhaeron
576c215270 Fixes charter 2016-06-08 21:04:01 -05:00
oranges
873ddee1c3 Merge pull request #18361 from coiax/minor-wb-bugs
Fixes some minor bugs with the wabbajack
2016-06-09 13:11:30 +12:00
GunHog
6861940bb5 pAI data HUDs no longer conflict.
You may now use both a medical and security HUD without issues.
2016-06-08 19:10:51 -05:00
PKPenguin321
1260170c07 Merge branch 'rip-scooterborgs' of https://github.com/PKPenguin321/-tg-station into rip-scooterborgs
# Conflicts:
#	code/modules/vehicles/scooter.dm
2016-06-08 15:38:00 -07:00
PKPenguin321
ceb1780c2f fixes duplicate message, more tweaks 2016-06-08 15:25:43 -07:00
GunHog
5d517bc96a Fixes non-human carbons without DNA being shock immune (#18355)
The CHECK_DNA_AND_SPECIES define (YES, A DEFINE) was causing the
electrocute_act() proc to terminate silently, with no runtime or
returned value.
2016-06-08 17:19:48 -05:00
oranges
47cb6db5ae Merge pull request #18337 from KorPhaeron/bubblegum2
Bubblegum
2016-06-09 09:22:02 +12:00
oranges
ccb1ca96d0 Merge pull request #18356 from erwgd/MaterialsPlantAnalyzer
Defines plant analyzer materials
2016-06-09 09:15:15 +12:00
oranges
07bd09da5c Merge pull request #18340 from coiax/fix-18338
Repulse sparkles now disappear
2016-06-09 09:14:32 +12:00
oranges
b89d9c0849 Merge pull request #18336 from Militaires/nowormbranch
removed redundant code for worm.dm
2016-06-09 09:13:55 +12:00
Mike Long
1fbd8d71f9 Merge remote-tracking branch 'tgstation/master' into jauntfix
# Conflicts:
#	code/modules/spells/spell_types/demon.dm
2016-06-08 13:20:04 -04:00
AnturK
05b9307a09 Merge pull request #18335 from Fox-McCloud/experimental
Experimentor Fixes
2016-06-08 13:14:57 +02:00
KorPhaeron
83adeac43a Fixes explosive dismemberment not damaging limbs 2016-06-08 03:56:03 -05:00
KorPhaeron
befc25c5b0 Removes commented out code 2016-06-08 03:51:15 -05:00
AnturK
a14fe0c18b Merge pull request #18323 from KorPhaeron/clown_buff
Clown makes a sad trombone noise on death
2016-06-08 10:47:56 +02:00
LatD
f3545d8d3b Balances pyro anomaly (#18310)
* End damage buff

* Nerfs constant damage
2016-06-08 19:23:10 +12:00
oranges
c5a84c769d Merge pull request #18036 from AnturK/init_meme
Defers some list initializations
2016-06-08 19:20:04 +12:00
PKPenguin321
3c08c52cff fixes broken var
Buckled mobs -> buckled mob
2016-06-07 22:59:20 -07:00
Core0verload
3af3bd2938 R&D machinery refactor (#18295)
* RnD machinery refactor

* Small changes

* Removed designs selling
2016-06-08 17:18:22 +12:00
PKPenguin321
7de7f6bbdb tweaks 2016-06-07 21:30:28 -07:00
PKPenguin321
d031d38f03 makes scooterborgs a feature 2016-06-07 20:06:03 -07:00
GunHog
61b235d23c Merge remote-tracking branch 'remotes/upstream/master' into AshTreaders
# Conflicts:
#	code/modules/research/designs/mechfabricator_designs.dm
2016-06-07 18:37:38 -05:00
PKPenguin321
b28da9cb97 Adds emag functions to chem dispensers (#18153)
* adds emag functions to chem dispensers

* chemical changes, slight code changes

* fixes multiple emagging
2016-06-08 11:09:25 +12:00
Sawu
dc20a94dd2 SNPC Updates (#18307)
* SNPC Updates
* SNPCs now use their custom processing by default, with a few tweaks. This is a temporary fix to ensure they work appropriately until @MrStonedOne's MC is in place.
* SNPC custom processing will now watch for a failed loop and restart itself.
* Verb added for debugging SNPCs easily, must be enabled.
* SNPC customization now has three quick options, as well as the original choices.
* Spawns removed from laggier parts of doProcess(), now using waitfor instead
* Security SNPCs will target people set to arrest.
* Chefs, Botanists and Bartenders should now function more appropriately.

* Removes commented code

* Fixes an invalid loop

* REALLY fixes it this time
2016-06-08 10:32:10 +12:00