Commit Graph

8179 Commits

Author SHA1 Message Date
Joan Lung fa257f92ab Misc fixes (#19375)
* Misc fixes

* river

* delta

* waterfall

* cloudburst

* thunderstorm
2016-07-20 20:12:49 +12: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
Cheridan 19c1d58797 HOP ON THE MAGIC SCHOOLBUS MOTHERFUCKERS (#19374)
* HOP ON THE MAGIC SCHOOLBUS MOTHERFUCKERS

* Moves bus structures to /fluff.dm. Map update.

* Updated DEEPLORE.
2016-07-19 11:30:05 -04: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
oranges 951c7976bf Merge pull request #19308 from Niknakflak/NanotrasenFixtures
Adds shower curtains
2016-07-17 11:51:20 +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
NikNakFlak ad9d105168 Changes for the change gods 2016-07-15 15:54:39 -07: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
Firecage c1f4296035 Makes it so Mechas can't pass through plastic flaps. (#19303)
* Makes it so Mechas can't pass through plastic flaps.

* Phazon no can pass through flaps.
2016-07-14 19:41:52 +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
NikNakFlak f34ba40882 Science isn't about why, It's about why not! 2016-07-13 19:01:50 -07:00
Cheridan 5ea6bdbbbd Merge pull request #19219 from MrStonedOne/patch-227
air tight plastic flaps now properly set atmos state.
2016-07-13 14:33:38 -05: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
Kyle Spier-Swenson de5d6d29a8 Update plasticflaps.dm 2016-07-12 22:47:23 -07:00
Kyle Spier-Swenson 77749840b3 Update plasticflaps.dm 2016-07-12 22:47:22 -07:00
Kyle Spier-Swenson 8bcc67d11d air tight plastic flaps now properly set atmos state.
blocks_air is getting phased out, this is the last thing that uses it that isn't a closed turf

In another pr when I have more time, i'll remove the var flat out.
2016-07-12 22:47:21 -07: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
Remie Richards ae43c4908b Fixes some Alternate Appearance issues (#19258)
Fixes Alternate Appearances clobbering each other
Fixes Viewed Alternate Appearances not being cleared out during an atom's Destroy()
Fixes Kor's AA plants.
properly removes viewing_alternate_appearances AAs
2016-07-12 10:07:49 +12:00
MMMiracles 4f18303695 hotel changes (#19257)
Fixed locker access. Some slight visual changes to turfs as well as a small theatre-ish stage to the open bar/kitchen area. The front desk now has pamphlets to give to arriving guests as a short description of the place they just teleported to.

Also, all hotel staff now spawn in with mindshield implants (vigorous background checks to ensure any subconscious bloodlust urges are contained), as well as the energy shotgun being given a mindshield pin due to complaints about some people bumrushing the hotel for it.
2016-07-12 10:05:15 +12:00
oranges c3da210a98 Merge pull request #19234 from coiax/cc-fixes
Bug fixes for cardboard cutouts
2016-07-11 16:46:03 +12:00
Cheridan 385f74cf05 Merge pull request #19216 from coiax/table-stuff
Dull table stuff refactoring
2016-07-09 15:02:03 -05: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
Jordie 55aa265842 Merge pull request #19211 from ChangelingRain/couldyoupleaseconvertmorestuff
Slightly more construction value is required to unlock scripture
2016-07-09 22:27:48 +10: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
Jack Edge c8275384be Dull table stuff refactoring
- Uses a timer, cleans some returns, nothing exciting
2016-07-08 17:10:02 +01:00
Joan Lung fa12bbacd6 Slightly more construction value is required to unlock scripture 2016-07-08 07:58:59 -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
oranges feeccd3fe4 Merge pull request #19163 from coiax/fix-19162
Burnt matches can no longer ignite paper or people
2016-07-08 09:54:10 +12:00
coiax ca167d4ba2 Opening crates with a crowbar will drop manifest (#19164)
- Also drones can now use the Toggle Open verb.
Fixes #19084.
2016-07-07 13:25:26 -04:00
Jack Edge fecaf91e0e Burnt matches can no longer ignite paper or people
Fixes #19162.
2016-07-06 13:25:19 +01:00