Commit Graph

4915 Commits

Author SHA1 Message Date
Chinsky
6e7eb38c5d Merge pull request #7850 from Baystation12/master
master -> freeze
2015-01-16 14:23:03 +03:00
Chinsky
facfc0df56 Fixes #7560 2015-01-16 12:51:46 +03:00
Chinsky
b405fcd71f Fixes #7775 2015-01-16 12:26:05 +03:00
Chinsky
221f9ebe86 Fixed a few derps, added spinning 2015-01-16 11:35:56 +03:00
Chinsky
c2b5c53092 Merge pull request #7845 from Ravensdale/runtimeFixes
Fixes Cannot execute null.on removed()
2015-01-16 11:22:47 +03:00
Kelenius
6f7a7177f2 Adds drying racks and updates pipes
You can now dry plants using a special machine, and you can now stuff
those plants into pipes to smoke then. It slowly transfers the reagents
from the plant into the smoker.
2015-01-16 02:57:59 +03:00
Ravensdale
fdf9886053 Fixes Cannot execute null.on removed() 2015-01-15 14:48:04 -08:00
Chinsky
95e4f53258 Ported TG's code for burny mobs, by ergoslavi. 2015-01-15 23:47:07 +03:00
Chinsky
1c772e9914 Fixes #7821 2015-01-15 16:45:45 +03:00
PsiOmega
5c6c65e728 Can no longer see the AI eye by right or alt-clicking turfs. 2015-01-15 10:25:49 +01:00
mwerezak
dc23588a81 Less calls to copytext() 2015-01-14 23:03:21 -05:00
mwerezak
c0a896282c Adds visible emote shortcut to complement the audible emote shortcut. 2015-01-14 21:25:28 -05:00
Loganbacca
cac7f64fdc Robot module fix
Thanks mwerezak
2015-01-13 22:16:20 +13:00
Loganbacca
5d0d5d0aba Fixes robot modules not regenerating
- Also added a type check
2015-01-13 16:34:15 +13:00
Mloc-Argent
70f67409d5 HE pipe changes
HE pipes will now change colour as they heat up, the procs for
 calculating this are in type2type.dm.
Mobs buckled to HE pipes will be forced to lie down and will share
 heat with and get burned by the pipe network.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-12 21:28:41 +00:00
Mloc-Argent
537b78fc80 refactor buckling to be more generic
Buckling procs and vars have been moved down to /obj.
Behaviour is mostly the same, but you can buckle cuffed people to
 pipes and they will automatically unbuckle if the cuffs are removed.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-12 21:28:31 +00:00
PsiOmegaDelta
476ac0e530 Merge pull request #7765 from sirbayer/fastxenoborg
Borg iconupdate fix & cleanup
2015-01-12 11:54:52 +01:00
Zuhayr
d65c8f366e Merge pull request #7791 from Baystation12/dev-freeze
Dev freeze
2015-01-12 09:05:45 +10:30
Zuhayr
61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
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
Loganbacca
baf763c324 Runtime fix 2015-01-11 19:01:38 +13: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
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
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
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
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
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
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
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
Chinsky
5e0676df49 Merge pull request #7631 from Zuhayr/dev-freeze
More fixes.
2015-01-02 20:52:27 +03:00
Loganbacca
f3b893942f More cargo train fixes
- Fixes #5906
- Fixes #5939
- Fixes #6282
- Fixes #6634 (properly this time)
- Fixed a bug with updating train stats (causing trains to be super slow if hitched while running)
- Updated train verbs (start/stop/remove key) to only show up if you are in the same turf
- Moved all train specific verbs to their own verb category: "Vehicle"
2015-01-03 01:27:10 +13:00
Zuhayr
e63798ea4e Fixes oversight with decompiler. 2015-01-02 20:42:59 +10:30
Zuhayr
261f3f935c Fixes #7627 2015-01-02 19:19:01 +10:30
Zuhayr
89955dbb36 Fixes #7628 2015-01-02 19:02:11 +10:30