Commit Graph

16528 Commits

Author SHA1 Message Date
Zulker Nayeen Nahiyan
ab9210a1f9 Fix compile errors, rename mathematical constants to M_PI etc.
`setup.dm`:
	Renamed `PI`, `E` and `Sqrt2` macros to `M_PI`, `M_E` and `M_SQRT2`

Others:
	Changed the macro usage accordingly: `PI` -> `M_PI`
2015-01-10 03:47:11 +06: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
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
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
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
b36b41a2f5 Fixes #7656 2015-01-09 03:58:43 +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
Zuhayr
0d071e7f9d Fixes #7683 2015-01-09 03:48:46 +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
Zuhayr
07298fa31a Merge pull request #7697 from Tramziller/dev-freeze
Shot airlock fix
2015-01-07 06:02:06 +10:30
Zuhayr
ab711b5080 Merge pull request #7695 from Amunak/patch-1
Makes LOOC dark turquoise, fixes #7681
2015-01-07 04:33:56 +10:30
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
Mloc
7570cf7ea7 Merge pull request #7708 from comma/master
Fixes #7707
2015-01-06 15:28:32 +00:00
Chinsky
38c69bab64 Fixes #7707 2015-01-06 13:14:20 +03:00
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
Tramziller
be48eccad2 Airlock that are BROKEN (shot or like) can have their electronics removed (for repairs) even when their bolts are dropped 2015-01-05 20:39:00 +01:00
Amunak
c34a8ee859 Admin name colour msay colour fix
Admin name colour in msay now matches their default OOC colour. Hopefully fixes some concerns presented in #7657.
2015-01-05 18:40:52 +01:00
Amunak
e5512518bb Makes LOOC dark turquoise, fixes #7681 2015-01-05 13:48:22 +01:00
mkalash
559e224446 Allows the autolathe maintenance panel to be accessed even if disabled. Fixes #7677. Adds feedback when a someone tries to interact with a disabled autolathe with the panel closed. 2015-01-04 22:43:20 -05:00
mkalash
f9e352b768 Gets rid of the white wire in Omega's new wire system. The background of the UI is white, so you can't read the wire's name. I replace it with dark red. 2015-01-04 22:26:41 -05:00
mkalash
536e4bd237 Adds missing paranthesis in logic for airlock's hasPower(). Fixes #7653 2015-01-04 22:09:00 -05:00
mkalash
6e8d2c55b0 Adds stack amount check when loading materials into the exosuit fabricator. Fixes #7665 2015-01-04 21:34:50 -05:00
PsiOmegaDelta
d1d88fa365 Merge pull request #7687 from Tramziller/Girder_fix
Fixes bug where girders can be destroyed with stun beams.
2015-01-04 23:50:36 +01:00
Mloc
ec9b46399b Merge pull request #7673 from SkyMarshal/patch-3
Fixes runtime with deleted cameras.
2015-01-04 21:06:42 +00:00
SkyMarshal
863351a474 Changes the runtime protection to be more general-case. 2015-01-04 13:32:11 -07:00
Tramziller
fb86581159 Fixes bug where girders can be destroyed with stun beams. 2015-01-04 21:12:32 +01:00
Zuhayr
9fa73784a5 Fixes #7660 2015-01-05 01:05:13 +10:30
Zuhayr
f7cd72b7f9 Fixes #7670 2015-01-04 19:06:45 +10:30
Zuhayr
81603032d3 Fixes #7671 2015-01-04 19:05:55 +10:30
SkyMarshal
65163dfcc5 Fixes runtime with deleted cameras. 2015-01-04 01:22:37 -07:00