Commit Graph

11520 Commits

Author SHA1 Message Date
mwerezak
b0440b9c28 Adjusts moderate level event weightings 2015-01-10 01:27:18 -05:00
mwerezak
3a4fca8ed3 Gridcheck event now only announces sometimes
Requested by Ravensdale
2015-01-10 01:26:49 -05:00
mwerezak
9b5eded546 Fixes major virus event generating lesser viruses, makes lesser viruses actually less severe
Makes more of a distinction between lesser and greater viruses by
restricting lesser viruses to only have the "Nil" syndrome for stage 4.
2015-01-10 01:25:19 -05:00
mwerezak
7f64d9ce13 Adjusts the amount of carp spawned for moderate level carp 2015-01-09 22:42:52 -05:00
mwerezak
905a832957 Fixed #7763 2015-01-09 22:28:16 -05:00
Amunak
0d87cb3d4d Fixes typo in engineering research description
It has been there since, like, forever.
2015-01-10 04:25:50 +01:00
Amunak
aee7ad199a Fixes rdconsole.dm file formatting 2015-01-10 04:06:25 +01:00
Amunak
f5344e599f Adds a nicer header to the research paper prints 2015-01-10 04:04:32 +01:00
mwerezak
0c9107afff Fixes hostile simple mobs targeting distant mechs 2015-01-09 21:36:44 -05:00
sirbayer
7a760298af Further repairs borg updateicon() code for improved modularity. 2015-01-09 18:17:51 -08:00
sirbayer
f193791f8c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fastxenoborg 2015-01-09 17:10:35 -08:00
Zulker Nayeen Nahiyan
203a7f1092 Fix compile error, remove Pi etc. from maths.dm and re-add them in setup.dm, fix bittest macros formatting to allow searching
`maths.dm`:
	Removed `var/const`s `E`, `Pi`, `Sqrt2`.

`setup.dm`:
	Re-added `PI` here, and added `Sqrt2`, `E` as macros.
	  The reason for this is that macros have a performance improvement over `var/const`s.

`lists.dm`
	Changed the formatting of the `BITTEST(...)` etc. macros so that they can be found by
	  searching for `#define BITTEST`

`rig.dm`:
	Fixed unknown variable error resulting from the usage if `STOPSPRESSUREDMAGE`
	  which was renamed to `STOPPRESSUREDAMAGE` in one of my earlier commits.

Others:
	Replaced constant variable `Pi` usage, with macro `PI`.
2015-01-10 03:14:48 +06:00
Zulker Nayeen Nahiyan
935448c098 Merge branch origin/dev into dev 2015-01-10 02:25:26 +06:00
Zulker Nayeen Nahiyan
b6ab0b64c0 Cleanup global.dm and setup.dm, fix typos in the other files
`code/setup.dm`:
	Fixed large amounts of indenting.
	Fixed large numbers of comments and their clarity.
	Added parentheses to macros using expressions.
	Added FIXME for unused duplicated macros, without certainty of their requirement.
	Removed some duplicate macros present. (`BRUTE`, `BURN`, etc.)
	Removed macro `PI`, and replaced instances of its use with `var/const/Pi` from `maths.dm`

`code/global.dm`:
	Fixed large amounts of indenting, added newlines to long single-lined list definitions.
	Slightly clarified comments.
2015-01-10 02:01:55 +06:00
Zuhayr
a539780086 Merge pull request #7759 from Baystation12/dev-freeze
Dev < Dev freeze
2015-01-10 04:58:48 +10:30
Zulker Nayeen Nahiyan
6e550d7308 Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation
`maths.dm`:
	Rewrite `Gcd(x)` to remove recursive behaviour.
	Remove `RaiseToPower(x)` and its usage from `event_manager.dm`.
	Rename `Lerp()` to `Interpolate()`.
	Add `Square(x)`, which squares a number.
	Rearrange most of the functions in the file. (trigonometric functions together, etc.)

`type2type.dm`:
	Rewrite `num2hex()` and optimise `hex2num()` for superior clarity and a 100% speed improvement.
	Correct indenting, spaces, make switches more concise.

`time.dm`:
	Remove old, slanderous commented-out function `/proc/time_stamp()`

`lists.dm`:
	Add the macros, `BITTEST(bitfield,index)`, `BITSET(...)`, `BITRESET(...)`
	  and `BITFLIP(...)` for bit-manipulation and use them where 20+ files
	  do it manually, for arguments of reader clarity and standardness.
2015-01-09 21:55:11 +06:00
Zulker Nayeen Nahiyan
fbffce744c Fixes typos and indenting present in the destilery module, and renames it to distillery
Updates the #include's for the renamed files in `baystation12.dme`
2015-01-09 20:49:36 +06:00
sirbayer
69da785b3c Fixes combat borg icon state breaking and turning borgs invisible; adds some modularity to the general borg icon_state situation. 2015-01-08 22:53:47 -08:00
Zuhayr
6a6332437a Merge pull request #7750 from Amunak/patch-1
Reverted "say error helper" before there is a better implementation or option to toggle it
2015-01-09 14:11:05 +10:30
Amunak
8fa2fdb51b Reverted "say" error helper
Commented out the "say error helper" before we have a better implementation or before it can at least be toggleable. Current state doesn't fit way too many edge casess.
2015-01-09 03:56:58 +01:00
Kelenius
966ba79a28 Update for the slimes
Water damage relative to water amount
Better interface for player-controlled slimes
Feed on simple_animals
Heavy refactoring
Friendly glomps at the slimes of the same color, non-friendly at the
slimes of different color
Fixes #7647
Fixes #7107
Fixes #6812 for the slimes only
2015-01-09 02:44:02 +03:00
Zuhayr
5bbe1ecaa8 Amends nymph pulling fix to add higher w_class. Adds fail messages to pAI and nymphs trying to drag non-items. 2015-01-09 08:59:38 +10:30
Zuhayr
fd311a412f Fixes #7742. 2015-01-09 08:58:11 +10:30
Zuhayr
f43f58380c Fixes #7703 2015-01-09 08:26:53 +10:30
Zuhayr
683c8b50a8 Fixes #7702 2015-01-09 08:09:46 +10:30
Zuhayr
7c88b54404 Fixes #7722 2015-01-09 07:30:48 +10:30
Zuhayr
a4fca84e3e Fixes #7726 2015-01-09 06:44:09 +10:30
Zuhayr
a01592d5b7 Fixes #7740 2015-01-09 06:25:27 +10:30
Amunak
7891c8c21b Merge pull request #1 from Tramziller/dev
Added print button into RD consoles
2015-01-08 19:08:58 +01:00
Tramziller
aa3c7574ca Added option to print research levels and researched devices to RD consoles 2015-01-08 19:03:05 +01:00
Zuhayr
7e0610e31c Fixes #7684 2015-01-09 04:18:42 +10:30
Zuhayr
8d2d3302bd Fixes #7720 2015-01-09 04:07:08 +10:30
Zuhayr
c3756e3a03 Fixes #7701 2015-01-09 04:05:11 +10:30
Zuhayr
29435d8750 Fixes #7700 2015-01-09 03:56:12 +10:30
Zuhayr
cd53ed613c Fixes #7691 2015-01-09 03:51:47 +10:30
mwerezak
08cda65973 Adjusts major event weightings 2015-01-08 00:00:57 -05:00
mwerezak
c3413bc7d7 Fixes meteor event 2015-01-07 23:29:52 -05:00
Zuhayr
0d56551319 Merge pull request #7729 from Baystation12/dev-freeze
Dev freeze
2015-01-07 18:15:03 +10:30
Tramziller
29a0ae2ad6 Response to #7686 2015-01-06 21:48:56 +01:00
ccomp5950
27765f799f Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
Conflict resolution.

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
2015-01-06 12:36:28 -05:00
Zuhayr
cb88860f6b Merge resolution. 2015-01-07 03:43:12 +10:30
Zuhayr
66759eff3c Adds Borer bantype, halves borer resist time, comments out Devour Brain verb, expands borer welcome text. 2015-01-06 11:11:34 +10:30
Tramziller
06e6277dc6 Fixed bug of peridaxon healing robotic organs 2015-01-05 22:17:40 +01:00
Zuhayr
e07a14c0ea Made bomber jacket/hoodies toggleable, added black hoodie. 2015-01-06 01:35:45 +10:30
Ccomp5950
c78ad9666a Merge pull request #7649 from Kelenius/ofDionaeAndDrugs
Fixes a tiny typo and a comment
2015-01-03 17:43:32 -05:00
Kelenius
c1d07cd77b Fixes a tiny typo and a comment
So basically toxins are not processed like all other reagents - instead
that is handled to the liver. Since dionae/dionas have no liver, toxins
would never leave their system. There is a check for aliens to
forcefully call ..(), but due to a typo it was only called if the drug
had any toxpwr. Since mindbreaker (and several others) has toxpwr = 0,
such drugs would never leave a poor diona's... khm, system.

The question to how diona even get affected by those in the first place
stays open.

Fixes #6994.
2015-01-03 23:19:14 +03:00
Kelenius
4c63e6a3ea Restores monkey's ability to ventcrawl
Fixes #7474.
2015-01-03 22:41:57 +03:00
Zuhayr
982998d08d Fixes #7636 2015-01-03 06:53:29 +10:30
Zuhayr
014729a001 Addendum to previous commits. 2015-01-03 05:52:29 +10:30
Zuhayr
a34a1f66cf Fixes #7632 2015-01-03 05:23:44 +10:30