Commit Graph

17015 Commits

Author SHA1 Message Date
NikNakFlak
8be7f7115f Reduces meteors 2016-07-17 16:23:37 -07:00
Joan Lung
e38f2cc4e1 Applies ratvarian grammar to holy water (#19348) 2016-07-17 17:52:12 -04:00
Firecage
468bc1c686 Fixes the slowdown on bluespace(and all other) floors. (#19342) 2016-07-17 17:51:38 -04:00
oranges
7248ed8f13 Add dropdel flag to royal parasite injector (#19359)
This item should definitely be deleted when dropped due to queen death
2016-07-17 17:50:12 -04:00
Core0verload
c0746aec8d Sterilizine now reduces surgery step failure prob (#19337)
* surgery refactor

* Sterilizine now reduces surgery step failure prob

* Adds steriliizne sprayer to medical vendors
2016-07-18 09:21:48 +12:00
KorPhaeron
394d253c8b Titanium Removal (#19334) 2016-07-17 16:06:08 +12:00
Joan Lung
a7f7151e01 Buffs Vanguard scripture (#19332)
* Buffs Vanguard scripture

* dark magic

* or light magic

* earth

* sand

* dirt

* rock

* ivy

* grass

* flowers

* trees
2016-07-17 11:53:10 +12:00
oranges
e55d3dcd52 Merge pull request #19304 from lordpidey/flyswatters
Flyswatters
2016-07-17 11:51:57 +12:00
Incoming5643
3c62d9d33d You can pair up god eyes (#19335)
* You can pair up god eyes for the sake of looking cooler/showing off your bad RNG

* Fixes the eyecon not actually updating
Bonus sprite work by Joan
2016-07-16 18:38:54 -04:00
AnturK
5b670a2511 Merge pull request #19329 from Jordie0608/itriedtofindoutwhathrefstandsforbutitseemstheresnoclearanswer
Allows viewing href logging when disabled
2016-07-16 20:38:51 +02:00
Iamgoofball
781077de66 Fixes food crafting lag. (#19325)
* Fixes food crafting lag.

* Update recipes_bread.dm

* Update recipes_burger.dm

* Update recipes_cake.dm

* Update recipes_egg.dm

* Update recipes_meat.dm

* Update recipes_misc.dm

* Update recipes_pastry.dm

* Update recipes_pie.dm

* Update recipes_pizza.dm

* Update recipes_salad.dm

* Update recipes_sandwich.dm

* Update recipes_soup.dm

* Update recipes_spaghetti.dm

* Update craft.dm

* Update easter.dm
2016-07-16 00:31:59 -04:00
Cheridan
d426d9ca87 Merge pull request #19322 from Niknakflak/NeededFixSorryLeoz
Grammar Fix for death whisper
2016-07-15 22:35:08 -05:00
oranges
9860a2d2c9 Merge pull request #19317 from GunHog/Xeno_Queen_Finder_For_Mista_Jay
Adds Queen Finder for Xenos
2016-07-16 12:02:33 +12:00
Kyle Spier-Swenson
c1b14680c4 Rogue stickyban detection system. (#19201)
* Rogue stickyban detection system.

This will detect when stickybans go rogue and revert them to whatever their state was when the world started.

* does the remie

* Increases STICKYBAN_MAX_MATCHES to 20 to prevent gaming
2016-07-16 12:00:47 +12:00
Jordie0608
1613723fb0 view href logs when config is off 2016-07-15 18:05:22 +10:00
NikNakFlak
cd41656e55 Grammer fix 2016-07-14 17:31:37 -07:00
GunHog
a607211dfb Adds Queen Finder for Xenos
- Xenos now have a "queen sense" which tracks the queen like a
pinpointer.
- Added WJ's custom sprites for all non-queen Xenos.
- Modded the alien type finder to support queen finding
2016-07-14 13:36:18 -05:00
Cheridan
2bb568bf2b Adds an aesthetic new space ruin with original content (hi bawhoppen) (#19275)
* Adds an aesthetic new space ruin with original content (hi bawhoppen)

* do you understand its all in your hands its your move

* i made up my mind
time is running out
2016-07-14 14:21:49 -04:00
Cheridan
f457b572d6 Merge pull request #19305 from ChangelingRain/dexterityissues
Fixes some dexterous guardian issues
2016-07-14 12:22:12 -05:00
Mike Long
33d92a6a87 Removes errant line change from bees.dm
This should reduce the chances of a merge conflict
2016-07-14 10:46:14 -04:00
Mike Long
b23ac08a41 Moves splat code to afterattack
You may now splat cockroaches and butterflies.
2016-07-14 10:44:33 -04:00
bawhoppen
7830992c11 Makes shuttles superficially buildable (#18974)
Added two new materials, Titanium and plastitanium. Titanium is naturally occuring, and plastitanium is an alloy made of plasma and titanium.
These materials can be used to build shuttle walls and floors, though this serves no current purpose.

Before you yell "SNOWFLAKE" about the materials, I have definite planned purposes for them, not to mention what else they could be potentially used for (mechs, R&D, etc.)
You can use titanium to make white shuttle walls that smooth (like the ones of the escape shuttle), and plastitanium to make the grey syndie shuttle walls. You can also make floor tiles out of each material for the different shuttle floors. This PR itself doesn't change any of the paths on the map to use smoothed shuttlewalls and I'll save that for a seperate PR.

Also this PR makes ORM code better and allows people to easily add new alloys

Sprites by WJ
2016-07-14 21:25:49 +12:00
oranges
14f425881e Merge pull request #19309 from KorPhaeron/Ihavenopatience
Shortens shuttle travel time from 25 to 6 seconds
2016-07-14 19:42:26 +12:00
lordpidey
810f3d9052 Small devil fixes (#19302)
* Removes errant cast from devilinfo.add_soul()

* Clarifies a banishment ritual in the Codex Gigas.

Sprinkling holy water isn't enough, it needs to be in the devil's bloodstream.

* Infernal jaunt now correctly extinguishes the user.
Revival contracts no longer actually set the target on fire, but rather uses a fake fire.

* Pitchforks don't burn devils or soulless on use/pickup anymore.
Adds cast charge time to infernal jaunt, so that it's impossible to jaunt while already jaunting.
Adds feedback to using infernal jaunt to jaunt in.
2016-07-14 19:41:01 +12:00
oranges
e19369280d Merge pull request #19290 from lzimann/altclickjumpsuits
Alt clicking now removes jumpsuit accessories.
2016-07-14 19:38:50 +12:00
Core0verload
e666d2e76b ports pockets (from Animus Green) and adds them to some clothing.
This PR ports pockets (from Animus Green) and adds them to some clothing.

 Shoes that support storing items now use pockets system.
 Some hats have 1 small pocket.
 Detective's hat spawns with a flask in it.
 Clown's mask has a single tiny top-secret pocket. Honk!

This PR also includes two or three path fixes. It also fixes internal storages (pockets, storage implant) having less "max depth" than external ones.
2016-07-14 19:36:26 +12:00
KorPhaeron
251b2dc372 Shortens shuttle time from 25 to 6 seconds 2016-07-13 21:20:30 -05:00
oranges
90340ca794 Merge pull request #19306 from MrStonedOne/511compilefix
fixes compiling under 511
2016-07-14 09:25:52 +12:00
MrStonedOne
80044c3380 fixes compiling under 511 2016-07-13 14:09:37 -07:00
AnturK
1eba595115 Fixes create antagonist for revenants. (#19296) 2016-07-13 13:16:13 -04:00
Joan Lung
243374eec6 Fixes some dexterous guardian issues 2016-07-13 11:51:25 -04:00
AnturK
632ef1bd57 Merge pull request #19289 from lzimann/nerfthemedals
Medals are no longer instant to pin
2016-07-13 14:54:09 +02:00
oranges
ba163eb417 Merge pull request #19286 from coiax/ai-fxes
Fixes an AI with a deleted camera being stuck
2016-07-13 18:46:46 +12:00
oranges
012c163356 Merge pull request #19281 from Cruix/plasma_sheets_are_not_reagent_containers
Fixed a runtime when gibbing plasmamen in the gibber.
2016-07-13 18:43:52 +12:00
TechnoAlchemist
f8e54b25ba Makes lethal injection actually lethal. (#19278)
* Makes lethal injection actually lethal.

* Spacing
2016-07-13 18:19:10 +12:00
Mike Long
e44a7fb7aa changes a qdel to a death. 2016-07-12 21:30:42 -04:00
AnturK
523a2b29fe Implant chair refactor (#19272)
Removes some copypasta
Refactors implant chairs. Adds some fun variations.
2016-07-13 12:59:06 +12:00
Joan Lung
71da2aba13 Fixes shuttles killing AI camera eyes (#19280)
* this wasn't even my bug but because mso was an ass I fixed it for him

* spitefronds
2016-07-13 12:50:20 +12:00
Mike Long
b35398f71b Changes destroy to qdels
Changes flyswatter sound to snap.ogg
2016-07-12 20:28:55 -04:00
Xhuis
82e2e8a844 Pinpointer refactor (#19156)
* Pinpointer refactor

* Gives operatives the proper pinpointers

* Improves operative and AI tracking a bit

* Bashing people over minor mistakes is the new thing

* Replaces some more strings with defines

* Makes operative tracking actually functional

* Improves operative tracking

* Conflicts I

* Conflicts III

* Conflicts I

* Conflicts III

* Adds two new tracking modes

* Fixes a grammar error
2016-07-13 12:03:36 +12:00
Militaires
596b42d5dc Adds a new hairstyle (#19265)
* bitches leave

* cops dont like me so i dont like cops

* alright fun's over
2016-07-13 12:01:22 +12:00
Mike Long
f1a1cafed4 Adds flyswatters.
They are availible in beekeeping crates.
They instantly kill bees, and deal large damage to flypeople, and negligible damage to non-flypeople.
2016-07-12 19:47:03 -04:00
Shadowlight213
b4b21842db Sending adminpms from IRC. (#19097)
* Sending adminpms from IRC.

* added limit of 2 messages sent to irc per irc message recieved.
2016-07-13 11:40:18 +12:00
Joan Lung
fe28096320 Adds dextrous guardian (#19254)
Added dextrous guardians to the code, able to hold and use items and store a single item within themselves.

Dextrous guardians do low damage on punches, have medium damage resist, and recalling or leashing will force them to drop any items in their hands.
2016-07-13 11:25:00 +12:00
Fox McCloud
2a10bbf4bc Fixes Borg Stun Attack and Simple Animal Armor Penetration (#19269) 2016-07-12 16:00:35 -04:00
Lzimann
16295889d7 Remove accessory is no longer a verb, moved it to alt click. 2016-07-12 10:51:26 -03:00
Lzimann
e1c1f0a99f Adds the missing comma 2016-07-12 10:31:29 -03:00
Lzimann
9beea968f2 Medals are no longer instant to pin 2016-07-12 10:16:05 -03:00
Jack Edge
a7d33d73ec Fixes an AI with a deleted camera being stuck
For example #19279 will cause the roadkill to (incorrectly) kill the
AI's camera mob. Now the AI Life() tick will correctly recognise a dead
camera, and recreate it.

- Also fixes a bug where a hacking-in-progress APC getting its AI
control wire cut would make a message, and then another message when the
timer finished.
- Removed trailing returns, addtimer'd a thing
2016-07-12 13:21:40 +01:00
oranges
70b080cb00 Merge pull request #19261 from hornygranny/an_arm_and_a_leg
fixes attacks missing due to dismemberment
2016-07-12 14:49:41 +12:00