Commit Graph

2177 Commits

Author SHA1 Message Date
Joan Lung
79b226feb8 The Ark of the Clockwork Justicar can now be constructed even if Ratvar's rise is not an objective (#19864)
* The Ark of the Clockwork Justicar can now be constructed even if Ratvar's rise is not an objective

* you're so fucked

* behold

* clang
2016-08-16 10:24:36 +12:00
oranges
bbf8889d9c Merge pull request #19810 from KorPhaeron/blueprint_fix
Refactors area creation
2016-08-15 00:01:00 +12:00
KorPhaeron
43a16713f1 Blueprints for everyone 2016-08-11 04:04:16 -05:00
KorPhaeron
2a71f7e3b2 Fixes realism issues with rapiers being able to dismember (#19779)
* Rapier Fixes

* Typo

* Rapiers are not canon

* Removes rogue apostrophe
2016-08-11 15:43:18 +12:00
Joan Lung
ef67937976 Dreamstation's mini station map now has a metastation-like description (#19781) 2016-08-09 13:23:06 -05:00
Arctophylax
d374ff92e6 Fixes Kitchen Spike Buckling (#19712) 2016-08-05 17:00:52 -05:00
unknown
5ea9203c7f Added some has_buckled_mobs() checks. 2016-08-02 23:39:29 -07:00
Lularian
feafb59f0e 111111111111111 2016-08-01 16:58:34 -05:00
bawhoppen
1fecd12aaf no really who is da king (#19537)
add: Added crowns. Make them from gold. Cap gets a fancy one.

Crowns get some armor but are overall worse than sec gear.
2016-08-01 13:58:11 +12:00
oranges
68e85feb47 Merge pull request #19589 from ChangelingRain/ahorriblewishacursecutshortawantsodeepitrunsinboneandbrain
Simple animals can now have a set amount of damage to deal to objects in place of normal melee damage
2016-08-01 10:57:45 +12:00
Joan Lung
bcfe0be2d0 Potted plants now layer properly (#19546)
* Potted plants now slow you down slightly

* we manage to pull her away

* no message
2016-07-30 12:18:12 -05:00
Joan Lung
60b32ddd85 Simple animals can now have a set amount of damage to deal to objects in place of normal melee damage 2016-07-30 09:14:53 -04:00
NikNakFlak
a7b6e60d65 Sprite changes for bedsheets/signs, minor code cleaning (#19377)
* Bedsheets, sprite changes, sign

* Spelling

* Ugh, oldcode ew

* More more more

* does a thing

* Holy shit batman, this map merging thing sucks
2016-07-28 21:02:33 +12:00
Thunder12345
1220d02aca Rapiers (#19340)
* Adds Rapiers
2016-07-26 15:14:11 +02:00
KorPhaeron
0382041796 Remove people from spikes properly 2016-07-23 21:49:27 -05:00
Joan Lung
e6259d32e3 Merge pull request #19406 from Niknakflak/ImABigBoyNow
Makes crayons not racist anymore
2016-07-23 18:40:10 -04:00
Joan Lung
afc73ef4f1 Merge pull request #19432 from KorPhaeron/morgue_fix
Morgue Light Fix
2016-07-23 18:39:42 -04:00
NikNakFlak
e40e24e220 Washing machine code is bad and so is whoever did krav_maga at first 2016-07-22 16:47:02 -07:00
KorPhaeron
8ebeee7341 Morgue Fix 2016-07-22 13:12:22 -05:00
MMMiracles
23bf156fb0 Mjor: Creator of Original Assets (#19410)
🆑 MMMiracles
add: A giant wad of paper has been seen hurling through the nearby sector of SS13, officials deny existence of giant paper ball hurling through space because 'thats really fucking stupid'.
/🆑

Mjor the Creative, a wizard with the taste for the arts, has used his magical craft to form a home made of papier-mâché hurling through space because hes a wizard he can do whatever the fuck he wants. He uses his 'artistic' skill to conjure up minions to assist him when nosy people try to steal his priceless art.

He has two abilities he can use during a fight, one will summon copies of himself as mimics. Attacking a mimic does 50 brute to everyone around him and attacking him destroys all active mimics. The other ability lets him summon his crudely-drawn creations, bringing them to life to fight for him.

Killing him gives you access to his papier-mâché robe, a special collector's edition paper, and his priceless range of artwork. What more could you ask for?

The wizard's robe, when equipped, will allow the wearer to summon their own stickman allies. They are only loyal to who summoned them and will attack everything else. Ability has a cooldown between each use.

Boss code credit majority to @RemieRichards as it is a modified version of what she wrote up a couple months ago for one of my unfinished away missions.
2016-07-22 11:01:07 +12:00
oranges
4d70a39488 Merge pull request #19400 from Bawhoppen/mapfixes
All shuttles now use proper smoothing paths, I had to update them all by hand

I have a few more things to fix for titanium in this PR aswell

Also all syndie shuttles are now consistent with each other. (Added some more turrets since they aren't indestructible now)

(I was exaggerating/joking when I said its like 50 files changed but it turns out it actually is)

add: Titanium now spawns in mining again.
add: It has uses in R&D and robotics production.
add: All shuttle walls are now using a new proper smoothing path. Mappers please make sure to use this path correctly in the future. (along with tiles)
2016-07-22 10:11:46 +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
Joan Lung
fa257f92ab Misc fixes (#19375)
* Misc fixes

* river

* delta

* waterfall

* cloudburst

* thunderstorm
2016-07-20 20:12:49 +12:00
Lularian
19d8706e36 fixes conflicts 2016-07-19 16:37:29 -05: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
Lularian
c85ea92a15 falsewalls 2016-07-19 15:24:19 -05: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
Firecage
58ee32f8e3 Fixes borgs not being able to finish scooters + misc changes. 2016-07-18 16:25:09 +02:00
oranges
951c7976bf Merge pull request #19308 from Niknakflak/NanotrasenFixtures
Adds shower curtains
2016-07-17 11:51:20 +12:00
NikNakFlak
ad9d105168 Changes for the change gods 2016-07-15 15:54:39 -07: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
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
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
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
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
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
Cheridan
385f74cf05 Merge pull request #19216 from coiax/table-stuff
Dull table stuff refactoring
2016-07-09 15:02:03 -05: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
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
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
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
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
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