Commit Graph

7297 Commits

Author SHA1 Message Date
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
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
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 aa81f49540 Faction adding in species_gain rather than pod. 2016-06-10 11:12:11 -04: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
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 0bae93b2bf Merge pull request #18391 from GunHog/Dual_pAI_HUDs
pAI data HUDs no longer conflict.
2016-06-10 13:11:59 +12:00
KorPhaeron aef1c2d044 Tweaks 2016-06-09 17:26:45 -05: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
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
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
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
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 b89d9c0849 Merge pull request #18336 from Militaires/nowormbranch
removed redundant code for worm.dm
2016-06-09 09:13:55 +12: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
oranges c5a84c769d Merge pull request #18036 from AnturK/init_meme
Defers some list initializations
2016-06-08 19:20:04 +12: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
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
Jack Edge af46be2f22 Support guardian beacons are now structures
- Now they'll no longer eat the turf to place themselves.
- Also tidied up the code a little.
2016-06-07 23:25:05 +01:00
KorPhaeron dd92987eb5 Blacklist spellbooks 2016-06-07 17:05:19 -05:00
oranges e283f14c1c Merge pull request #18305 from MrStonedOne/patch-211
Fixes ghost images not having byond member iconstates
2016-06-08 09:10:19 +12:00
AnturK 19eb97ae18 Moves some list initializations to New
Fixes missing ..() calls in New()
2016-06-07 18:39:13 +02:00
GunHog ff90dda131 Mining Cyborg Ash Storm Plating Upgrade
Adds an upgrade to Mining Borgies which will make them immune to ash
storms while looking TOTALLY AWESOME.
2016-06-07 11:25:19 -05:00
TechnoAlchemist 154982500b God is good. 2016-06-07 04:54:06 -07: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
militaires 18ce0776a2 removed space worm.dm 2016-06-07 10:35:46 +03:00
oranges 636b35bb5e Merge pull request #18291 from coiax/dragon-loot-moved
Moved dragon loot into necropolis_chests.dm
2016-06-07 14:59:56 +12:00
oranges f338db8c28 Merge pull request #18223 from Incoming5643/patch-11
The ghost of poly won't interfere directly in the lives of mortals
2016-06-07 14:42:52 +12:00
oranges f81634c2eb Merge pull request #18218 from Xhuis/rich_bears
Fixes and tweaks
2016-06-07 14:02:53 +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 a1b0620c5f Merge pull request #18132 from GunHog/Aimed_Spit_For_Mista_Jay
Aimed Neurotoxin Spit
2016-06-07 13:54:04 +12:00
GunHog 48ce081d91 Mini fix
Catches an oversight
2016-06-06 20:53:19 -05:00
Xhuis ab41d85354 Conflicts II 2016-06-06 21:31:38 -04:00
oranges c62e2ba11f Merge pull request #18264 from coiax/deathrattles
Deadchat listeners will hear when people die
2016-06-07 13:08:52 +12:00
GunHog bfd644231f Merge remote-tracking branch 'remotes/upstream/master' into Aimed_Spit_For_Mista_Jay
# Conflicts:
#	code/modules/mob/living/living_defines.dm
#	icons/mob/actions.dmi
2016-06-06 20:05:23 -05:00
Jack Edge 1c4e91d8b1 Deadchat listeners will hear when people die
🆑 coiax
rscadd: Deadchat is now notified when a sentient mob dies.
/🆑

Includes the area name, because why not, I guess?
2016-06-07 01:26:00 +01:00
Joan Lung 22aff568c6 but with conflictless sprites 2016-06-06 19:59:37 -04:00
TechnoAlchemist 9ef7ca5ee6 Unique spectral sword sprite. (#18322) 2016-06-06 18:26:17 -05:00