Commit Graph

8160 Commits

Author SHA1 Message Date
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
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
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
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
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
Xhuis
d818ccee79 Necropolis Beautification (#19134)
* Lavaland patch

* Conflicts

* Now with 100% more compiling

* Removes balance changes

* Conflicts 1

* Conflicts 3

* Updates the map
2016-07-05 20:15:19 -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
oranges
3876d42241 Merge pull request #19113 from Cruix/vending
Fixed vending machine restocking units not working.
2016-07-06 10:14:25 +12:00
MMMiracles
69c676617b Making Space Great Again (implying it ever was): Part Uno (#19085)
Adds space ruins. Balance not included.
Simple mob ghosts actually work now.
Puzzle1 ruin removed due to issues with projectiles.
2016-07-05 00:02:42 +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
oranges
a110fe9a14 Merge pull request #18980 from Incoming5643/THE_COWS_THE_FOODS
Adds large metal boxes: 2015 Unmerged Pull of the Year Edition
2016-07-03 09:30:22 +12:00
Joan Lung
c801f9a9c9 Replaces umbras with revenants (#19059)
Umbras have been removed.
Revenants have been readded, though they are now vulnerable to salt piles.
2016-07-03 01:33:52 +12: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
Jack Edge
8b8a10410f Removes zombie shuttle ripples
The qdel timer was interacting weirdly with the pool. This makes it
stop.

Fixes #19021
2016-07-01 10:42:52 +01:00
oranges
7967e07b3d Merge pull request #19045 from Niknakflak/AHAAA_STOP_BEING_INVINCIBLE
Showcase deconstruction/moving
2016-07-01 20:05:03 +12:00
TechnoAlchemist
4c8f22f1de Adds energy bolas to the secvend. (#19006)
Refactors the code slightly as well
2016-07-01 20:01:01 +12:00
Firecage
c61b16b37b Fixes 2 bugs with mirrors. (#19015)
You can no longer use TK on a mirror to change your 
appearance while far away from the mirror. You have 
to be adjacent to it. Fixes #18823

You can no longer normally use shattered mirrors, they
now properly become shattered. Yes, you could shatter
a mirror and still use it, stealthily. Honk.
2016-07-01 13:34:19 +12:00
Joan Lung
adab4f4233 Removes some unnecessary code (#19025) 2016-06-30 12:31:08 -04:00