Commit Graph
17 Commits
Author SHA1 Message Date
Arokha SieyesandLeshana ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Mechoid ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
Neerti cca2cc5a23 Adds Berserk 2018-01-11 01:35:14 -05:00
Cameron Lennox 15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Neerti 64f02f70b2 Simple Animal Tweaks
Makes hivebots a bit smarter, shifts stats around, adds a few new sprites thanks to Mechoid, and adds a few new types.
Adds verbs that can be used as a player hivebot, to get them to follow you.
Spider eyes can now be seen clearly in the darkness, which looks spooky.
2017-09-24 23:43:14 -04:00
killer653 468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Cameron653andAnewbe 97957fcaee Replaces more macros. (#3647)
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
2017-07-27 21:12:21 -05:00
Cameron653andAnewbe e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Leshana 9c32a6dc0a Fixes un-sanitized preferences runtimes
* Puts back in code that sanitized preferences after loading, it was overwritten in polaris sync commit 3f1e5c80f2
* Also removes a VOREStation Edit comment on lines that were no longer different from Polaris, introduced at the same time.
* Fixes Runtime in 02_language.dm,21: Cannot read null.language
2017-06-12 23:20:33 -04:00
Leshana f0270451a7 Added vore capabilies to the new simple_animal system.
* Added happy friend time mechanics working properly for fox and cat.
* Added vore mechanics and vore overrides
* No longer enable vore on simple animals by creating a "/vore" subtype.  Instead we simply enable vore on the main type.  Consensus being we don't need a type for non-vore versions of stuff.
  * This allowed us to revert many path references throughout the codebase to the original non-vorestation back to their original values.  In these cases the "Vorestation Edit" comment is removed.
* Moved the vore overrides for upstream simple animals into its own file zz_vore_overrides.dm
2017-03-22 19:32:19 -04:00
Arokha SieyesandLeshana 88b5756977 Arokha SA Rework (Polaris) 2017-03-22 19:32:19 -04:00
Arokha SieyesandAnewbe 9660186dfd Not So Simple Animals (#3103)
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
2017-03-22 14:30:07 -05:00
killer653 3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
SpadesandGitHub 21cd4e4791 Voremob tweaks, bellies now escapable (#783)
* Voremob tweaks, bellies now escapable

Also disabled all the non-vore variants in the code to avoid confusion,
excluding aliens for now, since other stuff is handled there.

* comment removal

* Zoo.dmm hotfix

Makes the snakes play nice.

* Travis stop being a cunt

* Minor Tweak
2016-12-30 11:27:07 -05:00
killer653 d1afae6d06 Polaris Sync & bugfix
- Polaris Sync
- Fixes bug being unable to pick up micros
- Fixes all conflicts that came with sync
2016-08-17 22:02:05 -04:00
Kelenius 93d07036ef Rewrites xenoarch
See changelog
2016-08-07 08:26:26 +03:00