Commit Graph

17479 Commits

Author SHA1 Message Date
Zuhayr
9f7df7045e Merge pull request #7771 from GinjaNinja32/robot_storage
Fix robot storage units dropping security borgs' taser/laser on storage, slight refactor.
2015-01-12 07:39:49 +10:30
ginjaninja32
4717c3a575 Span classes? Span classes.
Also removes a pair of redundant \impropers.
2015-01-11 21:00:03 +00:00
Zuhayr
61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
GinjaNinja32
30cb5f5cc7 Revert test code 2015-01-11 12:29:14 +00:00
Loganbacca
527e83a4e3 Blood/oil stain fixes
- Fixed item descriptions calling oil-stained items "bloody"
- Fixed mob examine describing oil-stained bare hands and feet as "bloody"
- Fixed blood overlays on shoes not updating after walking through different colored blood
- Removed some colons
2015-01-12 01:08:28 +13:00
PsiOmega
b9fa2c0c50 Fixes #7663.
Corrects inconsistent turret anchor/on settings.
Correctly sets access ERT turret permissions.
Corrects invisibility level on turret pop down.
2015-01-11 12:21:45 +01:00
Zuhayr
6db4cef894 Merge pull request #7784 from PsiOmegaDelta/Shutters
Fixes  #7723.
2015-01-11 21:10:25 +10:30
PsiOmega
4a68f6097d Fixes #7743.
Makes syndicate and vox shuttle areas radiation safe.
2015-01-11 11:28:24 +01:00
PsiOmega
7f54ff97ef Fixes #7723.
Blast doors again use the same layering method as doors.
2015-01-11 11:20:51 +01:00
Loganbacca
a53922307b Fixed lying mobs not updating gravity state
Also removed a few colons from turf.dm
2015-01-11 22:43:15 +13:00
Loganbacca
bc57c8b55d Made thaler bundle merging code more sane
Both bundles are dropped, then the merged one is put in the users hands
2015-01-11 21:44:12 +13:00
Loganbacca
146fb2f6ad Fixes lighting not updating when turfs are changed 2015-01-11 21:03:27 +13:00
Loganbacca
441ee30bfb Fixes multiplying grape soda
Also cleaned up some indenting
2015-01-11 19:14:59 +13:00
Loganbacca
baf763c324 Runtime fix 2015-01-11 19:01:38 +13:00
sabiram
66ab6bffba Adds my approved custom item (baystation12.net/forums/viewtopic.php?p=255276) to the common loadout pool. 2015-01-10 22:55:29 -05:00
mwerezak
03e95ecbcf Fixes UI event weighting display 2015-01-10 13:29:19 -05:00
Chinsky
4b3ffa864c Merge pull request #7768 from mwerezak/fixes
Fixes
2015-01-10 21:24:13 +03:00
mwerezak
e49a3a86ae Delays events by 15 minutes on crew autotransfer 2015-01-10 12:48:03 -05:00
mwerezak
d61c808fef Cleans up infect_virus2() typecheck 2015-01-10 12:29:35 -05:00
mwerezak
8ac0450c01 Sets chance_maxm for several disease effects
Also lengthens the time to get from stage 1 to stage 2
2015-01-10 12:26:12 -05:00
mwerezak
cf0c0c29bb Randomizes carp spawning locations 2015-01-10 11:49:10 -05:00
mwerezak
654769016e Fixes virus events failing because of lack of compatible species 2015-01-10 03:18:52 -05:00
mwerezak
1c5ca01dae Restricts Gibbingtons, Suicide, and Monkism syndromes
Restricts Gibbingtons, Suicide, and Monkism syndromes from even greater
diseases. Admins can still generate diseases with these syndromes
through secrets.

Fixes virus events potentially having people share the same virus datum.
2015-01-10 03:08:42 -05:00
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
ginjaninja32
1936410a91 Fix robot storage units dropping security borgs' taser/laser on storage, slight refactor. 2015-01-10 04:15:55 +00: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
ccomp5950
2816d3c02b Fixes PDA locking up after receiving a " in conversation.
Long story short, the json encoding doesn't know how to handle "
Adding a check specifically for it breaks other stuff, after banging my head against it for an hour
this is the best means of fixing the problem without breaking and fixing a lot of other things.
2015-01-09 22:27:15 -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
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
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
PsiOmegaDelta
4735419c6f Merge pull request #7741 from Tramziller/Bugfixes
Response to #7724
2015-01-08 23:29:46 +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