Commit Graph

5163 Commits

Author SHA1 Message Date
Joan Lung e6259d32e3 Merge pull request #19406 from Niknakflak/ImABigBoyNow
Makes crayons not racist anymore
2016-07-23 18:40:10 -04:00
Shadowlight213 9112e71914 Fixes merge conflicts 2016-07-22 01:04:45 -07:00
NikNakFlak 1ff1582591 Adds 14 colorful beanies to game/clothesmat (#19408)
Sprites by Nienhaus with edits done to them by me


The colors look almost identical but now only the white, and striped versions of the beanies exist with the other colors being done via color variable.
2016-07-22 10:13:43 +12:00
oranges 5f4816ac7b Merge pull request #19403 from Cruix/stealth_traitor_fixes
Fixed camera bugs and Voice Changers
2016-07-22 10:11:18 +12:00
Shadowlight213 5f10739385 Repaths satchels and lets angels equip them (#19371)
Repaths satchels so all the different ones are children of the normal satchel.
Allows angels to equip satchels since the satchels are on the side of the body instead of the back. Should help miners who find the potion out a bit.
2016-07-22 10:10:30 +12:00
PKPenguin321 04dd716ef0 Adds canned laughter (#19405)
* adds canned laughter

* fixes issues
2016-07-21 10:10:46 +02:00
Joan Lung 9c1bed63a7 Merge pull request #19402 from RemieRichards/ratvarian_language_reforms
Ratvarian grammar/punctuation rules in proc form!
2016-07-20 19:14:15 -04:00
Shadowlight213 ed55cefcc2 Adds admin_spawned atom var that is set when something is spawned by admin means or is var edited.
This can be bypassed by using debug-game if needed.
Stats will not be tracked for admin spawned atoms
2016-07-20 15:26:24 -07:00
NikNakFlak 17d4b29791 Desegregates crayons 2016-07-20 00:13:08 -07:00
unknown 534f230ded Fixed camera bugs being unable to show camera view.
Fixed voice changers being unusable.
2016-07-19 21:58:19 -04:00
Remie Richards 8b8c5e0b76 Ratvarian grammar/punctuation rules are now enforced by code, automatic ratvarian is no longer just rot13 without the rules. 2016-07-19 23:25:14 +01:00
oranges 78eb476eb9 Merge pull request #19369 from Firecage/borgingscooters
Fixes borgs not being able to finish scooters + misc changes.
2016-07-20 08:53:18 +12:00
oranges 7283bd938f Merge pull request #19368 from Firecage/noinvisiblegrenades
Grenades fired from Grenade Launchers are no longer invisible.
2016-07-19 22:56:01 +12:00
IgnisCorvus 4065f6dc96 Bug with defibrilator (#19351)
* Bug with defibrilator

Defib paddles stick in your hands if the defib is removed from your back while holding the paddles.

* Update defib.dm

* Update defib.dm
2016-07-19 09:05:14 +12:00
Firecage 58ee32f8e3 Fixes borgs not being able to finish scooters + misc changes. 2016-07-18 16:25:09 +02:00
Firecage 8e16e39104 Fixes X4 runtime 2016-07-18 14:22:12 +02:00
Firecage 5381ccfe0a Grenades fired from Grenade Launchers are no longer invisible. 2016-07-18 11:05:04 +02:00
oranges e55d3dcd52 Merge pull request #19304 from lordpidey/flyswatters
Flyswatters
2016-07-17 11:51:57 +12:00
NikNakFlak 5e897cc18a HOW DID I MISS THIS (#19338) 2016-07-16 07:27:20 -04:00
Mike Long 0df823dafa Flyswatter now uses a typecache instead of hardcoded types. Badmins can now make other sorts of swatters with varedits. 2016-07-15 22:53:22 -04:00
oranges 8c9f2a7eff Merge pull request #19318 from DaveTheHeadcrab/plastic_explosives
Resolves a runtime with X4
2016-07-16 12:02:49 +12:00
SamCroswell 5772735d0e X-4 Bugfix 2016-07-14 15:42:15 -04: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
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
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
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
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
AnturK 523a2b29fe Implant chair refactor (#19272)
Removes some copypasta
Refactors implant chairs. Adds some fun variations.
2016-07-13 12:59:06 +12:00
Mike Long b35398f71b Changes destroy to qdels
Changes flyswatter sound to snap.ogg
2016-07-12 20:28:55 -04: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
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
unknown ea070a4680 Fixed a runtime when gibbing plasmamen in the gibber.
Renamed generic skin to skin.
2016-07-11 21:52:47 -04:00
Jack Edge cf1e38ce90 Bug fixes for cardboard cutouts
- Laughter and slaughter demons can actually be selected
- You can't use a capped spraycan

I swear I made these changes, must have forgotten to push.
2016-07-09 14:19:49 +01:00
Iamgoofball f3a41adfac Do you expect me to talk? (#19192)
No, Chaplain, I expect you to die.
2016-07-09 18:19:11 +12:00
coiax 880f65d6d4 Attacking; demons can be cardboard cutouts (#19168)
* Attacking; new sprites to cardboard cutouts

- You can now attack cardboard cutouts with weaponry; they will
generally fall down unless you're hitting them with something that isn't
a real weapon.

- Slaughter demons and laughter demons added to possible apperences.
Uses setDir() and icon manipulation to avoid having to edit the .dmi

- Painting a cutout now takes a second, and cannot be done with an empty
spraycan.

* A rough simulation of mob attack code

* Code review I
2016-07-09 18:18:16 +12:00
Core0verload 9edf034fa9 Changes a bit how hardsuit jetpack upgrade works (#19165)
Hardsuit jetpack upgrade item is replaced by an actual jetpack - the same as the one that exists inside the upgraded suit. It still can't be used separately.

Hardsuit jetpack has hardsuit jetpack sprites instead of voidsuit pack.

You can remove jetpack from hardsuit by using screwdriver on it.

Unrelated:
Fixes mining vendor UI a bit: items with long names no longer take two lines.
Changes staff of storms path to actual staff.
2016-07-09 18:17:43 +12:00
coiax afb7ebd790 Tiles are now (mostly) pooled objects (#19112)
* Tiles are now (mostly) pooled objects

Floors no longer have a builtin_tile, but instead use PoolOrNew().

Also added a do-nothing SSpool so you can inspect the global pool.

* Entries for time keeping

* MORE STATISTICS

* Stat tracking, auto filling

* Code review I

* Code review II

* Code review III
2016-07-08 13:32:40 -04:00
Leo 57ff27f4a9 Adds a craftable baseball bat (#19144)
The baseball bat has 10 force, although it throws the person back one or two tiles.

Sprites by Keekenox

In-hand sprites:
2016-07-08 09:56:39 +12:00
Jack Edge fecaf91e0e Burnt matches can no longer ignite paper or people
Fixes #19162.
2016-07-06 13:25:19 +01:00
coiax 3796656340 Adds ammo drops to CTF, fixes reload bug (#19125)
* My bed broke

* Slow healing, nodrop items

* Mark arena as dirty when stopping ctf

* Fixes spooky zombie projectile bug
2016-07-06 07:53:30 -04:00
MMMiracles e86c4de075 haha testing features xd (#19138) 2016-07-05 20:12:05 -04:00
coiax 6449b65d30 Adds fireplaces, eswords are hot, cardboard is flammable (#19118)
Makes needed improvements to proposed fireplaces

- Fireplaces now use world.timer
- Fireplaces no longer prompt input() for inserting logs, it just
takes as many logs as possible
- Paper and paper bins can be thrown on the fire, thirty paper is worth
one log of burn time.
- One log gives 15 seconds of burn time, the fireplace can hold up to 5
minutes of fuel.
- Ignitable items now use a /obj level proc to generate their messages,
currently using this are cigarettes, candles, fireplaces
- The fireplace can be put out with an extinguisher
- Cardboard cutouts are now flammable
- The fireplace is only "warm and cozy" when lit
- Paperbins qdel their stored papers when destroyed (probably did that
already, but no harm in making sure)
- Also removed some returns hanging around

* Added new proc for lighting stuff

- Adds ignition_effect(atom/A, mob/user) to obj/item, which is called
when you're attempting to light things with that object. By default it
does nothing and prevents ignition, but if the object is hot, it returns
a message. May do other things for different stuff.

- Eswords now ignite flammable gasses in their area.

* Fireplace is no longer on fire when not on fire
2016-07-06 10:16:47 +12:00
hornygranny 051e532337 Makes the fedora holy weapon sharp and actually good (#19116)
Gives the chaplain fedora a sharp flag and some force
2016-07-06 10:15:01 +12:00
unknown 225f2550c4 Fixed vending machine restocking units not working. 2016-07-03 23:09:25 -04:00
Leo dfac096b52 Throwing an active stunbaton now has a chance to stun people! (#19083)
* Tactical stunbatons

* Throw impact don't use 'usr' anymore.

* The probability is now a var and stunprods have way lower chance

* Perfect balance
2016-07-03 18:53:11 -04:00
AnturK 02bdb52704 Merge pull request #19066 from Cruix/misc_fixes
Misc fixes
2016-07-03 13:41:19 +02:00
MMMiracles 706a4f344b Adds the Power Fist (#19013)
The power-fist is a semi-port of hippiestation's power-fist. Sprites are from hippiestation.

The power fist is a metallic gauntlet with a built-in piston-ram that uses an external tank as its gas source. A wrench can be used to dial up the piston's valve and make the gauntlet hit harder and farther in exchange for more gas used.

A full large-tank will get exactly 4 level-3 punches in before needing to replace the external tank. This thing is incredibly lethal for taking out singular targets at a time but very poor against crowds as odds are you're going to exhaust your supply before fending off everyone.

The TC price might be too low/high, I don't know yet until people play around with it in an actual round. All I know is punching pun-pun half-way down the escape hall in a single hit is fun.
2016-07-02 14:40:22 +12:00
unknown 6491bcd5f1 Fixed hand labelers being unable to label storage items.
Fixed being unable to resist out of wrapped lockers.
Fixed being unable to resist out of lockers inside morgues.
Fixed mechs being able to spam doors they do not have access to.
2016-07-01 20:32:32 -04:00