Commit Graph

15105 Commits

Author SHA1 Message Date
Cheridan
2f52e7daf9 Merge pull request #16829 from erwgd/LetUsMakeDinnerware
New autolathe category for kitchen+bar items
2016-04-14 11:56:21 -05:00
Cheridan
64ddf0c924 Merge pull request #16852 from ChangelingRain/thisisdumbblamecoreoverload
Some spots on lavaland no longer produce asteroid flooring
2016-04-14 11:52:50 -05:00
erwgd
9d6247c890 Removed bowl making code from biogenerator.dm
Added bowl design to autolathe_designs.dm
Changed bowl materials to 500 glass
2016-04-14 17:14:01 +01:00
Joan Lung
755fa61417 Merge pull request #16816 from lordpidey/lordpidey_methboom
Adds meth mixing related explosions
2016-04-14 09:39:58 -04:00
Joan Lung
7db9aa0e76 Merge pull request #16848 from KorPhaeron/butcher
Lavaland Buterching and Suit Fixes
2016-04-14 09:32:50 -04:00
coiax
7f328ba077 Added ORIGINAL CONTENT skeleton toys that chatter when you play with them (#16792)
* Step one, aquire voices for skeletons

* Moved sounds to their own folder

* Added samples of up to ten phomemes long for papyrus

* Added samples of up to ten sans phomemes

* Add skeleton talking

Skeletons now produce audible sound effects representing their distinctive
speech.

* Skeletons now respect punctuation in their chatter

Except for semi-colons, due to HTML escapes of the ' character.

* Lowered volume of skeleton phomemes

* Use Dunc's regex for parsing messages

* Added sans and papyrus toy sprites

Spriting is hard. But I think I managed to crush the images down to fit
in our 32x32 box.

* Generic talking action figures

Talking action figures like the owl figure and the griffin figure are
now generic, and have a pool of messages to pick from. This allows us to
make our TOTALLY ORIGINAL skeleton toys.

* Added the toys to the prize list

No point making these if you can't get them.

* Moved skeleton vocalising code into toys

* Fixes runtimes and bugs with skeleton talk

Remaking the regex each time makes sure it gives output everytime,
and we've also put a check that the item in the list is actually
a number before calling max() that was causing a runtime previously.

* Restored original form of skeleton span picking

Remie's was better.

* More messages for skeleton toys

I think that's probably enough to satisfy me.

* Changed for loop to new style
2016-04-14 09:30:33 -04:00
Joan Lung
d8a724f1c4 Merge pull request #16806 from coiax/airlock-painter
Airlock painter now printable in autolathe; plus meme suicides
2016-04-14 09:29:10 -04:00
Jack Edge
52827cc7b9 Merge branch 'master' into without-the-crates 2016-04-14 08:50:14 +01:00
Joan Lung
e4515cc112 Merge pull request #16865 from Incoming5643/hiss
Coldfix for Xeno saycode
2016-04-13 23:26:29 -04:00
Cheridan
83b4c1b2ff Merge pull request #16794 from lordpidey/lordpidey_ion
Adds new ionlaws: This new class of ion laws causes the AI to use wrong names
2016-04-13 22:22:45 -05:00
Cheridan
efa8f1b43a Merge pull request #16836 from Incoming5643/okokfinestopasking
(space) ruins requests and practicalities
2016-04-13 21:16:08 -05:00
Joan Lung
6f636e1739 Merge pull request #16866 from LatD/Floorbot-2
Floorbots can replace existing floor tiles with loadable custom tiles
2016-04-13 21:04:58 -04:00
LatD
4f94f4f43b Custom tiles to floorbot 2016-04-14 03:33:44 +03:00
Incoming
e5602f5220 Fixes xeno hissing. the dangerous result of testing sounds while the station started with no atmosphere 2016-04-13 19:15:10 -04:00
Cheridan
e5f14eb0a0 Merge pull request #16826 from Bawhoppen/1
Keeps chaplain up to date
2016-04-13 18:03:39 -05:00
Cheridan
10dc66463a Merge pull request #16837 from Incoming5643/brainmobs_are_trash_someone_remove_them
Removes mushmouth MMIs
2016-04-13 16:20:59 -05:00
Cheridan
9f260139bf Merge pull request #16667 from sawu-tg/master
Minor SNPC fixes, Fixes #16572
2016-04-13 16:11:44 -05:00
Cheridan
32a80f6e2f Merge pull request #16807 from KorPhaeron/low_pop
Restricts certain uplink items from appearing in low pop
2016-04-13 16:02:17 -05:00
Cheridan
5a51d2e9f9 Merge pull request #16818 from phil235/FixSeedShit
Fixes Seed runtimes
2016-04-13 15:58:59 -05:00
Cheridan
8b7bff53ca Merge pull request #16823 from Bawhoppen/cryofix
Fixes cryo
2016-04-13 15:58:01 -05:00
erwgd
ca88d3f025 added shot glass and shaker designs to autolathe
defined materials for shot glass and shaker
2016-04-13 17:17:15 +01:00
AnturK
4b7f274e3f Merge pull request #16742 from Core0verload/master
Cargo Exports (and a very basic economy system)
2016-04-13 17:41:05 +02:00
Nerd Lord
3be807d95c Some spots on lavaland no longer produce asteroid flooring. 2016-04-13 06:55:22 -04:00
KorPhaeron
9988ee1975 Merge pull request #16696 from SamuelRowe/master
Minor grammar fixes
2016-04-13 00:22:39 -05:00
KorPhaeron
6866229d78 And removes excess diamonds 2016-04-13 00:17:59 -05:00
KorPhaeron
ca44efdca2 removes excess goliath plates 2016-04-13 00:17:10 -05:00
KorPhaeron
a372d7028d Butchering and Suit Fixes 2016-04-13 00:03:51 -05:00
KorPhaeron
62939a09f0 Merge pull request #16733 from octareenroon91/patch-35
Add Drone Shell to Protolathe for ease of exporting drone data disks to autolathes
2016-04-12 23:54:47 -05:00
KorPhaeron
2eaab2c39e Merge pull request #16820 from octareenroon91/patch-36
Improve ruins spawn logging
2016-04-12 23:45:46 -05:00
c0
04f1aafa78 Exports 2016-04-13 06:01:40 +03:00
Joan Lung
b0d6771903 Merge pull request #16694 from Fox-McCloud/xenobio-tweaks
Xenobio Additions and Tweaks
2016-04-12 20:57:50 -04:00
Fox-McCloud
cfdaac5fe0 tweaks 2016-04-12 20:50:03 -04:00
Incoming
31b1786fb8 Removes mushmouth MMIs 2016-04-12 18:09:25 -04:00
Incoming
6ec39db02a Ruins are now unique, you won't find two of the same one in the same round.
The configurable portion of ruin selection is now a blacklist instead of a whitelist.

Moves Lavaland files to be consistent with Space files.

All ruins are now valid for the sake of template generation (previously lava ones were but space ones weren't.
2016-04-12 17:13:41 -04:00
erwgd
0078f91d8a Added hacked autolathe design for butcher cleaver
Defined materials for butcher cleaver
2016-04-12 20:01:26 +01:00
erwgd
f0a6af827e Added bowl design to biogenerator.dm
Added recipes for fork and drinking glass to autolathe_designs.dm
Defined materials for fork, bowl, drinking glass
2016-04-12 19:39:09 +01:00
Lularian
f2bef4890e this is critical 2016-04-12 07:53:32 -05:00
Lularian
00ef4b7f32 makes cryo basically as good as showers 2016-04-12 02:35:23 -05:00
Cheridan
9e85fe81be Merge pull request #16743 from TrustyGun/flask
Changes Flasks a little
2016-04-12 00:03:19 -05:00
Cheridan
c5230dec86 Merge pull request #16789 from KorPhaeron/ash2
Less ash lizard starting loot
2016-04-11 23:56:45 -05:00
octareenroon91
9635648aeb Improve ruins spawn logging
Because `Ruins marker placed at 1761835` isn't that clear.
2016-04-11 21:58:08 -05:00
phil235
0d7adf841b add_juice() can also runtime if seed is null. 2016-04-12 03:59:39 +02:00
phil235
d03a5c9343 Simplifies the build_recipe_text() proc used by tablecrafting to not create and delete an object just to get its name (replaced by the "initial()" trick).
Adds some if(seed) checks to growns code to prevent runtimes for seedless growns.
2016-04-12 03:51:45 +02:00
KorPhaeron
51eee26d54 Merge pull request #16795 from octareenroon91/juggling-for-golems
Pickaxe portability
2016-04-11 20:07:24 -05:00
Joan Lung
28d543aa8b Merge pull request #16704 from Incoming5643/Its_3_am_and_I_am_too_dazed_to_make_a_clever_branch_name
Tongues
2016-04-11 19:44:36 -04:00
Incoming
dfc6e55eaf Implements Cheridan's tongue sprites. Oh baby. 2016-04-11 19:23:05 -04:00
Mike Long
d923049357 Adds meth mixing related explosions 2016-04-11 19:04:37 -04:00
erwgd
73be1a80c0 Created Dinnerware category for autolathe
Changed category of kitchen knife from "Misc." to "Dinnerware"
2016-04-11 22:19:15 +01:00
KorPhaeron
36b5122709 Merge pull request #16786 from TechnoAlchemisto/emote_fix
Fixes a simple animal emote.
2016-04-11 10:35:18 -05:00
duncathan salt
e20b7caffe dumb 2016-04-11 08:37:16 -06:00