Commit Graph

29400 Commits

Author SHA1 Message Date
KorPhaeron f41daf05c3 Flesh Clothes 2016-07-23 21:44:35 -05:00
Joan Lung e8ee3a0008 Merge pull request #19437 from ma44/master
Makes Saltpetre a thing for Botanists now
2016-07-23 20:50:20 -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
GunHog 6a84c1c9c6 Bluespace polycrystal tech fix (#19447) 2016-07-23 17:13:19 -04:00
ma44 77efba7837 Update hydroponics.dm 2016-07-23 12:57:20 -05:00
Cheridan fef0d6aa16 Merge pull request #19430 from ChangelingRain/iamtryingtofuckupvenusfortherestofhisentirelifeandyoutooifyouletmeandifyouwanttostopthatiguessthereisaproblemandyouwillhavetokillme
Fixes component messages
2016-07-23 11:27:23 -05:00
oranges d6d7e84cb5 Merge pull request #19426 from ChangelingRain/icantstopthatkindoftouchsowhatifijuststoppedtryingnottoyouknowitfeelssostrangeandweirdandbadtostopbuticouldireallycouldithinkandhownicethatwouldbe
Makes some duplicated code involve less duplication
2016-07-23 14:28:21 +12:00
GunHog 3a6df6950a Fixes Fireball clicking issues (#19423)
* Fixes Fireball clicking issues

- Attempts to fix clicking issues with Fireball during mob changes and
other edge cases.

* Alien spit now turns off when used when out of plasma.
2016-07-23 14:28:10 +12:00
Joan Lung 1299758f4a Fixes the singularity every potentially eating itself (#19424) 2016-07-23 14:27:59 +12:00
Joan Lung bd2e1334e2 Makes the Cache cost increase less harsh (#19421) 2016-07-23 14:27:33 +12:00
ma44 9762ed71fe Update hydroponics.dm 2016-07-22 20:04:43 -05:00
ma44 417a103a80 Update hydroponics.dm 2016-07-22 19:47:48 -05:00
ma44 c155b71978 Update hydroponics.dm 2016-07-22 19:45:51 -05: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
Joan Lung f0e18860b0 Fixes component messages 2016-07-22 10:30:07 -04:00
Shadowlight213 9112e71914 Fixes merge conflicts 2016-07-22 01:04:45 -07:00
Joan Lung fafee435b2 Most ratvarian text is now passed through text2ratvar() (#19414)
rscadd: Revenant scriptures now announce to all servants and ghosts when used instead of having a visible message.

Accidentally fixes some countdown code to be more simple(coiax what the fuck why was that using an overlay)
Retcons Inath-neq's name to have a lower-case N, so that the regex for it doesn't need to capitalize it.
Redoes the tiny bit of Nzcrentr lore.
I might have fixed a bug or two? It's kind of hazy.
2016-07-22 13:14:07 +12:00
Joan Lung 61654f5106 Makes some duplicated code involve less duplication 2016-07-21 19:36:11 -04: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
yackemflam a9764c3485 Flash Buff (#19370)
Flash buff because a lot people are complaining about unstoppable borgs.
2016-07-22 10:16:13 +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
oranges 179ae6aaa6 Merge pull request #19394 from ChangelingRain/thereisnothingtofearwhenthereistwoagainstthedevilbutwecantwaittoseewhattheylldoagainstthethreeworstgirlssinceeve
Scripture now tells you how much of each component it needs if you lack those components
2016-07-21 11:47:52 +12:00
Joan Lung c0510d20d6 Tinkerer's Caches cost one of each non-alloy component for every three existing caches (#19395)
* Tinkerer's Caches cost an additional alloy for every two existing caches

* flood

* earthquake

* devil

* light
2016-07-21 11:46:32 +12:00
Xhuis a8f7dd8044 Minor Clockwork Cult Patch (#19389)
add: Clockwork cultists may now have the "Escape" and "Silicon" objectives, requiring a certain amount of servants to escape on the shuttle and all silicons to be converted respectively.
add: Ocular wardens are now forced to target bibles rather than the people holding them.
2016-07-21 11:45:13 +12: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
oranges a4450055ee Merge pull request #19381 from Incoming5643/DoNotPlayCURRENTYEAR
"Return to lobby if preferences unavailable" Revengence
2016-07-21 09:02:41 +12:00
Lularian 8001a0d2ee damaged floors 2016-07-20 09:39:25 -05:00
oranges 856ee731f4 Merge pull request #19390 from PKPenguin321/patch-5
Replace istype with is_sharp
2016-07-20 20:15:23 +12:00
Joan Lung e641a9245f Nerfs ocular wardens and mania motors (#19387) 2016-07-20 20:14:52 +12: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 0b1b0ba65b Guvax is much slower above 5 servants (#19379) 2016-07-20 20:14:08 +12:00
Joan Lung 3ed5b4226f Tinkerer's Caches link to clockwork walls (#19378)
* Tinkerer's Caches link to clockwork walls

* monsoon
2016-07-20 20:13:55 +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
Lularian 250623ccdb readds recipes and spawning 2016-07-19 16:32:04 -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
Lularian 8a515cc41c fuck me in the ass, please 2016-07-19 14:59:29 -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
Joan Lung 235ec221a3 Scripture now tells you how much of each component it needs if you lack those components 2016-07-19 09:25:10 -04:00