Commit Graph

16480 Commits

Author SHA1 Message Date
c0
9fdbe269d6 More fixes 2016-06-13 12:43:25 +03:00
c0
5ce52dbcb3 Fixes unkillable ash dragon 2016-06-13 12:17:57 +03:00
Cheridan
47e2f50de5 Merge pull request #18440 from JStheguy/slave
Easiest Fixes Ever Double Feature
2016-06-11 13:29:44 -05:00
Cheridan
81e6679aed Merge pull request #18442 from drynwyn/Stupi
Removes a superfluous addition of the "slime" faction to slimepeople.
2016-06-11 13:14:13 -05:00
JStheguy
87ae4675fe Unhides Jumpsuits
Wow, that was easier.
2016-06-11 12:52:23 -05:00
Jordie
0777916328 Merge pull request #18402 from optimumtact/flamingfunremoval
Better logging and notification of setting on fire
2016-06-11 23:53:34 +10:00
Jordie
264aafbe23 Merge pull request #18378 from optimumtact/banditrevival
Photocopying secret documents actually works now
2016-06-11 23:52:02 +10:00
oranges
d97d8e6d6e Merge pull request #18432 from Core0verload/newmask
Adds explorer gas mask for lavaland miners
2016-06-12 01:14:48 +12:00
oranges
29a1c6be5f Merge pull request #18433 from KorPhaeron/standard_borg
New Standard Cyborg Module Gear
2016-06-12 01:13:33 +12:00
oranges
f58b13d099 Explicitly return parent value
This prevents it returning false incorrectly
2016-06-11 13:09:25 +00:00
oranges
bf9643563d Ensure we only log and notify admins when person is set on fire
This takes advantage of the now refactored IgniteMob returning true when
it successfully ignites the mob
2016-06-11 13:08:05 +00:00
oranges
8141d5d60b Refactors IgniteMob to return true if the mob was set on fire
Also moves the DNA species ignite mob check to a better proc name to
make it clearer that it checks for a mob species that is valid to set on
fire
2016-06-11 13:04:09 +00:00
oranges
3bc56655e4 Rename proc, move updateUsrDialog call
Ensures the dialog is called after the photocopy/doccopy is removed and
so the interface updates correctly
2016-06-11 12:54:00 +00:00
oranges
39612b3ba2 Merge pull request #18430 from coiax/fix-18258
Countdowns follow bomb; fixes syndibomb countdown
2016-06-12 00:41:18 +12:00
oranges
611151d25f Merge pull request #18278 from coiax/somebody-at-the-door
Ghosts are notified when someone joins
2016-06-12 00:40:57 +12:00
oranges
7063db51c9 Merge pull request #18424 from drynwyn/master
Adds "plants" and "vines" factions to pod people
2016-06-12 00:38:57 +12:00
Joan Lung
96990431be Merge pull request #18431 from coiax/fix-18351
Deathrattle preferences fix; ignores Z2 deaths
2016-06-11 08:18:13 -04:00
Leo
467ce07292 No more leg-less full speed, hopefully. (#18417) 2016-06-11 12:35:09 +02:00
c0
1a6fa0031d Adds explorer gas mask for lavaland miners 2016-06-11 10:38:53 +03:00
Joan Lung
42c253d854 Merge pull request #18416 from KorPhaeron/megafauna
Boss tweaks
2016-06-10 21:04:39 -04:00
oranges
ab73b4569a Merge pull request #18413 from phil235/FixAssortment1
Fives Fixes
2016-06-11 10:05:35 +12:00
oranges
b3bbe1aef3 Merge pull request #18414 from bgobandit/lizwine
Adds lizard wine to the game.
2016-06-11 10:05:17 +12:00
drynwyn
24e0f6a333 Removes superfluous addition of the slime faction. 2016-06-10 13:36:25 -04:00
Jack Edge
beeced08be Ghosts are notified when someone joins
🆑 coiax
rscadd: Ghosts are notified when someone arrives on the Arrivals
Shuttle. This is independent of the announcement system, and the (F)
link will follow the arrived person.
/🆑

Also I got rid of a trailing return.
2016-06-10 17:17:26 +01:00
drynwyn
14bdb5995d Removes superfluous faction adding. 2016-06-10 11:13:26 -04:00
drynwyn
aa81f49540 Faction adding in species_gain rather than pod. 2016-06-10 11:12:11 -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
KorPhaeron
5893abc9bc Standard Cyborg Gear 2016-06-10 07:59:40 -05:00
KorPhaeron
6c287b4446 Nothing can go wrong 2016-06-10 07:57:59 -05:00
Jack Edge
5bb5d56ac3 Deathrattle preferences fix; ignores Z2 deaths
Fixes #18351. Deathrattle preferences are now saved.

Deaths on Z2 are now no longer printed to deadchat.
2016-06-10 13:13:28 +01:00
Jack Edge
2cf94f2e75 Countdowns follow bomb; fixes syndibomb countdown
Fixes #18258. Partially at least. Countdowns now follow their attached
atom, syndicate bombs now start their attached countdown.
2016-06-10 12:24:00 +01: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
drynwyn
df6d3e6da2 Adds factions to pod people 2016-06-10 02:12:00 -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
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
KorPhaeron
aef1c2d044 Tweaks 2016-06-09 17:26:45 -05:00
bgobandit
5bbdca473f Adds lizard wine. 2016-06-09 16:21:00 -04: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
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