Commit Graph

8198 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
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
Shadowlight213 9112e71914 Fixes merge conflicts 2016-07-22 01:04:45 -07: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
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 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
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
Joan Lung f2125f3c81 Sigil nerfs (#19380)
tweak: Sigils of Transgression now stun for about 7 seconds.
experiment: Sigils of Submission/Accession now take 7 seconds to convert successfully, and have an obvious message to the person on them that their mind is being invaded
2016-07-20 20:14:23 +12:00
Joan Lung fa257f92ab Misc fixes (#19375)
* Misc fixes

* river

* delta

* waterfall

* cloudburst

* thunderstorm
2016-07-20 20:12:49 +12: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
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
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