Commit Graph

28211 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
Joan Lung
cc1b0f5ffa splork spear through the gut get fucked 2016-06-10 19:05:23 -04:00
Joan Lung
9dc6ec0f81 bloody screen so real 2016-06-10 18:33:23 -04:00
Joan Lung
aed28cafb8 Ratvarian spears can now be used to impale humans 2016-06-10 18:20:04 -04:00
coiax
fd20fa8b10 Observers can see clockcult description on sigils (#18411)
No longer be confused by the difference between a dull sigil, an ominous
sigil or a sulking sigil.
2016-06-10 11:02:12 -05: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
Joan Lung
352e6831f9 Clockwork structures are now slightly more resistant to lava (#18410)
* Clockwork structures are now slightly more resistant to lava.

* flying mobs that are immune to lava what a shocker

* sanity

* ,
2016-06-11 01:37:28 +12: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
oranges
db05d6939e Merge pull request #18399 from bgobandit/stopfuckingbumpingmeyoufuckshit
Interrupted drawings will not affect the text buffer.
2016-06-10 15:58:53 +12:00
oranges
d937e0679f Merge pull request #18418 from ChangelingRain/reallygayte
Fixes the infinite shuttle when a clockwork gateway is Destroy()ed
2016-06-10 14:49:00 +12:00
Joan Lung
831983e9ee Fixes the infinite shuttle when a clockwork gateway is Destroy()ed 2016-06-09 22:37:44 -04:00
Joan Lung
4b9c4c7adb Merge pull request #18394 from lzimann/stools2
Bar stool no longer becomes a normal stool and are now constructables
2016-06-09 22:01:19 -04: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
Joan Lung
60e639ca73 Fixes a summon cultist runtime (#18390)
Fixes a summon cultist runtime
2016-06-10 13:16:16 +12: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
Remie Richards
a13c0bdd77 Fixes lings not getting notes from husking (#18405) 2016-06-09 18:52:09 -05:00
oranges
fc23d8464c Merge pull request #18386 from hornygranny/patch-8
fixes godhand not deleting on drop
2016-06-10 11:51:17 +12:00
oranges
148af6e80d Merge pull request #18383 from pudl/cargo-fix
fixes cell doors/timers
2016-06-10 10:21:58 +12:00
oranges
38baee52b5 Merge pull request #18379 from ChangelingRain/stationisagoodfriendtoconvert
You can't summon the Ark of the Clockwork Justicar on a shuttle
2016-06-10 09:51:37 +12:00
Razharas
4b7d83be77 Merge pull request #18375 from ChangelingRain/gearhud
Makes cyborg ratvar conversion work properly
2016-06-09 22:43:54 +03:00
Leo
aeac71afd3 No longer extends time when shuttle is already coming and consoles are destroyed (#18372) 2016-06-09 10:04:34 -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
Joan Lung
790351b4a7 Revert "Theme"
This reverts commit a6ffdeb223.
2016-06-09 09:39:01 -04:00
Joan Lung
a6ffdeb223 Theme 2016-06-09 09:30:43 -04:00
Joan Lung
8d2da45e8c duh 2016-06-09 08:39:16 -04:00
Joan Lung
c5ee14a0e3 gotta emag the borg 2016-06-09 08:21:24 -04: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
bgobandit
011bca9a3e Interrupted drawings will not affect the text buffer. 2016-06-08 23:34:27 -04:00
Joan Lung
16fa622e56 this is all butts 2016-06-08 23:18:23 -04:00
Lzimann
7602b99111 Bar stools are now constructable 2016-06-09 00:18:11 -03:00
Joan Lung
35428ae221 Merge pull request #18396 from sawu-tg/master
Sin Quickfixes
2016-06-08 23:00:58 -04:00
Sawu
190947be34 Adds an overflow just in case. 2016-06-09 12:54:49 +10:00