Commit Graph

8215 Commits

Author SHA1 Message Date
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
oranges 29272c92f5 Revert "listen to me, this is all I really wanted all along" 2016-07-30 22:44:02 +12:00
Lularian eee517f5b7 look me in the eyes, please... 2016-07-28 17:28:44 -05:00
KorPhaeron 5f5cd82f51 Doomslayer Fixes/Balance (#19485)
* Doomslayer Fixes

* Fix for projectile blocking

* Removed redundant chemical from doomslayer
2016-07-29 08:22:41 +12: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
oranges 9eae6b5952 Merge pull request #19526 from Shadowlight213/Ashborg
Fixes borgs losing ash storm protection when reset.
2016-07-28 19:47:43 +12:00
Kyle Spier-Swenson c9831c4afd [Ready]Makes space wind great again! (#19494)
* Makes space wind great again!
Space wind is now a scaling percent to move on pressure differences.
Space wind percent to move scales with pressure amount, and other modifers:
Actively moving (as in holding down a move key) reduces chance of getting moved by space wind by 30%
Having a wall or densed anchored object to your left or right (in terms of direction to be moved) will lower your chance to be moved in space wind by 20% in each direction. (so a wall on both sides is 40%) (Only applies to mob's with limbs)

* does the mrp
2016-07-28 09:43:51 +02:00
Shadowlight213 95220c5a7d Fixes borgs losing ash storm protection when reset. 2016-07-26 20:05:46 -07:00
Joan Lung a49b2cfdf5 Temporary overlays are immune to lava (#19515) 2016-07-26 21:23:11 -04:00
Cheridan ae73924372 Merge pull request #19489 from XDTM/DefibFix
Defib now checks for heart when used for heart attacks
2016-07-26 12:44:22 -05:00
Thunder12345 1220d02aca Rapiers (#19340)
* Adds Rapiers
2016-07-26 15:14:11 +02:00
oranges f7c0d39c3e Merge pull request #19469 from Iamgoofball/patch-89
Unused Traitor Items: Powerfist
2016-07-26 09:40:32 +12:00
XDTM 27d7f703f4 Defib now checks for heart 2016-07-25 12:21:56 +02:00
oranges 665783f0fa Merge pull request #19455 from Incoming5643/patch-15
Doubles the amount of viscerators in the viscerator grenade
2016-07-25 21:17:47 +12:00
Iamgoofball 758d77efdb Unused Traitor Items: Powerfist
not enough damage tbh, 3% usage
2016-07-24 04:48:08 -07:00
KorPhaeron 0382041796 Remove people from spikes properly 2016-07-23 21:49:27 -05:00
Incoming5643 d7de116d28 Doubles the ammount of viscerators in the viscerator grenade
As per request
2016-07-23 21:40:54 -04: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
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